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

add a censorization module #7255

Merged
merged 1 commit into from Jan 1, 2021
Merged

Conversation

aurelienpierre
Copy link
Member

@aurelienpierre aurelienpierre commented Dec 9, 2020

This branch was merged to darktable master by accident, then reverted temporarily, but we need to merge it after 3.4

This reverts commit 1364661 and reopens #7192

@aurelienpierre aurelienpierre added this to the 3.4.1 milestone Dec 9, 2020
@TurboGit TurboGit self-requested a review Dec 22, 2020
@TurboGit TurboGit added the scope: image processing correcting pixels label Dec 22, 2020
Copy link
Member

@TurboGit TurboGit left a comment

Some comments, apart from that it works on my side.

src/iop/censorize.c Outdated Show resolved Hide resolved
src/iop/censorize.c Outdated Show resolved Hide resolved
src/iop/censorize.c Outdated Show resolved Hide resolved
This branch was merged to darktable master by accident, then reverted temporarily, but we need to merge it after 3.4

This reverts commit 1364661.
const int ch = 4;
assert(piece->colors == ch);

float *const restrict temp = dt_alloc_sse_ps(width * height * ch);
Copy link
Member

@TurboGit TurboGit Jan 1, 2021

Choose a reason for hiding this comment

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

dt_alloc_sse_ps() -> dt_alloc_align_float()

Same def, but better to use later in non SSE code path.

Copy link
Member

@TurboGit TurboGit Jan 1, 2021

Choose a reason for hiding this comment

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

Will do.

Copy link
Member

@TurboGit TurboGit left a comment

Ok, I'll do the change, the code seems good. Thanks.

@TurboGit TurboGit merged commit 41247ee into darktable-org:master Jan 1, 2021
13 of 20 checks passed
@TurboGit
Copy link
Member

TurboGit commented Jan 1, 2021

Merged in master, queued for 3.4.1.

@elstoc elstoc added the documentation-pending a documentation work is required label Jan 28, 2021
@elstoc elstoc added documentation-complete needed documentation is merged in dtdocs and removed documentation-pending a documentation work is required labels Feb 7, 2021
@TurboGit TurboGit modified the milestones: 3.4.1, 3.6 Feb 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation-complete needed documentation is merged in dtdocs scope: image processing correcting pixels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants