sergiotarxz
/
libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

finish vips_sharpen() 

does any image type, any number of bands
This commit is contained in:
John Cupitt 2013-11-14 12:09:42 +00:00
parent 8db331b4b5
commit a01e2e3e13
8 changed files with 132 additions and 604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
TODO
View File

@ -1,4 +1,10 @@
- finish sharpen.c
- try:
$ vips colourspace Opera-icon-high-res.png x.v labs
$ header x.v
x.v: 3056x3325 float, 4 bands, labs, pngload
o.O should be short innit?
- support --strip for other writers

4
libvips/convolution/Makefile.am
View File

@ -11,10 +11,10 @@ libconvolution_la_SOURCES = \
morph.c \
fastcor.c \
spcor.c \
sharpen.c \
im_aconv.c \
im_aconvsep.c \
im_conv.c \
im_conv_f.c \
im_sharpen.c
im_conv_f.c
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@

2
libvips/convolution/convolution.c
View File

@ -152,6 +152,7 @@ vips_convolution_operation_init( void )
extern int vips_convsep_get_type( void );
extern int vips_fastcor_get_type( void );
extern int vips_spcor_get_type( void );
extern int vips_sharpen_get_type( void );
vips_conv_get_type();
vips_morph_get_type();
@ -159,4 +160,5 @@ vips_convolution_operation_init( void )
vips_convsep_get_type();
vips_fastcor_get_type();
vips_spcor_get_type();
vips_sharpen_get_type();
}

371
libvips/convolution/im_sharpen.c
View File

