Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some typos (found by codespell) #1390

Merged
merged 3 commits into from
Dec 5, 2021
Merged

Fix some typos (found by codespell) #1390

merged 3 commits into from
Dec 5, 2021

Conversation

stweil
Copy link
Contributor

@stweil stweil commented Dec 5, 2021

Signed-off-by: Stefan Weil sw@weilnetz.de

Signed-off-by: Stefan Weil <sw@weilnetz.de>
@@ -8829,7 +8829,7 @@ static OPJ_BOOL opj_j2k_read_header_procedure(opj_j2k_t *p_j2k,
if (l_marker_handler->id == J2K_MS_UNK) {
if (! opj_j2k_read_unk(p_j2k, p_stream, &l_current_marker, p_manager)) {
opj_event_msg(p_manager, EVT_ERROR,
"Unknow marker have been detected and generated error.\n");
"Unknown marker have been detected and generated error.\n");
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks also like a singular / plural mismatch. Should it be markers have or marker has?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be singular

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 2nd commit.

@rouault
Copy link
Collaborator

rouault commented Dec 5, 2021

the astyle check fails because you've touched files that weren't compliant with it before. Would you mind running astyle on them first to have a reindent-only commit, and then fix the typos in a separate commit ?

@stweil
Copy link
Contributor Author

stweil commented Dec 5, 2021

Would it be also okay to add the astyle commit after the typo fixes (which required some manual work)?

Signed-off-by: Stefan Weil <sw@weilnetz.de>
@rouault
Copy link
Collaborator

rouault commented Dec 5, 2021

Would it be also okay to add the astyle commit after the typo fixes (which required some manual work)?

yeah, that can do it too

Signed-off-by: Stefan Weil <sw@weilnetz.de>
@stweil
Copy link
Contributor Author

stweil commented Dec 5, 2021

Only a single source file had to be re-formatted (done in 3rd commit).

@rouault rouault merged commit 22eb737 into uclouvain:master Dec 5, 2021
@stweil stweil deleted the typos branch December 5, 2021 13:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants