-
Notifications
You must be signed in to change notification settings - Fork 169
Closed
Milestone
Description
Following the #663 discussion, we are going to perform the grand true merge of develop
into master
in order to prepare for release all of the fixes and features (GSoC too) that have been developed over the Boost 1.76.0, that is the last Boost release with anything GIL.
Steps:
- Merge
- Build locally before
git push
- Push
- Review CI status
- Collect release notes to
RELEASES.md
- Copy release notes to https://github.com/boostorg/website/ (special kudos go to @striezel for his huge helps with the docs and release notes!)
Changes
Below is initial, as on 12 May 2022, log of commits in form convenient to review that will merged from current develop into master for release with Boost 1.80:
git log origin/master..develop --reverse --pretty=format:" | %cs | [%h](http://github.com/boostorg/gil/commit/%H) | %s |" | nl | sed -E 's/^\s/\|/g'
# | Date | Hash | Subject |
---|---|---|---|
1 | 2020-10-05 | f6a35532f | Fix typo in copyright headers (#521) |
2 | 2020-10-10 | f7e83e0ba | Fix conversion of rgb to signed cmyk(#479) (#522) |
3 | 2020-10-11 | f374a672a | Add image constructor from compatible view (#520) |
4 | 2020-11-10 | 8b1c2d3ea | Boost 1.75 release notes: plan to phase out GCC 5 and introduce C++14 |
5 | 2020-11-22 | 6fc7d7541 | Removing unnecessary cast in hsv.cpp (#530) |
6 | 2020-11-22 | 09911cd1c | ci: Boost.Numeric is no longer a dependency [ci skip] |
7 | 2020-11-22 | 8d0490630 | docs: Update CONTRIBUTING.md [ci skip] |
8 | 2020-12-16 | 2b1e4665d | Add "cxxstd" json field (#531) |
9 | 2021-01-04 | e1c69d171 | Add codecov coverage (#532) |
10 | 2021-01-11 | 0c0fe1ae7 | build: Switch conan packages from bincrafters to conan.io (#537) |
11 | 2021-01-20 | 68cdbdd2e | Add inverse function for matrix3x2 (#527) |
12 | 2021-01-20 | 853bc1266 | Fix typo in copyright headers (#524) |
13 | 2021-01-21 | eef475e27 | ci: Temporarily set B2_VERBOSE=0 for CircleCI |
14 | 2021-01-22 | 470923be3 | Fix default ctor of homogeneous_color_base for reference pixel elements (#542) |
15 | 2021-01-22 | cb5bc9d8c | Add Perona–Malik anisotropic diffusion algorithm (#500) |
16 | 2021-01-23 | b23c5e75b | doc: Display GIL is header-only in README |
17 | 2021-01-23 | 0e372a10b | docs: Display GIL is header-only in README |
18 | 2021-01-24 | 3e729e5da | Add histogram class and related functionality (#499) |
19 | 2021-01-24 | fb7512c29 | Add histogram equalization feature (#514) |
20 | 2021-01-24 | 77255e9e6 | Add histogram matching algorithm (#515) |
21 | 2021-01-24 | b82aed8f8 | Implement hstack and vstack (#506) |
22 | 2021-01-24 | a68a95d5f | Add code for ahe algorithm (#516) |
23 | 2021-01-25 | 81b4dc08b | ci: Add configuration for GitHub Actions (#544) |
24 | 2021-01-25 | a37f12b3e | Add implementation of Hough transforms (#512) |
25 | 2021-01-26 | 434e78f76 | ci: R.I.P. Travis CI - Long live GitHub Actions |
26 | 2021-01-27 | 4e0f815f5 | build: Remove most of uses of cxxflags from test/Jamfile (#550) |
27 | 2021-01-28 | 6f0a06136 | docs: Clarify PR update procedure in CONTRIBUTING.md [ci skip] |
28 | 2021-01-28 | 5d63cf679 | Fix more warnings in examples |
29 | 2021-01-28 | 063385398 | Fix warnings about abs called without std qualification |
30 | 2021-01-28 | 6007d7466 | Fix some clang -Wunused-variable warnings |
31 | 2021-01-28 | 422ca82fe | Removed two instaces of boost.mpl (#551) |
32 | 2021-01-30 | 2e2764225 | Support constructing a planar image from interleaved image (#552) |
33 | 2021-02-02 | 90f7952b0 | Fixed most of warnings in examples and some in core library (#545) |
34 | 2021-02-02 | d923a8f37 | Declare laplacian_function::get_directed_offsets as inline |
35 | 2021-02-02 | c7847f4d6 | Fix warning: returning reference to local temporary object (#556) |
36 | 2021-02-03 | 04daae716 | Fix warning: comparison of integer expressions of different signedness |
37 | 2021-02-03 | 58804ecb2 | Remove and other cruft from Jamfile (#557) |
38 | 2021-02-03 | f58f3a23a | Disable warning: overlapping comparisons always evaluate to false [-Wtautological-overlap-compare] |
39 | 2021-02-04 | 8337f47ae | Review and update includes in boost/gil.hpp (#559) |
40 | 2021-02-05 | c3b3d35aa | Fix sphinx installation link in docs readme (#560) |
41 | 2021-02-09 | 2676d3180 | ci: Disable AppVeyor job using CMake to avoid timeouts |
42 | 2021-02-13 | 1e8526797 | Added all standard morphological transformations (#541) |
43 | 2021-02-19 | a8cb36449 | doc: Add Compiling section with C++ version and compilers support |
44 | 2021-02-28 | a82af6d25 | ci: Add Codecov to GitHub Actions (#564) |
45 | 2021-03-01 | 33ab3cfc1 | added missing header guards (#568) |
46 | 2021-03-01 | ec25950af | added missing copyright info (#569) |
47 | 2021-03-01 | ad007ab92 | ci: Add Codecov badge and codecov.yml file (#567) |
48 | 2021-03-01 | 093117d56 | Repoint B2 refs to new non-boostorg home. (#570) |
49 | 2021-03-01 | f18445f90 | Repoint B2 refs to new non-boostorg home. (#571) |
50 | 2021-03-02 | 0778069b8 | Switch docs deployment from Travis CI to GitHub Actions (#563) |
51 | 2021-03-02 | 8bd241312 | ci: Remove GCC 5 on GitHub Actions and Azure Pipelines (#572) |
52 | 2021-03-05 | 745d033ef | ci: Use GitHub Actions automatic GITHUB_TOKEN secret in docs workflow |
53 | 2021-03-09 | 392ac4996 | Rotation of image by any arbitrary angle from its center (#565) |
54 | 2021-03-10 | 6da59cc33 | docs: Updated GA workflow to publish with peaceiris/action-gh-pages (#574) |
55 | 2021-03-18 | b8564e256 | Fix any_image_view::const_t (#526) |
56 | 2021-03-24 | dc9ba74cb | Add docs for histogram (#503) |
57 | 2021-03-24 | 6e91e4bf5 | Update image url links for docs for histogram (#586) |
58 | 2021-03-28 | bc3a6c0db | Add rasterizer support for ellipse (#585) |
59 | 2021-04-02 | cea6ef275 | ci: Fix availability of toolsets in updated Ubuntu images of GitHub Actions (#589) |
60 | 2021-04-02 | 2ad274cc8 | ci: Remove cxxstd=14 from clang 3.5 job on GitHub Actions (#590) |
61 | 2021-04-03 | bbdce36a1 | docs: Correct typos in documentation (#592) |
62 | 2021-05-06 | 0a21d741c | test: Verify core IO headers are self-contained |
63 | 2021-05-11 | 4738a3829 | test: Catch up IO with switch to variant2 migration (#607) |
64 | 2021-05-23 | d65cc5822 | Update CONTRIBUTING.md |
65 | 2021-05-30 | 7dd61209a | Add remaining pieces of documentation in convolve.hpp (#611) |
66 | 2021-06-11 | effd078b3 | Fix C++20 incompatibilities in IO extensions |
67 | 2021-07-16 | 2cc525a2d | Fix for_each_pixel for non 1d iterable views |
68 | 2021-10-04 | 327952325 | Update pixel design documentation for MP11 changes (#626) |
69 | 2021-10-05 | c9b339e5d | Merge pull request #617 from fmorgner/fix-c++20-ctor-incompatibility |
70 | 2021-10-30 | a328bef94 | Add a Boost-friendly subproject case to CMakeLists (#614) |
71 | 2021-11-08 | b6526deb7 | Remove remaining references to MPL in the documentation (#631) |
72 | 2021-11-10 | 0b24f4cdb | Ensure all examples build without error (#628) |
73 | 2021-12-16 | 4531c3d56 | docs: Fix TOC link to B2 in CONTRIBUTING.md (#632) |
74 | 2022-02-05 | 2db5fe9f4 | Fix warning: unused variable ‘r_squared’ [-Wunused-variable] |
75 | 2022-02-05 | 0accacdbe | Fix warning: comparison of integer expressions of different signedness |
76 | 2022-02-06 | 5dcdf53c0 | Fix warning: unused variable in diffusion.hpp (#635) |
77 | 2022-02-09 | c7aba23c7 | Fix convolve_2d for images with float32_t channel model (#577) |
78 | 2022-02-09 | 199520179 | Refactor CMake test config (#634) |
79 | 2022-02-18 | 2562e1124 | numeric extension move into core 1 |
80 | 2022-02-18 | baf246a72 | numeric extension move into core part 2 |
81 | 2022-02-18 | 483915cb2 | numeric extension move into core part 3 |
82 | 2022-02-18 | 87a3157c4 | numeric extension move into core part 4 |
83 | 2022-02-18 | 9bd8642f6 | numeric extension move into core part 5 |
84 | 2022-02-22 | f4c70a860 | Add support for to IO (#636) |
85 | 2022-03-01 | da0655fb6 | Merge pull request #621 from sdebionne/fix-620 |
86 | 2022-03-28 | 4943e403b | chore: Bump CMake version in CMakeLists.txt |
87 | 2022-04-06 | 63f5837bd | Removed deprecated.hpp (#627) |
88 | 2022-04-07 | bb080b544 | ci: Replace Ubuntu 16.04 with Ubuntu 18.04 in some GitHub Actions jobs (#640) |
89 | 2022-04-07 | a38f890fe | ci: Fix Clang 9 build on GitHub Actions (#641) |
90 | 2022-04-07 | c1c87ee03 | ci: Switch Azure's macOS build to supported OS version (#643) |
91 | 2022-04-09 | cf1e6b11b | build: Define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING for MSVC |
92 | 2022-04-09 | 09c3464ad | ci: Switch GitHub Action's MSVC build to supported OS version (#644) |
93 | 2022-04-12 | 8d83cdca2 | ci: Remove /std:c++latest from MSVC build variants |
94 | 2022-04-12 | 22be33bb6 | ci: Remove cxxstd=2a from GitHub Actions ci.yml workflow |
95 | 2022-04-12 | 41167f600 | ci: Add Boost.Align to transitive dependencies on AppVeyor |
96 | 2022-04-12 | 016ae7877 | ci: Stop building on CircleCI |
97 | 2022-04-12 | c0cb52d1f | ci: Remove CircleCI traces from README.md |
98 | 2022-04-14 | 39089c5f8 | docs: Add Discussions to README.md |
99 | 2022-04-21 | caf92fa94 | Renamed adaptive_he to adaptive_histogram_equalization (#638) |
100 | 2022-04-26 | 4f83beb73 | style: Remove trailing space characters (#651) |
101 | 2022-04-26 | 9ed8fd2b4 | ci: remove Windows Server 2016 from builds on Azure Pipelines (#652) |
102 | 2022-04-26 | 791148660 | fix: is_equal_to_sixteen in PNG I/O was less-than test (#650) |
103 | 2022-04-27 | 9d526ed70 | refactor: Renamed io/dynamic_io_new.hpp to io/detail/dynamic.hpp (#653) |
104 | 2022-04-30 | 3289fe0bc | refactor: Unified operation names for pixel and channel operations (#655) |
105 | 2022-04-30 | c063d1c18 | feat: Added for_each_pixel overload for any_image (#648) |
106 | 2022-05-03 | 36a45e3af | fix documentation links in "See also" sections |
Merge
/d/boost/gil (master|u= origin/master) $ git merge --no-ff develop
Auto-merging .github/workflows/ci.yml
CONFLICT (add/add): Merge conflict in .github/workflows/ci.yml
Auto-merging CMakeLists.txt
Auto-merging CONTRIBUTING.md
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Auto-merging RELEASES.md
CONFLICT (content): Merge conflict in RELEASES.md
Auto-merging test/Jamfile
CONFLICT (content): Merge conflict in test/Jamfile
Auto-merging test/core/channel/algorithm_channel_relation.cpp
CONFLICT (content): Merge conflict in test/core/channel/algorithm_channel_relation.cpp
Automatic merge failed; fix conflicts and then commit the result.
...
Unmerged paths:
(use "git add <file>..." to mark resolution)
both added: .github/workflows/ci.yml
both modified: README.md
both modified: RELEASES.md
both modified: test/Jamfile
both modified: test/core/channel/algorithm_channel_relation.cpp
/d/boost/gil (master|MERGING|u= origin/master) $ git add -A
/d/boost/gil (master|MERGING|u= origin/master) $ git merge --continue
[master 6ef11459a] Merge branch 'develop'
Build (local)
On Windows, using VS 2022, core
only:
b2.exe cxxstd=11 variant=release address-model=64 libs/gil/test/core
On Linux, using gcc 10, all default tests
./b2 cxxstd=11 variant=release address-model=64 libs/gil/test
All pass.
Metadata
Metadata
Assignees
Labels
No labels