From 18f3b2519fb9ed66f9ec465137c7c64d0f39920c Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Mon, 13 Jul 2020 15:39:28 +0200 Subject: [PATCH] Styling / typo fixes --- libvips/include/vips/mosaicing.h | 6 +++--- libvips/mosaicing/global_balance.c | 4 ++-- libvips/mosaicing/global_balance.h | 4 ++-- libvips/mosaicing/im_avgdxdy.c | 6 +++--- libvips/mosaicing/im_improve.c | 2 +- libvips/mosaicing/im_lrcalcon.c | 2 +- libvips/mosaicing/im_tbcalcon.c | 2 +- libvips/mosaicing/lrmerge.c | 4 ++-- libvips/mosaicing/lrmosaic.c | 6 +++--- libvips/mosaicing/matrixinvert.c | 2 +- libvips/mosaicing/tbmerge.c | 2 +- libvips/mosaicing/tbmosaic.c | 8 ++++---- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/libvips/include/vips/mosaicing.h b/libvips/include/vips/mosaicing.h index 848675ea..1f17a86a 100644 --- a/libvips/include/vips/mosaicing.h +++ b/libvips/include/vips/mosaicing.h @@ -31,8 +31,8 @@ */ -#ifndef IM_MOSAICING_H -#define IM_MOSAICING_H +#ifndef VIPS_MOSAICING_H +#define VIPS_MOSAICING_H #ifdef __cplusplus extern "C" { @@ -70,4 +70,4 @@ int vips_matrixinvert( VipsImage *m, VipsImage **out, ... ) } #endif /*__cplusplus*/ -#endif /*IM_MOSAICING_H*/ +#endif /*VIPS_MOSAICING_H*/ diff --git a/libvips/mosaicing/global_balance.c b/libvips/mosaicing/global_balance.c index 3089cebf..384df577 100644 --- a/libvips/mosaicing/global_balance.c +++ b/libvips/mosaicing/global_balance.c @@ -174,8 +174,8 @@ vips__global_open_image( SymbolTable *st, char *name ) if( !(image = vips_image_new_from_file( name, NULL ))) { /* TODO(kleisauke): Is this behavior the same as im_skip_dir? - * i.e. could we open a filename which came - * from a win32 (`\\`) on a *nix machine? */ + * i.e. could we open a filename which came + * from a win32 (`\\`) on a *nix machine? */ basename = g_path_get_basename( name ); if( !(image = vips_image_new_from_file( basename, NULL ))) { diff --git a/libvips/mosaicing/global_balance.h b/libvips/mosaicing/global_balance.h index 94a4f890..8436015a 100644 --- a/libvips/mosaicing/global_balance.h +++ b/libvips/mosaicing/global_balance.h @@ -47,8 +47,8 @@ typedef VipsImage *(*transform_fn)( JoinNode *, void * ); /* Join type. */ enum _JoinType { - JOIN_LR, /* vips_lrmerge join */ - JOIN_TB, /* vips_tbmerge join */ + JOIN_LR, /* vips__lrmerge join */ + JOIN_TB, /* vips__tbmerge join */ JOIN_LRROTSCALE, /* 1st oder lrmerge */ JOIN_TBROTSCALE, /* 1st oder tbmerge */ JOIN_CP, /* vips_copy operation */ diff --git a/libvips/mosaicing/im_avgdxdy.c b/libvips/mosaicing/im_avgdxdy.c index 6490c2a1..8c7a053a 100644 --- a/libvips/mosaicing/im_avgdxdy.c +++ b/libvips/mosaicing/im_avgdxdy.c @@ -3,11 +3,11 @@ * @(#) The rounded integer result is returned into dx, dy * @(#) No images are involved in this function. * @(#) - * @(#) int vips_avgdxdy( points, dx, dy ) + * @(#) int vips__avgdxdy( points, dx, dy ) * @(#) TiePoints *points; * @(#) int *dx, *dy; * @(#) - * @(#) Returns 0 on sucess and -1 on error. + * @(#) Returns 0 on success and -1 on error. * * Copyright: 1990, N. Dessipris. * @@ -62,7 +62,7 @@ vips__avgdxdy( TiePoints *points, int *dx, int *dy ) int i; if( points->nopoints == 0 ) { - vips_error( "vips_avgdxdy", "%s", _( "no points to average" ) ); + vips_error( "vips__avgdxdy", "%s", _( "no points to average" ) ); return( -1 ); } diff --git a/libvips/mosaicing/im_improve.c b/libvips/mosaicing/im_improve.c index f30fbd9f..94c401a9 100644 --- a/libvips/mosaicing/im_improve.c +++ b/libvips/mosaicing/im_improve.c @@ -10,7 +10,7 @@ * @(#) int vips__improve( inpoints, outpoints ) * @(#) TiePoints *inpoints, *outpoints; * @(#) - * @(#) Returns 0 on sucess and -1 on error. + * @(#) Returns 0 on success and -1 on error. * * Copyright: 1990, N. Dessipris. * diff --git a/libvips/mosaicing/im_lrcalcon.c b/libvips/mosaicing/im_lrcalcon.c index 74f80591..7acce1b2 100644 --- a/libvips/mosaicing/im_lrcalcon.c +++ b/libvips/mosaicing/im_lrcalcon.c @@ -8,7 +8,7 @@ * @(#) Results are saved in the structure points * @(#) The function expects the following valid data in points: * @(#) deltax, deltay, nopoints, halfcorsize, halfareasize - * @(#) and fills in the memebers: + * @(#) and fills in the members: * @(#) x, y_reference[], contrast and x,y_secondary[], * @(#) based on deltax and deltay * @(#) Input image should are either memory mapped or in a buffer. diff --git a/libvips/mosaicing/im_tbcalcon.c b/libvips/mosaicing/im_tbcalcon.c index a4910337..5836ad92 100644 --- a/libvips/mosaicing/im_tbcalcon.c +++ b/libvips/mosaicing/im_tbcalcon.c @@ -22,7 +22,7 @@ * @(#) int bandno; * @(#) TiePoints *points; see mosaic.h * @(#) - * @(#) Returns 0 on sucess and -1 on error. + * @(#) Returns 0 on success and -1 on error. * * Copyright: 1990, N. Dessipris. * diff --git a/libvips/mosaicing/lrmerge.c b/libvips/mosaicing/lrmerge.c index 8bb6f9dc..ff481c4c 100644 --- a/libvips/mosaicing/lrmerge.c +++ b/libvips/mosaicing/lrmerge.c @@ -704,8 +704,8 @@ vips__build_mergestate( const char *domain, int x; /* TODO(kleisauke): Copied from vips_insert, perhaps we - * need a separate function for this? - * (just like im__insert_base) + * need a separate function for this? + * (just like im__insert_base) */ if( vips_image_pio_input( ref ) || vips_image_pio_input( sec ) || diff --git a/libvips/mosaicing/lrmosaic.c b/libvips/mosaicing/lrmosaic.c index 8d736c2d..65c8aebb 100644 --- a/libvips/mosaicing/lrmosaic.c +++ b/libvips/mosaicing/lrmosaic.c @@ -119,7 +119,7 @@ vips__find_lroverlap( VipsImage *ref_in, VipsImage *sec_in, VipsImage *out, */ if( halfcorrelation < 0 || halfarea < 0 || halfarea < halfcorrelation ) { - vips_error( "vips_lrmosaic", "%s", _( "bad area parameters" ) ); + vips_error( "vips__lrmosaic", "%s", _( "bad area parameters" ) ); return( -1 ); } @@ -139,7 +139,7 @@ vips__find_lroverlap( VipsImage *ref_in, VipsImage *sec_in, VipsImage *out, vips_rect_intersectrect( &left, &right, &overlap ); if( overlap.width < 2 * halfarea + 1 || overlap.height < 2 * halfarea + 1 ) { - vips_error( "vips_lrmosaic", + vips_error( "vips__lrmosaic", "%s", _( "overlap too small for search" ) ); return( -1 ); } @@ -168,7 +168,7 @@ vips__find_lroverlap( VipsImage *ref_in, VipsImage *sec_in, VipsImage *out, return( -1 ); } else { - vips_error( "vips_lrmosaic", "%s", _( "unknown Coding type" ) ); + vips_error( "vips__lrmosaic", "%s", _( "unknown Coding type" ) ); return( -1 ); } diff --git a/libvips/mosaicing/matrixinvert.c b/libvips/mosaicing/matrixinvert.c index 04e2d37b..53592f56 100644 --- a/libvips/mosaicing/matrixinvert.c +++ b/libvips/mosaicing/matrixinvert.c @@ -227,7 +227,7 @@ lu_decomp( VipsImage *mat ) * PRESS, W. et al, 1992. Numerical Recipies in C; The Art of Scientific * Computing, 2nd ed. Cambridge: Cambridge University Press, pp. 43-50. * - * See also: im_mattrn(), im_matinv(). + * See also: vips__matrixtranspose(), vips__matrixmultiply(). * * Returns: 0 on success, -1 on error */ diff --git a/libvips/mosaicing/tbmerge.c b/libvips/mosaicing/tbmerge.c index 6959878f..d6a55ae6 100644 --- a/libvips/mosaicing/tbmerge.c +++ b/libvips/mosaicing/tbmerge.c @@ -23,7 +23,7 @@ * - ANSIfied * - proper freeing on errors, ready for partial * 8/11/93 JC - * - now propogates both input histories + * - now propagates both input histories * - adds magic lines for global mosaic optimisation * * diff --git a/libvips/mosaicing/tbmosaic.c b/libvips/mosaicing/tbmosaic.c index dac7b7a8..20fa9bce 100644 --- a/libvips/mosaicing/tbmosaic.c +++ b/libvips/mosaicing/tbmosaic.c @@ -78,7 +78,7 @@ vips__find_tboverlap( VipsImage *ref_in, VipsImage *sec_in, VipsImage *out, double *scale1, double *angle1, double *dx1, double *dy1 ) { VipsImage **t = (VipsImage **) - vips_object_local_array( VIPS_OBJECT( out ), 6 ); + vips_object_local_array( VIPS_OBJECT( out ), 6 ); VipsRect top, bottom, overlap; TiePoints points, *p_points; /* defined in mosaic.h */ @@ -90,7 +90,7 @@ vips__find_tboverlap( VipsImage *ref_in, VipsImage *sec_in, VipsImage *out, */ if( halfcorrelation < 0 || halfarea < 0 || halfarea < halfcorrelation ) { - vips_error( "vips_tbmosaic", "%s", _( "bad area parameters" ) ); + vips_error( "vips__tbmosaic", "%s", _( "bad area parameters" ) ); return( -1 ); } @@ -110,7 +110,7 @@ vips__find_tboverlap( VipsImage *ref_in, VipsImage *sec_in, VipsImage *out, vips_rect_intersectrect( &top, &bottom, &overlap ); if( overlap.width < 2 * halfarea + 1 || overlap.height < 2 * halfarea + 1 ) { - vips_error( "vips_tbmosaic", "%s", + vips_error( "vips__tbmosaic", "%s", _( "overlap too small for search" ) ); return( -1 ); } @@ -139,7 +139,7 @@ vips__find_tboverlap( VipsImage *ref_in, VipsImage *sec_in, VipsImage *out, return( -1 ); } else { - vips_error( "vips_tbmosaic", "%s", _( "unknown Coding type" ) ); + vips_error( "vips__tbmosaic", "%s", _( "unknown Coding type" ) ); return( -1 ); }