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

v7.1.1-23 update #2

Open
wants to merge 157 commits into
base: v7.1.1-23
Choose a base branch
from
Open

v7.1.1-23 update #2

wants to merge 157 commits into from

Conversation

valgur
Copy link
Collaborator

@valgur valgur commented Dec 12, 2023

All of the changes from #1, plus:

  • Reorganized the CMakeLists.txt into more isolated chunks to make it easier to follow.
  • Updated a few more checks and added defaults for MSVC to speed up the glacial configure process.
  • Added the extra utilities symlinks. Could copy them on Windows instead, but decided not to by default as each statically built executable was 15 MB. Symlinking on Windows is supported, but only with extra system-wide permission.
  • Added nearly all configuration variables set by configure.ac and added the output of configured .xml files, etc.
  • Added all tests as CTest targets. Everything passes on Linux and almost everything on Windows. I only get a "missing a delegate for PPM" on Windows for a few tests for some reason.

I'm thinking of setting up a CI pipeline that builds it for a few different configurations using Conan dependencies next.

Cristy and others added 30 commits December 10, 2023 19:24
beta release
9e5eb3a
...
22ca517
cosmetic
8d015de
@dlemstra
Added extra check for rare case when ImageMagick is build without any…
8d08f85 
… delegates.
@dlemstra
Corrected order to fix invalid matches.
935f2c2
@dlemstra
b10 should also be moved.
cf821b1
only fill the alpha channel for alpha floodfill
ef87dfd
@valgur
CMake: Improve compatibility with Conan's CMakeDeps
3924a2a
@valgur
CMake: HDRI_ENABLE_OBSOLETE_IN_H has been removed
adfba31
@valgur
CMake: add SECURITY_POLICY option, nominally
a5fea86 
ImageMagick@8ada13b#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810
@valgur
CMake: add DPC_SUPPORT option
8ec88b6 
ImageMagick@fc7bb1d
@valgur
CMake: add WITH_64BIT_CHANNEL_MASK_SUPPORT option
6fe5e76 
ImageMagick@226a66f
@valgur
CMake: add DMR (MagickCache) lib support
b6e29ea 
ImageMagick@0a439ab

https://github.com/ImageMagick/MagickCache
@valgur
CMake: add HAVE_MTMALLOC option, rename HasJEMALLOC and HasUMEM
bbd9bd0 
ImageMagick@88e3964
@valgur
CMake: apply changes to config.h.in
339f4c1 
Only symbol/header flags, not feature flags.

Diff: https://gist.github.com/valgur/b408e251b790f9f320262ed50b6ae0f3
@valgur
CMake: update config.h.cmake to match config.h.in
53f37c1 
And rename HasJMALLOC and HasUMEM.
@valgur
CMake: fix the define value formats in config.h.cmake
ff80de7
@valgur
CMake: fix OpenCL header check
a3f46d4
@valgur
CMake: fix complex.h function detection, which broke fftw
c208caa
@valgur
Add conanfile.py
3bd2698
@valgur
opencl.c: replace lt_dlclose() with dlclose() / FreeLibrary()
8306809
@valgur
CMake: fix errors in checks.cmake
c1888e7
@valgur
CMake: further config.h.cmake fixes
690547b
@valgur
CMake: add HAVE_TCMALLOC option
07fa530
@valgur
CMake: add BUILD_TESTS, cleaner library names in CMakeLists.txt
9ba29d8
@valgur
CMake: run TAP tests with CTest
4b16d54
@valgur
CMake: set project() only once
e2fe103
@valgur
CMake: add symlinked executables
ddd5a3e
@valgur
conanfile.py: set BUILD_TEST=FALSE
7f19aea
@valgur
CMake: improve CMake project structure
c3f1159
dlemstra and others added 29 commits December 31, 2023 14:13
@dlemstra
Reverted incorrect patch.
3ee902d
reduce # threads for -alpha option
8876f13
-alpha deactivate-if-opaque disables the alpha channel if and only if…
66ef758 
… its entirely opaque
-alpha off-if-opaque turns off the alpha channel if its entirely opaque
e9a68f0
slight optimization
e6f0530
@remicollet @dlemstra
fix error: 'libraw_data_t' has no member named 'rawparams'
1294dac
thread tuning
c29cf7f
@dlemstra
Silenced warning.
b8fd1e7
thread tunuing
80cb07d
optimize HDRI detection
f8ba278
factor is a const argument
3e2879e
@dlemstra
Fixed build on Windows.
0f0ccfd
@dlemstra
Removed duplicate define.
79e742a
@dlemstra
The CheckPSDChannels method should not check empty layers.
e5162e6
@dlemstra
Use consistent casing of method names.
cbf79ad
@dlemstra
Allow invalid webp files that incorrectly include the size of the hea…
99c9ee4 
…der in the length.
https://github.com/ImageMagick/ImageMagick/issues/7006
8e1b405
cosmetic
9033dea
improve RSVG exception checking (ImageMagick#7005)
802ffae
fix off-by-one issue for captions/labels (ImageMagick#7004)
e80133b
fix caption sizing issue (ImageMagick#7004)
2d24367
correct off by one issue
90ac70a
@TedLyngmo
Make Magick++-config work from non-standard places (ImageMagick#7008)
41015d0 
When the .pc file is installed in a location not searched by pkg-config
by default, Magick++-config failed.

Fixes ImageMagick#7007

Signed-off-by: Ted Lyngmo <ted@lyncon.se>
correct usage
a5dbba6
@valgur
Merge remote-tracking branch 'origin/main' into main
50940c1
@valgur
Revert "opencl.c: replace lt_dlclose() with dlclose() / FreeLibrary()"
dbf838e 
Has been fixed upstream.
@valgur
Revert a minor whitespace discrepancy
d7c60b0
@valgur
CMake: fix CMake delegate var handling
fcecc0a
@valgur
conanfile.py: add support for ltdl delegate
adf2813
@Cyriuz Cyriuz mentioned this pull request Apr 8, 2024
Open
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Cyriuz Cyriuz Cyriuz left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
8 participants
@valgur @Cyriuz @dlemstra @kleisauke @thesamesam @yoya @remicollet @TedLyngmo