chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'deepmind:main' into main

Browse Source
This commit is contained in:
Lucas Inácio Viegas
2022-05-31 12:52:25 -03:00
committed by GitHub
parent 2c54ec67cb d7ae7f5433
commit edd7fd8695
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/user/user_objects.cc
+4 -2
View File
@@ -2236,7 +2236,8 @@ void mjCTexture::LoadCustom(string filename, const mjVFS* vfs,
mju_free(buffer); mju_free(buffer);
} }
throw mjCError(this, "non-positive texture dimensions in file '%s'", filename.c_str()); throw mjCError(this, "Non-PNG texture, assuming custom binary file format,\n"
"non-positive texture dimensions in file '%s'", filename.c_str());
} }
// check buffer size // check buffer size
@@ -2245,7 +2246,8 @@ void mjCTexture::LoadCustom(string filename, const mjVFS* vfs,
mju_free(buffer); mju_free(buffer);
} }
throw mjCError(this, "unexpected file size in file '%s'", filename.c_str()); throw mjCError(this, "Non-PNG texture, assuming custom binary file format,\n"
"unexpected file size in file '%s'", filename.c_str());
} }
// allocate and copy // allocate and copy