Replace mjMIN and mjMAX with mju_min and mju_max, where possible.
PiperOrigin-RevId: 566602924 Change-Id: I2d24183d0d9df3e647bb2d7d7544473582f38128
This commit is contained in:
committed by
Copybara-Service
parent
9cf1f6eba4
commit
dfd48dd821
@@ -14,13 +14,10 @@
|
||||
|
||||
#include "xml/xml_native_reader.h"
|
||||
|
||||
#include <cfloat>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <cstring>
|
||||
#include <functional>
|
||||
#include <iostream>
|
||||
#include <limits>
|
||||
#include <map>
|
||||
#include <optional>
|
||||
@@ -2314,10 +2311,12 @@ void mjXReader::Custom(XMLElement* section) {
|
||||
|
||||
// read attributes
|
||||
ReadAttrTxt(elem, "name", pnum->name, true);
|
||||
if (ReadAttrInt(elem, "size", &pnum->size))
|
||||
for (int i=0; i<mjMIN(pnum->size, 500); i++) {
|
||||
if (ReadAttrInt(elem, "size", &pnum->size)) {
|
||||
int sz = pnum->size < 500 ? pnum->size : 500;
|
||||
for (int i=0; i<sz; i++) {
|
||||
data[i] = 0;
|
||||
} else {
|
||||
}
|
||||
} else {
|
||||
pnum->size = 501;
|
||||
}
|
||||
int len = ReadAttr(elem, "data", pnum->size, data, text, false, false);
|
||||
|
||||
Reference in New Issue
Block a user