small fixes
This commit is contained in:
parent
a2b760c523
commit
df225a97ff
@ -78,41 +78,51 @@ IGNORE_VIPS_INCLUDE = \
|
|||||||
private.h \
|
private.h \
|
||||||
video.h
|
video.h
|
||||||
|
|
||||||
# ignore all .h files in libvips/*, theese are internal
|
# ignore all .h files in libvips/*, these are internal
|
||||||
IGNORE_VIPS_C = \
|
IGNORE_VIPS_C = \
|
||||||
binary.h \
|
binary.h \
|
||||||
parithmetic.h \
|
|
||||||
statistic.h \
|
|
||||||
unaryconst.h \
|
|
||||||
unary.h \
|
|
||||||
CImg.h \
|
|
||||||
pcolour.h \
|
|
||||||
bandary.h \
|
|
||||||
pconversion.h \
|
|
||||||
pcreate.h \
|
|
||||||
point.h \
|
|
||||||
analyze2vips.h \
|
|
||||||
csv.h \
|
|
||||||
dbh.h \
|
|
||||||
fits.h \
|
|
||||||
jpeg.h \
|
|
||||||
magick.h \
|
magick.h \
|
||||||
|
parithmetic.h \
|
||||||
matlab.h \
|
matlab.h \
|
||||||
|
statistic.h \
|
||||||
openexr2vips.h \
|
openexr2vips.h \
|
||||||
|
unaryconst.h \
|
||||||
openslide2vips.h \
|
openslide2vips.h \
|
||||||
|
unary.h \
|
||||||
ppm.h \
|
ppm.h \
|
||||||
|
CImg.h \
|
||||||
radiance.h \
|
radiance.h \
|
||||||
|
pcolour.h \
|
||||||
tiff.h \
|
tiff.h \
|
||||||
|
bandary.h \
|
||||||
|
vipsjpeg.h \
|
||||||
|
pconversion.h \
|
||||||
vipspng.h \
|
vipspng.h \
|
||||||
draw.h \
|
correlation.h \
|
||||||
|
webp.h \
|
||||||
|
pconvolution.h \
|
||||||
|
pfreqfilt.h \
|
||||||
|
pcreate.h \
|
||||||
|
hist_unary.h \
|
||||||
|
pmask.h \
|
||||||
|
phistogram.h \
|
||||||
|
point.h \
|
||||||
base64.h \
|
base64.h \
|
||||||
|
drawink.h \
|
||||||
sink.h \
|
sink.h \
|
||||||
|
draw_line.h \
|
||||||
|
pmorphology.h \
|
||||||
|
pdraw.h \
|
||||||
global_balance.h \
|
global_balance.h \
|
||||||
|
analyze2vips.h \
|
||||||
merge.h \
|
merge.h \
|
||||||
|
csv.h \
|
||||||
mosaic.h \
|
mosaic.h \
|
||||||
|
dbh.h \
|
||||||
presample.h \
|
presample.h \
|
||||||
|
fits.h \
|
||||||
templates.h \
|
templates.h \
|
||||||
im_video_v4l1.h
|
jpeg.h
|
||||||
|
|
||||||
IGNORE_HFILES = $(IGNORE_VIPS_INCLUDE) $(IGNORE_VIPS_C)
|
IGNORE_HFILES = $(IGNORE_VIPS_INCLUDE) $(IGNORE_VIPS_C)
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
<xi:include href="xml/foreign.xml"/>
|
<xi:include href="xml/foreign.xml"/>
|
||||||
<xi:include href="xml/freqfilt.xml"/>
|
<xi:include href="xml/freqfilt.xml"/>
|
||||||
<xi:include href="xml/histogram.xml"/>
|
<xi:include href="xml/histogram.xml"/>
|
||||||
<xi:include href="xml/inplace.xml"/>
|
<xi:include href="xml/draw.xml"/>
|
||||||
<xi:include href="xml/interpolate.xml"/>
|
<xi:include href="xml/interpolate.xml"/>
|
||||||
<xi:include href="xml/morphology.xml"/>
|
<xi:include href="xml/morphology.xml"/>
|
||||||
<xi:include href="xml/mosaicing.xml"/>
|
<xi:include href="xml/mosaicing.xml"/>
|
||||||
|
@ -53,7 +53,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* SECTION: create
|
* SECTION: create
|
||||||
* @short_description: create #VipsImage in various ways
|
* @short_description: create images in various ways
|
||||||
* @stability: Stable
|
* @stability: Stable
|
||||||
* @include: vips/vips.h
|
* @include: vips/vips.h
|
||||||
*
|
*
|
||||||
|
@ -478,11 +478,14 @@ vips_draw_flood_build( VipsObject *object )
|
|||||||
|
|
||||||
flood.test = drawflood->test;
|
flood.test = drawflood->test;
|
||||||
flood.image = draw->image;
|
flood.image = draw->image;
|
||||||
|
flood.tsize = VIPS_IMAGE_SIZEOF_PEL( flood.test );
|
||||||
flood.equal = drawflood->equal;
|
flood.equal = drawflood->equal;
|
||||||
flood.tsize = VIPS_IMAGE_SIZEOF_PEL( drawflood->test );
|
flood.psize = VIPS_IMAGE_SIZEOF_PEL( flood.image );
|
||||||
|
flood.ink = drawink->pixel_ink;
|
||||||
|
flood.lsize = VIPS_IMAGE_SIZEOF_LINE( flood.image );
|
||||||
flood.left = drawflood->x;
|
flood.left = drawflood->x;
|
||||||
flood.top = drawflood->y;
|
|
||||||
flood.right = drawflood->x;
|
flood.right = drawflood->x;
|
||||||
|
flood.top = drawflood->y;
|
||||||
flood.bottom = drawflood->y;
|
flood.bottom = drawflood->y;
|
||||||
|
|
||||||
if( flood.equal ) {
|
if( flood.equal ) {
|
||||||
@ -501,7 +504,7 @@ vips_draw_flood_build( VipsObject *object )
|
|||||||
*/
|
*/
|
||||||
if( flood.test == flood.image ) {
|
if( flood.test == flood.image ) {
|
||||||
for( j = 0; j < flood.tsize; j++ )
|
for( j = 0; j < flood.tsize; j++ )
|
||||||
if( flood.edge[j] != drawink->pixel_ink[j] )
|
if( flood.edge[j] != flood.ink[j] )
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if( j != flood.tsize )
|
if( j != flood.tsize )
|
||||||
@ -634,16 +637,16 @@ vips__draw_flood_direct( VipsImage *image, VipsImage *test,
|
|||||||
vips_image_wio_input( test ) )
|
vips_image_wio_input( test ) )
|
||||||
return( -1 );
|
return( -1 );
|
||||||
|
|
||||||
flood.image = image;
|
|
||||||
flood.test = test;
|
flood.test = test;
|
||||||
flood.lsize = VIPS_IMAGE_SIZEOF_LINE( image );
|
flood.image = image;
|
||||||
|
flood.tsize = VIPS_IMAGE_SIZEOF_PEL( test );
|
||||||
|
flood.equal = TRUE;
|
||||||
flood.psize = VIPS_IMAGE_SIZEOF_PEL( image );
|
flood.psize = VIPS_IMAGE_SIZEOF_PEL( image );
|
||||||
flood.ink = (VipsPel *) &serial;
|
flood.ink = (VipsPel *) &serial;
|
||||||
flood.equal = TRUE;
|
flood.lsize = VIPS_IMAGE_SIZEOF_LINE( image );
|
||||||
flood.tsize = VIPS_IMAGE_SIZEOF_PEL( test );
|
|
||||||
flood.left = x;
|
flood.left = x;
|
||||||
flood.top = y;
|
|
||||||
flood.right = x;
|
flood.right = x;
|
||||||
|
flood.top = y;
|
||||||
flood.bottom = y;
|
flood.bottom = y;
|
||||||
|
|
||||||
if( !(flood.edge =
|
if( !(flood.edge =
|
||||||
|
@ -50,7 +50,7 @@
|
|||||||
#include "pfreqfilt.h"
|
#include "pfreqfilt.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SECTION: freq_filt
|
* SECTION: freqfilt
|
||||||
* @short_description: fourier transforms and frequency-domin filters
|
* @short_description: fourier transforms and frequency-domin filters
|
||||||
* @stability: Stable
|
* @stability: Stable
|
||||||
* @see_also: <link linkend="libvips-image">image</link>
|
* @see_also: <link linkend="libvips-image">image</link>
|
||||||
|
Loading…
Reference in New Issue
Block a user