@ -1,371 +0,0 @@
/* Cored sharpen of LABQ image.
*
* Usage:
*
* int im_sharpen( IMAGE *in, IMAGE *out,
* int mask_size,
* int x1, int x2,
* double m1, double m2 )
*
* Returns 0 on success and -1 on error
*
* Copyright: 1995 A. Abbood
* Author: A. Abbood
* Written on: 30/01/1995
* 15/5/95 JC
* - updated for latest 7.3 mods
* - m3 parameter removed
* - bug fixes and speed-ups
* 4/7/95 JC
* - x3 parameter added
* - xs are now double
* 6/7/95 JC
* - xs are now ys
* - better LUT generation
* 12/3/01 JC
* - uses seperable convolution for umask
* - tiny clean ups
* 23/7/01 JC
* - fix for band extract index changed
* 21/4/04
* - switched to gaussian mask and radius
* 20/11/04
* - uses extract_bands() to remove and reattach ab for slight speedup
* - accepts LabS as well as LabQ for slight speedup
* - small code tidies
* - ~15% speed up in total
* 29/11/06
* - convolve first to help region sharing
* 3/2/10
* - gtkdoc
* - cleanups
*/
/*
This file is part of VIPS.
VIPS is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
*/
/*
These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
*/
/*
#define DEBUG
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif /*HAVE_CONFIG_H*/
#include <vips/intl.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include <vips/vips.h>
/* A lut --- we need indexes in the range [-x3,x2], so add x3 to indexes
* before starting to index table.
*/
typedef struct {
int *lut; /* Start of lut */
int x1, x2, x3; /* Parameters scaled up to int */
} SharpenLut;
/* Make a lut.
*/
static SharpenLut *
build_lut( IMAGE *out, int x1, int x2, int x3, double m1, double m2 )
{
SharpenLut *slut;
int i;
if( !(slut = IM_NEW( out, SharpenLut )) )
return( NULL );
if( !(slut->lut = IM_ARRAY( out, x2 + x3 + 1, int )) )
return( NULL );
slut->x1 = x1;
slut->x2 = x2;
slut->x3 = x3;
for( i = 0; i < x1; i++ ) {
slut->lut[x3 + i] = i * m1;
slut->lut[x3 - i] = -i * m1;
}
for( i = x1; i <= x2; i++ )
slut->lut[x3 + i] = x1 * m1 + (i - x1) * m2;
for( i = x1; i <= x3; i++ )
slut->lut[x3 - i] = -(x1 * m1 + (i - x1) * m2);
return( slut );
}
/* Take the difference of in1 and in2 and LUT it.
*/
static void
buf_difflut( short **in, short *out, int n, SharpenLut *slut )
{
int range = slut->x2 + slut->x3;
int *lut = slut->lut;
int x3 = slut->x3;
short *p1 = in[1];
short *p2 = in[0];
int i;
for( i = 0; i < n; i++ ) {
int v1 = p1[i];
int v2 = p2[i];
/* v2 is the area average. If this is zero, then we pass the
* original image through unaltered.
*/
if( v2 == 0 )
out[i] = v1;
else {
/* Find difference. Offset by x3 to get the expected
* range of values.
*/
int s1 = x3 + (v1 - v2);
int s2;
/* Clip to LUT range.
*/
if( s1 < 0 )
s1 = 0;
else if( s1 > range )
s1 = range;
/* Transform!
*/
s2 = v1 + lut[s1];
/* Clip to LabS range.
*/
if( s2 < 0 )
s2 = 0;
else if( s2 > 32767 )
s2 = 32767;
/* And write.
*/
out[i] = s2;
}
}
}
/* Make a 1 line gaussian of a specified radius.
*/
static INTMASK *
sharpen_mask_new( int radius )
{
INTMASK *base;
INTMASK *line;
int total;
int i;
/* Stop at 20% of max ... bit mean, but means mask radius is roughly
* right.
*/
if( !(base = im_gauss_imask( "big1", radius / 2, 0.2 )) )
return( NULL );
if( !(line = im_create_imask( "sharpen-line", base->xsize, 1 )) ) {
im_free_imask( base );
return( NULL );
}
total = 0;
for( i = 0; i < base->xsize; i++ ) {
line->coeff[i] =
base->coeff[base->xsize * (base->ysize / 2) + i];
total += line->coeff[i];
}
line->scale = total;
im_free_imask( base );
#ifdef DEBUG
printf( "sharpen_mask_new: created mask:\n" );
im_print_imask( line );
#endif /*DEBUG*/
return( line );
}
/**
* im_sharpen:
* @in: input image
* @out: output image
* @mask_size: how large a mask to use
* @x1: flat/jaggy threshold
* @y2: maximum amount of brightening
* @y3: maximum amount of darkening
* @m1: slope for flat areas
* @m2: slope for jaggy areas
*
* Selectively sharpen the L channel of a LAB image. Works for %IM_CODING_LABQ
* and LABS images.
*
* The operation performs a gaussian blur of size @mask_size and subtracts
* from @in to
* generate a high-frequency signal. This signal is passed through a lookup
* table formed from the five parameters and added back to @in.
*
* The lookup table is formed like this:
*
* |[
^
y2 |- - - - - -----------
| /
| / slope m2
| .../
-x1 | ... |
-------------------...---------------------->
| ... | x1
|... slope m1
/ |
/ m2 |
/ |
/ |
/ |
/ |
______/ _ _ _ _ _ _ | -y3
|
* ]|
*
* For printing, we recommend the following settings:
*
* |[
mask_size == 7
x1 == 1.5
y2 == 20 (don't brighten by more than 20 L*)
y3 == 50 (can darken by up to 50 L*)
m1 == 1 (some sharpening in flat areas)
m2 == 2 (more sharpening in jaggy areas)
* ]|
*
* If you want more or less sharpening, we suggest you just change the m1
* and m2 parameters.
*
* The @mask_size parameter changes the width of the fringe and can be
* adjusted according to the output printing resolution. As an approximate
* guideline, use 3 for 4 pixels/mm (CRT display resolution), 5 for 8
* pixels/mm, 7 for 12 pixels/mm and 9 for 16 pixels/mm (300 dpi == 12
* pixels/mm). These figures refer to the image raster, not the half-tone
* resolution.
*
* See also: im_conv().
*
* Returns: 0 on success, -1 on error.
*/
int
im_sharpen( IMAGE *in, IMAGE *out,
int mask_size,
double x1, double y2, double y3,
double m1, double m2 )
{
IMAGE *arry[3];
IMAGE *t[4];
INTMASK *mask;
SharpenLut *slut;
/* Turn y parameters into xs.
*/
double x2 = (y2 - x1 * (m1 - m2)) / m2;
double x3 = (y3 - x1 * (m1 - m2)) / m2;
if( in->Coding == IM_CODING_LABQ ) {
IMAGE *tc[2];
if( im_open_local_array( out, tc, 2, "im_sharpen:1", "p" ) ||
im_LabQ2LabS( in, tc[0] ) ||
im_sharpen( tc[0], tc[1],
mask_size, x1, y2, y3, m1, m2 ) ||
im_LabS2LabQ( tc[1], out ) )
return( -1 );
return( 0 );
}
/* Check IMAGE parameters
*/
if( im_piocheck( in, out ) ||
im_check_uncoded( "im_sharpen", in ) ||
im_check_bands( "im_gradcor", in, 3 ) ||
im_check_format( "im_gradcor", in, IM_BANDFMT_SHORT ) )
return( -1 );
/* Check number range.
*/
if( x1 < 0 || x1 > 99 ||
x2 < 0 || x2 > 99 ||
x1 > x2 ||
x3 < 0 || x3 > 99 ||
x1 > x3 ) {
im_error( "im_sharpen", "%s", _( "parameters out of range" ) );
return( -1 );
}
/* Set up data structures we need. First, the convolution mask we will
* use.
*/
if( !(mask = im_local_imask( out, sharpen_mask_new( mask_size ) )) )
return( -1 );
/* Make the lut we will use. We need to scale up x1, x2, x3 to the
* LabS range.
*/
if( !(slut = build_lut( out,
x1 * 327.67, x2 * 327.67, x3 * 327.67, m1, m2 )) )
return( -1 );
/* Open a set of local image descriptors.
*/
if( im_open_local_array( out, t, 4, "im_sharpen:2", "p" ) )
return( -1 );
/* Extract L and ab, convolve L.
*/
if( im_extract_band( in, t[0], 0 ) ||
im_extract_bands( in, t[1], 1, 2 ) ||
im_convsep( t[0], t[2], mask ) )
return( -1 );
/* Find difference of L channel and convolved L channel, and pass
* through LUT.
*/
if( im_cp_desc( t[3], t[2] ) )
return( -1 );
arry[0] = t[2]; arry[1] = t[0]; arry[2] = NULL;
if( im_wrapmany( arry, t[3],
(im_wrapmany_fn) buf_difflut, slut, NULL ) )
return( -1 );
/* Reattach ab.
*/
if( im_bandjoin( t[3], t[1], out ) )
return( -1 );
return( 0 );
}

