Skip to content

Commit

Permalink
Merge pull request #481 from jam3sward/fix-c4267-warnings-vs-win32
Browse files Browse the repository at this point in the history
Fix C4267 warnings in Visual Studio on WIN32
  • Loading branch information
syoyo authored Mar 25, 2024
2 parents cbc8e1b + 9b4e1ea commit ed3d1ec
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions tiny_gltf.h
Original file line number Diff line number Diff line change
Expand Up @@ -337,12 +337,11 @@ class Value {
T &Get();

// Lookup value from an array
const Value &Get(int idx) const {
const Value &Get(size_t 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)]
return (idx < array_value_.size())
? array_value_[idx]
: null_value;
}

Expand Down Expand Up @@ -1927,7 +1926,7 @@ static bool Equals(const tinygltf::Value &one, const tinygltf::Value &other) {
}
case ARRAY_TYPE: {
if (one.Size() != other.Size()) return false;
for (int i = 0; i < int(one.Size()); ++i)
for (size_t i = 0; i < one.Size(); ++i)
if (!Equals(one.Get(i), other.Get(i))) return false;
return true;
}
Expand Down Expand Up @@ -7070,10 +7069,10 @@ static bool ValueToJson(const Value &value, detail::json *ret) {
obj = detail::json(value.Get<std::string>());
break;
case ARRAY_TYPE: {
for (unsigned int i = 0; i < value.ArrayLen(); ++i) {
Value elementValue = value.Get(int(i));
for (size_t i = 0; i < value.ArrayLen(); ++i) {
Value elementValue = value.Get(i);
detail::json elementJson;
if (ValueToJson(value.Get(int(i)), &elementJson))
if (ValueToJson(value.Get(i), &elementJson))
obj.push_back(elementJson);
}
break;
Expand Down

0 comments on commit ed3d1ec

Please sign in to comment.