Avoid loadMedia copy and do some cleanups #3722
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -690,7 +686,7 @@ bool Client::loadMedia(const std::string &data, const std::string &filename) | |||
|
|
|||
| // Create an irrlicht memory file | |||
| io::IReadFile *rfile = irrfs->createMemoryReadFile( | |||
| *data_rw, data_rw.getSize(), "_tempreadfile"); | |||
| (void*)data.c_str(), data.size(), "_tempreadfile"); | |||
There was a problem hiding this comment.
Best would be:
- Adding an #ifdef for irrlicht 1.9 with the "direct" way that doesn't do a cast
- in the else part, add a comment that properly explains that casting is legal in this specific case
Other people might even say that the < 1.9 case should remain a copy, idk.
|
Other than that, looks good. |
est31
added
the
Maintenance
|
@est31 builders uses 1.8 and it's working. I think condition should be 1.7 |
|
@nerzhul No, it should check for 1.8 too because the API didn't change. It changed between 1.8 and 1.9. |
|
@est31 then there is no problem because jenkins & travis uses irrlicht 1.8 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.