309
libvips/convolution/sharpen.c
View File

@ -41,6 +41,7 @@
* - cleanups
* 13/11/13
* - redo as a class
* - does any type, any number of bands
*/
/*
@ -91,7 +92,7 @@ typedef struct _VipsSharpen {
VipsImage *in;
VipsImage *out;
int mask_size,
int mask_size;
double x1;
double y2;
double y3;
@ -108,7 +109,7 @@ typedef struct _VipsSharpen {
*/
int ix1;
int ix2;
int ix3;
int ix3;
/* The lut we build.
*/
@ -120,171 +121,6 @@ typedef VipsOperationClass VipsSharpenClass;
G_DEFINE_TYPE( VipsSharpen, vips_sharpen, VIPS_TYPE_OPERATION );
/* Take the difference of in1 and in2 and LUT it.
*/
static void
buf_difflut( short **in, short *out, int n, SharpenLut *slut )
{
int range = slut->x2 + slut->x3;
int *lut = slut->lut;
int x3 = slut->x3;
short *p1 = in[1];
short *p2 = in[0];
int i;
for( i = 0; i < n; i++ ) {
int v1 = p1[i];
int v2 = p2[i];
/* v2 is the area average. If this is zero, then we pass the
* original image through unaltered.
*/
if( v2 == 0 )
out[i] = v1;
else {
/* Find difference. Offset by x3 to get the expected
* range of values.
*/
int s1 = x3 + (v1 - v2);
int s2;
/* Clip to LUT range.
*/
if( s1 < 0 )
s1 = 0;
else if( s1 > range )
s1 = range;
/* Transform!
*/
s2 = v1 + lut[s1];
/* Clip to LabS range.
*/
if( s2 < 0 )
s2 = 0;
else if( s2 > 32767 )
s2 = 32767;
/* And write.
*/
out[i] = s2;
}
}
}
int
im_sharpen( IMAGE *in, IMAGE *out,
int mask_size,
double x1, double y2, double y3,
double m1, double m2 )
{
IMAGE *arry[3];
IMAGE *t[4];
VipsImage *mask;
/* Turn y parameters into xs.
*/
double x2 = (y2 - x1 * (m1 - m2)) / m2;
double x3 = (y3 - x1 * (m1 - m2)) / m2;
if( in->Coding == IM_CODING_LABQ ) {
IMAGE *tc[2];
if( im_open_local_array( out, tc, 2, "im_sharpen:1", "p" ) ||
im_LabQ2LabS( in, tc[0] ) ||
im_sharpen( tc[0], tc[1],
mask_size, x1, y2, y3, m1, m2 ) ||
im_LabS2LabQ( tc[1], out ) )
return( -1 );
return( 0 );
}
/* Check IMAGE parameters
*/
if( im_piocheck( in, out ) ||
im_check_uncoded( "im_sharpen", in ) ||
im_check_bands( "im_gradcor", in, 3 ) ||
im_check_format( "im_gradcor", in, IM_BANDFMT_SHORT ) )
return( -1 );
/* Check number range.
*/
if( x1 < 0 || x1 > 99 ||
x2 < 0 || x2 > 99 ||
x1 > x2 ||
x3 < 0 || x3 > 99 ||
x1 > x3 ) {
im_error( "im_sharpen", "%s", _( "parameters out of range" ) );
return( -1 );
}
/* Open a set of local image descriptors.
*/
if( im_open_local_array( out, t, 4, "im_sharpen:2", "p" ) )
return( -1 );
return( 0 );
}
/* Our sequence value: the region this sequence is using, and local stats.
*/
typedef struct {
VipsRegion *ir; /* Input region */
/* A 256-element hist for evry band.
*/
unsigned int **hist;
} VipsSharpenSequence;
static int
vips_sharpen_stop( void *vseq, void *a, void *b )
{
VipsSharpenSequence *seq = (VipsSharpenSequence *) vseq;
VipsImage *in = (VipsImage *) a;
VIPS_UNREF( seq->ir );
if( seq->hist ) {
int i;
for( i = 0; i < in->Bands; i++ )
VIPS_FREE( seq->hist[i] );
VIPS_FREE( seq->hist );
}
VIPS_FREE( seq );
return( 0 );
}
static void *
vips_sharpen_start( VipsImage *out, void *a, void *b )
{
VipsImage *in = (VipsImage *) a;
VipsSharpenSequence *seq;
int i;
if( !(seq = VIPS_NEW( NULL, VipsSharpenSequence )) )
return( NULL );
seq->ir = NULL;
seq->hist = NULL;
if( !(seq->ir = vips_region_new( in )) ||
!(seq->hist = VIPS_ARRAY( NULL, in->Bands, unsigned int * )) ) {
vips_sharpen_stop( seq, NULL, NULL );
return( NULL );
}
for( i = 0; i < in->Bands; i++ )
if( !(seq->hist[i] = VIPS_ARRAY( NULL, 256, unsigned int )) ) {
vips_sharpen_stop( seq, NULL, NULL );
return( NULL );
}
return( seq );
}
static int
vips_sharpen_generate( VipsRegion *or,
void *vseq, void *a, void *b, gboolean *stop )
@ -292,22 +128,53 @@ vips_sharpen_generate( VipsRegion *or,
VipsRegion **in = (VipsRegion **) vseq;
VipsSharpen *sharpen = (VipsSharpen *) b;
VipsRect *r = &or->valid;
int ix3 = sharpen->ix3;
int range = sharpen->ix2 + sharpen->ix3;
int *lut = sharpen->lut;
VipsRect irect;
int x, y;
if( vips_region_prepare( in[0], r ) ||
vips_region_prepare( in[1], r ) )
return( -1 );
lsk = VIPS_REGION_LSKIP( seq->ir );
centre = lsk * (local->height / 2) + bands * local->width / 2;
for( y = 0; y < r->height; y++ ) {
/* Get input and output pointers for this line.
*/
VipsPel *p = VIPS_REGION_ADDR( seq->ir, r->left, r->top + y );
VipsPel *q = VIPS_REGION_ADDR( or, r->left, r->top + y );
short *p1 = (short *)
VIPS_REGION_ADDR( in[0], r->left, r->top + y );
short *p2 = (short *)
VIPS_REGION_ADDR( in[1], r->left, r->top + y );
short *q = (short *)
VIPS_REGION_ADDR( or, r->left, r->top + y );
for( x = 0; x < r->width; x++ ) {
int v1 = p1[x];
int v2 = p2[x];
/* v2 is the area average. If this is zero, then we
* pass the original image through unaltered.
*/
if( v2 == 0 )
q[x] = v1;
else {
/* Find difference. Offset by x3 to get the
* expected range of values.
*/
int s1 = ix3 + (v1 - v2);
int s2;
if( s1 < 0 )
s1 = 0;
else if( s1 > range )
s1 = range;
s2 = v1 + lut[s1];
if( s2 < 0 )
s2 = 0;
else if( s2 > 32767 )
s2 = 32767;
q[x] = s2;
}
}
}
@ -319,11 +186,13 @@ static int
vips_sharpen_build( VipsObject *object )
{
VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( object );
VipsSharpen *local = (VipsSharpen *) object;
VipsImage **t = (VipsImage **) vips_object_local_array( object, 3 );
VipsSharpen *sharpen = (VipsSharpen *) object;
VipsImage **t = (VipsImage **) vips_object_local_array( object, 7 );
VipsImage **args = (VipsImage **) vips_object_local_array( object, 2 );
VipsImage *in;
int ix1, ix2, ix3;
int i;
if( VIPS_OBJECT_CLASS( vips_sharpen_parent_class )->build( object ) )
return( -1 );
@ -342,7 +211,7 @@ vips_sharpen_build( VipsObject *object )
in = t[0];
if( vips_check_uncoded( class->nickname, in ) ||
vips_check_bands( class->nickname, in, 3 ) ||
vips_check_bands_atleast( class->nickname, in, 3 ) ||
vips_check_format( class->nickname, in, VIPS_FORMAT_SHORT ) )
return( -1 );
@ -359,7 +228,7 @@ vips_sharpen_build( VipsObject *object )
/* Stop at 20% of max ... bit mean, but means mask radius is roughly
* right.
*/
if( vips_gaussmat( &t[1], radius / 2, 0.2,
if( vips_gaussmat( &t[1], sharpen->mask_size / 2, 0.2,
"separable", TRUE,
"integer", TRUE,
NULL ) )
@ -367,31 +236,28 @@ vips_sharpen_build( VipsObject *object )
/* Build the int lut.
*/
sharpen->ix1 = x1 * 327.67;
sharpen->ix2 = x2 * 327.67;
sharpen->ix3 = x3 * 327.67;
sharpen->ix1 = ix1 = sharpen->x1 * 327.67;
sharpen->ix2 = ix2 = sharpen->x2 * 327.67;
sharpen->ix3 = ix3 = sharpen->x3 * 327.67;
if( !(sharpen->lut = VIPS_ARRAY( sharpen->out,
sharpen->ix2 + sharpen->ix3 + 1, int )) )
if( !(sharpen->lut = VIPS_ARRAY( sharpen->out, ix2 + ix3 + 1, int )) )
return( -1 );
for( i = 0; i < sharpen->ix1; i++ ) {
slut->lut[sharpen->ix3 + i] = i * m1;
slut->lut[sharpen->ix3 - i] = -i * m1;
for( i = 0; i < ix1; i++ ) {
sharpen->lut[ix3 + i] = i * sharpen->m1;
sharpen->lut[ix3 - i] = -i * sharpen->m1;
}
for( i = sharpen->ix1; i <= sharpen->ix2; i++ )
slut->lut[sharpen->ix3 + i] =
sharpen->ix1 * sharpen->m1 +
(i - sharpen->ix1) * sharpen->m2;
for( i = sharpen->ix1; i <= sharpen->ix3; i++ )
slut->lut[sharpen->ix3 - i] =
-(sharpen->ix1 * sharpen->m1 +
(i - sharpen->ix1) * sharpen->m2);
for( i = ix1; i <= ix2; i++ )
sharpen->lut[ix3 + i] =
ix1 * sharpen->m1 + (i - ix1) * sharpen->m2;
for( i = ix1; i <= ix3; i++ )
sharpen->lut[ix3 - i] =
-(ix1 * sharpen->m1 + (i - ix1) * sharpen->m2);
/* Extract L and ab, convolve L.
/* Extract L and the rest, convolve L.
*/
if( vips_extract_band( in, &args[0], 0, NULL ) ||
vips_extract_bands( in, &t[3], 1, "n", 2, NULL ) ||
vips_extract_band( in, &t[3], 1, "n", in->Bands - 1, NULL ) ||
vips_convsep( args[0], &args[1], t[1], NULL ) )
return( -1 );
@ -410,7 +276,7 @@ vips_sharpen_build( VipsObject *object )
g_object_set( object, "out", vips_image_new(), NULL );
/* Reattach ab.
/* Reattach the rest.
*/
if( vips_bandjoin2( t[5], t[3], &t[6], NULL ) ||
vips_image_write( t[6], sharpen->out ) )
@ -444,45 +310,45 @@ vips_sharpen_class_init( VipsSharpenClass *class )
VIPS_ARGUMENT_REQUIRED_OUTPUT,
G_STRUCT_OFFSET( VipsSharpen, out ) );
VIPS_ARG_INT( class, "mask_size", 4,
VIPS_ARG_INT( class, "mask_size", 3,
_( "mask_size" ),
_( "Mask radius" ),
VIPS_ARGUMENT_REQUIRED_INPUT,
G_STRUCT_OFFSET( VipsSharpen, mask_radius ),
VIPS_ARGUMENT_OPTIONAL_INPUT,
G_STRUCT_OFFSET( VipsSharpen, mask_size ),
1, 1000000, 7 );
VIPS_ARG_DOUBLE( class, "x1", 4,
_( "x1" ),
_( "Flat/jaggy threshold" ),
VIPS_ARGUMENT_REQUIRED_INPUT,
VIPS_ARGUMENT_OPTIONAL_INPUT,
G_STRUCT_OFFSET( VipsSharpen, x1 ),
1, 1000000, 1.5 );
VIPS_ARG_DOUBLE( class, "y2", 5,
_( "y2" ),
_( "Maximum brightening" ),
VIPS_ARGUMENT_REQUIRED_INPUT,
VIPS_ARGUMENT_OPTIONAL_INPUT,
G_STRUCT_OFFSET( VipsSharpen, y2 ),
1, 1000000, 20 );
VIPS_ARG_DOUBLE( class, "y3", 6,
_( "y3" ),
_( "Maximum darkening" ),
VIPS_ARGUMENT_REQUIRED_INPUT,
VIPS_ARGUMENT_OPTIONAL_INPUT,
G_STRUCT_OFFSET( VipsSharpen, y3 ),
1, 1000000, 50 );
VIPS_ARG_DOUBLE( class, "m1", 6,
VIPS_ARG_DOUBLE( class, "m1", 7,
_( "m1" ),
_( "Slope for flat areas" ),
VIPS_ARGUMENT_REQUIRED_INPUT,
VIPS_ARGUMENT_OPTIONAL_INPUT,
G_STRUCT_OFFSET( VipsSharpen, m1 ),
1, 1000000, 1 );
VIPS_ARG_DOUBLE( class, "m2", 7,
VIPS_ARG_DOUBLE( class, "m2", 8,
_( "m2" ),
_( "Slope for jaggy areas" ),
VIPS_ARGUMENT_REQUIRED_INPUT,
VIPS_ARGUMENT_OPTIONAL_INPUT,
G_STRUCT_OFFSET( VipsSharpen, m2 ),
1, 1000000, 2 );
@ -503,21 +369,24 @@ vips_sharpen_init( VipsSharpen *sharpen )
* vips_sharpen:
* @in: input image
* @out: output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:
*
* @mask_size: how large a mask to use
* @x1: flat/jaggy threshold
* @y2: maximum amount of brightening
* @y3: maximum amount of darkening
* @m1: slope for flat areas
* @m2: slope for jaggy areas
* @...: %NULL-terminated list of optional named arguments
*
* Selectively sharpen the L channel of a LAB image. Works for
* #VIPS_CODING_LABQ and LABS images.
* Selectively sharpen the L channel of a LAB image. The input image is
* transformed to #VIPS_INTERPRETATION_LABS.
*
* The operation performs a gaussian blur of size @mask_size and subtracts
* from @in to
* generate a high-frequency signal. This signal is passed through a lookup
* table formed from the five parameters and added back to @in.
* from @in to generate a high-frequency signal. This signal is passed
* through a lookup table formed from the five parameters and added back to
* @in.
*
* The lookup table is formed like this:
*
@ -541,7 +410,7 @@ vips_sharpen_init( VipsSharpen *sharpen )
|
* ]|
*
* For printing, we recommend the following settings:
* For printing, we recommend the following settings (the defaults):
*
* |[
mask_size == 7
@ -568,17 +437,13 @@ vips_sharpen_init( VipsSharpen *sharpen )
* Returns: 0 on success, -1 on error.
*/
int
vips_sharpen( VipsImage *in, VipsImage **out,
int mask_size,
double x1, double y2, double y3, double m1, double m2,
... )
vips_sharpen( VipsImage *in, VipsImage **out, ... )
{
va_list ap;
int result;
va_start( ap, m2 );
result = vips_call_split( "sharpen", ap, in, out,
mask_size, x1, y2, y3, m1, m2 );
va_start( ap, out );
result = vips_call_split( "sharpen", ap, in, out );
va_end( ap );
return( result );

26
libvips/deprecated/vips7compat.c
View File

@ -2324,6 +2324,32 @@ im_fastcor( IMAGE *in, IMAGE *ref, IMAGE *out )
return( 0 );
}
int
im_sharpen( IMAGE *in, IMAGE *out,
int mask_size,
double x1, double y2, double y3,
double m1, double m2 )
{
VipsImage *x;
if( vips_call( "sharpen", in, &x,
"mask_size", mask_size,
"x1", x1,
"y2", y2,
"y3", y3,
"m1", m1,
"m2", m2,
NULL ) )
return( -1 );
if( im_copy( x, out ) ) {
g_object_unref( x );
return( -1 );
}
g_object_unref( x );
return( 0 );
}
static int
vips__round( VipsImage *in, VipsImage *out, VipsOperationRound round )
{

11
libvips/include/vips/convolution.h
View File

@ -78,16 +78,11 @@ int vips_morph( VipsImage *in, VipsImage **out, VipsImage *mask,
VipsOperationMorphology morph, ... )
__attribute__((sentinel));
int vips_sharpen( VipsImage *in, VipsImage **out, ... )
__attribute__((sentinel));
void vips_convolution_operation_init( void );
int im_sharpen( VipsImage *in, VipsImage *out,
int mask_size,
double x1, double y2, double y3,
double m1, double m2 );
#ifdef __cplusplus
}
#endif /*__cplusplus*/

5
libvips/include/vips/vips7compat.h
View File

@ -930,6 +930,11 @@ int im_fastcor( VipsImage *in, VipsImage *ref, VipsImage *out );
int im_spcor( VipsImage *in, VipsImage *ref, VipsImage *out );
int im_gradcor( VipsImage *in, VipsImage *ref, VipsImage *out );
int im_sharpen( VipsImage *in, VipsImage *out,
int mask_size,
double x1, double y2, double y3,
double m1, double m2 );
#ifdef __cplusplus
}
#endif /*__cplusplus*/