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.

Sign up for GitHub

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

Jump to bottom

[CImgPlugin] prevent INT32 redefinition by libjpeg on Windows #566

Merged
merged 2 commits into from
Jan 19, 2018
Merged

[CImgPlugin] prevent INT32 redefinition by libjpeg on Windows #566

merged 2 commits into from
Jan 19, 2018

Conversation

guparan
Copy link
Contributor

@guparan guparan commented Jan 18, 2018 •
edited
Loading

This change is needed before using the new dependency pack (libjpeg + libtiff) on Windows.

This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings.
  • does not generate new unit test failures.
  • does not generate new scene test failures.
  • does not break API compatibility.
  • is more than 1 week old (or has fast-merge label).

Reviewers will merge only if all these checks are true.

@guparan guparan added pr: fix Fix a bug pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: status to review To notify reviewers to review this pull-request labels Jan 18, 2018
@guparan guparan added this to the v17.12 milestone Jan 18, 2018
@damienmarchal
Copy link
Contributor

gg for the fix.

@guparan
Copy link
Contributor Author

guparan commented Jan 18, 2018

Upgrading libjpeg actually solves the problem. This change is not needed.

@guparan guparan closed this Jan 18, 2018
@guparan
Copy link
Contributor Author

guparan commented Jan 18, 2018

Nevermind, newer version fails running Texturing.scn example.

@guparan guparan reopened this Jan 18, 2018
@guparan guparan mentioned this pull request Jan 19, 2018
Merged
6 tasks
@guparan guparan merged commit 88446bf into sofa-framework:master Jan 19, 2018
@guparan guparan deleted the prepare_jpeg_tiff_deps branch February 19, 2018 08:53
@hugtalbot hugtalbot added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels May 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: fix Fix a bug pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Milestone
v17.12
Development

Successfully merging this pull request may close these issues.
3 participants
@guparan @damienmarchal @hugtalbot