Skip to content

Commit

Permalink
morph: sync C-paths with the Highway implementation
Browse files Browse the repository at this point in the history 
Previously, `seq->coff` was used both for storing offsets to clear
values (zero values in masks) and as an array for non-128 mask
coefficients. However, in commit 40e2884 (PR libvips#3618), `seq->coff`
was restricted to `guint8` values, making it incompatible for
storing offsets.

Fix this by syncing the C-paths with the Highway implementation.
  • Loading branch information
@kleisauke
kleisauke committed Nov 2, 2024
1 parent 6163149 commit 302689a
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 138 deletions.
1 change: 1 addition & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

- support multipage JXL
- morph: fix erode Highway path [kleisauke]
- morph: fix C-paths with masks containing zero [kleisauke]

10/10/24 8.16.0

Expand Down
201 changes: 63 additions & 138 deletions libvips/morphology/morph.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,9 @@ typedef struct {
VipsMorph *morph;
VipsRegion *ir; /* Input region */

int *soff; /* Offsets we check for set */
int ss; /* ... and number we check for set */
guint8 *coff; /* Offsets we check for clear */
int cs; /* ... and number we check for clear */
int *off; /* Offsets for each non-128 matrix element */
int nn128; /* Number of non-128 mask elements */
guint8 *coeff; /* Array of non-128 mask coefficients */

int last_bpl; /* Avoid recalcing offsets, if we can */

Expand Down Expand Up @@ -212,10 +211,9 @@ vips_morph_start(VipsImage *out, void *a, void *b)
*/
seq->morph = morph;
seq->ir = NULL;
seq->soff = NULL;
seq->ss = 0;
seq->coff = NULL;
seq->cs = 0;
seq->off = NULL;
seq->nn128 = 0;
seq->coeff = NULL;
seq->last_bpl = -1;
#ifdef HAVE_ORC
seq->t1 = NULL;
Expand All @@ -224,11 +222,11 @@ vips_morph_start(VipsImage *out, void *a, void *b)

seq->ir = vips_region_new(in);

seq->soff = VIPS_ARRAY(out, morph->n_point, int);
seq->coff = VIPS_ARRAY(out, morph->n_point, guint8);
seq->off = VIPS_ARRAY(out, morph->n_point, int);
seq->coeff = VIPS_ARRAY(out, morph->n_point, guint8);

if (!seq->soff ||
!seq->coff) {
if (!seq->off ||
!seq->coeff) {
vips_morph_stop(seq, in, morph);
return NULL;
}
Expand Down Expand Up @@ -263,13 +261,8 @@ vips_dilate_vector_gen(VipsRegion *out_region,
VipsImage *M = morph->M;
VipsRegion *ir = seq->ir;

/* Offsets for each non-128 matrix element.
*/
int *soff = seq->soff;

/* Array of non-128 mask coefficients.
*/
guint8 *coff = seq->coff;
int *off = seq->off;
guint8 *coeff = seq->coeff;

VipsRect *r = &out_region->valid;
int sz = VIPS_REGION_N_ELEMENTS(out_region);
Expand Down Expand Up @@ -298,29 +291,26 @@ vips_dilate_vector_gen(VipsRegion *out_region,
if (seq->last_bpl != VIPS_REGION_LSKIP(ir)) {
seq->last_bpl = VIPS_REGION_LSKIP(ir);

/* Number of non-128 mask elements.
*/
seq->ss = 0;
seq->nn128 = 0;
for (t = morph->coeff, y = 0; y < M->Ysize; y++)
for (x = 0; x < M->Xsize; x++, t++) {
/* Exclude don't-care elements.
*/
if (*t == 128)
continue;

soff[seq->ss] =
VIPS_REGION_ADDR(ir,
x + r->left, y + r->top) -
off[seq->nn128] =
VIPS_REGION_ADDR(ir, x + r->left, y + r->top) -
VIPS_REGION_ADDR(ir, r->left, r->top);
coff[seq->ss] = *t;
seq->ss++;
coeff[seq->nn128] = *t;
seq->nn128++;
}
}

VIPS_GATE_START("vips_dilate_vector_gen: work");

vips_dilate_uchar_hwy(out_region, ir, r,
sz, seq->ss, soff, coff);
sz, seq->nn128, off, coeff);

VIPS_GATE_STOP("vips_dilate_vector_gen: work");

Expand All @@ -338,13 +328,8 @@ vips_erode_vector_gen(VipsRegion *out_region,
VipsImage *M = morph->M;
VipsRegion *ir = seq->ir;

/* Offsets for each non-128 matrix element.
*/
int *soff = seq->soff;

/* Array of non-128 mask coefficients.
*/
guint8 *coff = seq->coff;
int *off = seq->off;
guint8 *coeff = seq->coeff;

VipsRect *r = &out_region->valid;
int sz = VIPS_REGION_N_ELEMENTS(out_region);
Expand Down Expand Up @@ -373,29 +358,26 @@ vips_erode_vector_gen(VipsRegion *out_region,
if (seq->last_bpl != VIPS_REGION_LSKIP(ir)) {
seq->last_bpl = VIPS_REGION_LSKIP(ir);

/* Number of non-128 mask elements.
*/
seq->ss = 0;
seq->nn128 = 0;
for (t = morph->coeff, y = 0; y < M->Ysize; y++)
for (x = 0; x < M->Xsize; x++, t++) {
/* Exclude don't-care elements.
*/
if (*t == 128)
continue;

soff[seq->ss] =
VIPS_REGION_ADDR(ir,
x + r->left, y + r->top) -
off[seq->nn128] =
VIPS_REGION_ADDR(ir, x + r->left, y + r->top) -
VIPS_REGION_ADDR(ir, r->left, r->top);
coff[seq->ss] = *t;
seq->ss++;
coeff[seq->nn128] = *t;
seq->nn128++;
}
}

VIPS_GATE_START("vips_erode_vector_gen: work");

vips_erode_uchar_hwy(out_region, ir, r,
sz, seq->ss, soff, coff);
sz, seq->nn128, off, coeff);

VIPS_GATE_STOP("vips_erode_vector_gen: work");

Expand Down Expand Up @@ -667,8 +649,8 @@ vips_dilate_gen(VipsRegion *out_region,
VipsImage *M = morph->M;
VipsRegion *ir = seq->ir;

int *soff = seq->soff;
guint8 *coff = seq->coff;
int *off = seq->off;
guint8 *coeff = seq->coeff;

VipsRect *r = &out_region->valid;
int le = r->left;
Expand Down Expand Up @@ -701,66 +683,36 @@ vips_dilate_gen(VipsRegion *out_region,
if (seq->last_bpl != VIPS_REGION_LSKIP(ir)) {
seq->last_bpl = VIPS_REGION_LSKIP(ir);

seq->ss = 0;
seq->cs = 0;
seq->nn128 = 0;
for (t = morph->coeff, y = 0; y < M->Ysize; y++)
for (x = 0; x < M->Xsize; x++, t++)
switch (*t) {
case 255:
soff[seq->ss++] =
VIPS_REGION_ADDR(ir,
x + le, y + to) -
VIPS_REGION_ADDR(ir, le, to);
break;

case 128:
break;

case 0:
coff[seq->cs++] =
VIPS_REGION_ADDR(ir,
x + le, y + to) -
VIPS_REGION_ADDR(ir, le, to);
break;

default:
g_assert_not_reached();
}
for (x = 0; x < M->Xsize; x++, t++) {
/* Exclude don't-care elements.
*/
if (*t == 128)
continue;

off[seq->nn128] =
VIPS_REGION_ADDR(ir, x + le, y + to) -
VIPS_REGION_ADDR(ir, le, to);
coeff[seq->nn128] = *t;
seq->nn128++;
}
}

VIPS_GATE_START("vips_dilate_gen: work");

/* Dilate!
*/
for (y = to; y < bo; y++) {
VipsPel *p = VIPS_REGION_ADDR(ir, le, y);
VipsPel *q = VIPS_REGION_ADDR(out_region, le, y);

/* Loop along line.
*/
for (x = 0; x < sz; x++, q++, p++) {
/* Search for a hit on the set list.
/* Dilate!
*/
result = 0;
for (i = 0; i < seq->ss; i++)
if (p[soff[i]]) {
/* Found a match!
*/
result = 255;
break;
}

/* No set pixels ... search for a hit in the clear
* pixels.
*/
if (!result)
for (i = 0; i < seq->cs; i++)
if (!p[coff[i]]) {
/* Found a match!
*/
result = 255;
break;
}
for (i = 0; i < seq->nn128; i++)
result |= !coeff[i] ? p[off[i]] ^ 255 : p[off[i]];

*q = result;
}
Expand All @@ -784,8 +736,8 @@ vips_erode_gen(VipsRegion *out_region,
VipsImage *M = morph->M;
VipsRegion *ir = seq->ir;

int *soff = seq->soff;
guint8 *coff = seq->coff;
int *off = seq->off;
guint8 *coeff = seq->coeff;

VipsRect *r = &out_region->valid;
int le = r->left;
Expand Down Expand Up @@ -818,63 +770,36 @@ vips_erode_gen(VipsRegion *out_region,
if (seq->last_bpl != VIPS_REGION_LSKIP(ir)) {
seq->last_bpl = VIPS_REGION_LSKIP(ir);

seq->ss = 0;
seq->cs = 0;
seq->nn128 = 0;
for (t = morph->coeff, y = 0; y < M->Ysize; y++)
for (x = 0; x < M->Xsize; x++, t++)
switch (*t) {
case 255:
soff[seq->ss++] =
VIPS_REGION_ADDR(ir,
x + le, y + to) -
VIPS_REGION_ADDR(ir, le, to);
break;

case 128:
break;

case 0:
coff[seq->cs++] =
VIPS_REGION_ADDR(ir,
x + le, y + to) -
VIPS_REGION_ADDR(ir, le, to);
break;

default:
g_assert_not_reached();
}
for (x = 0; x < M->Xsize; x++, t++) {
/* Exclude don't-care elements.
*/
if (*t == 128)
continue;

off[seq->nn128] =
VIPS_REGION_ADDR(ir, x + le, y + to) -
VIPS_REGION_ADDR(ir, le, to);
coeff[seq->nn128] = *t;
seq->nn128++;
}
}

VIPS_GATE_START("vips_erode_gen: work");

/* Erode!
*/
for (y = to; y < bo; y++) {
VipsPel *p = VIPS_REGION_ADDR(ir, le, y);
VipsPel *q = VIPS_REGION_ADDR(out_region, le, y);

/* Loop along line.
*/
for (x = 0; x < sz; x++, q++, p++) {
/* Check all set pixels are set.
/* Erode!
*/
result = 255;
for (i = 0; i < seq->ss; i++)
if (!p[soff[i]]) {
/* Found a mismatch!
*/
result = 0;
break;
}

/* Check all clear pixels are clear.
*/
if (result)
for (i = 0; i < seq->cs; i++)
if (p[coff[i]]) {
result = 0;
break;
}
for (i = 0; i < seq->nn128; i++)
result &= !coeff[i] ? ~p[off[i]] : p[off[i]];

*q = result;
}
Expand Down Expand Up @@ -950,7 +875,7 @@ vips_morph_build(VipsObject *object)
coeff[i]);
return -1;
}
morph->coeff[i] = coeff[i];
morph->coeff[i] = (guint8) coeff[i];
}

/* Try to make a vector path.
Expand Down

0 comments on commit 302689a

Please sign in to comment.