Styling / typo fixes
This commit is contained in:
parent
9226303b1c
commit
18f3b2519f
@ -31,8 +31,8 @@
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef IM_MOSAICING_H
|
#ifndef VIPS_MOSAICING_H
|
||||||
#define IM_MOSAICING_H
|
#define VIPS_MOSAICING_H
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
@ -70,4 +70,4 @@ int vips_matrixinvert( VipsImage *m, VipsImage **out, ... )
|
|||||||
}
|
}
|
||||||
#endif /*__cplusplus*/
|
#endif /*__cplusplus*/
|
||||||
|
|
||||||
#endif /*IM_MOSAICING_H*/
|
#endif /*VIPS_MOSAICING_H*/
|
||||||
|
@ -174,8 +174,8 @@ vips__global_open_image( SymbolTable *st, char *name )
|
|||||||
|
|
||||||
if( !(image = vips_image_new_from_file( name, NULL ))) {
|
if( !(image = vips_image_new_from_file( name, NULL ))) {
|
||||||
/* TODO(kleisauke): Is this behavior the same as im_skip_dir?
|
/* TODO(kleisauke): Is this behavior the same as im_skip_dir?
|
||||||
* i.e. could we open a filename which came
|
* i.e. could we open a filename which came
|
||||||
* from a win32 (`\\`) on a *nix machine? */
|
* from a win32 (`\\`) on a *nix machine? */
|
||||||
basename = g_path_get_basename( name );
|
basename = g_path_get_basename( name );
|
||||||
|
|
||||||
if( !(image = vips_image_new_from_file( basename, NULL ))) {
|
if( !(image = vips_image_new_from_file( basename, NULL ))) {
|
||||||
|
@ -47,8 +47,8 @@ typedef VipsImage *(*transform_fn)( JoinNode *, void * );
|
|||||||
/* Join type.
|
/* Join type.
|
||||||
*/
|
*/
|
||||||
enum _JoinType {
|
enum _JoinType {
|
||||||
JOIN_LR, /* vips_lrmerge join */
|
JOIN_LR, /* vips__lrmerge join */
|
||||||
JOIN_TB, /* vips_tbmerge join */
|
JOIN_TB, /* vips__tbmerge join */
|
||||||
JOIN_LRROTSCALE, /* 1st oder lrmerge */
|
JOIN_LRROTSCALE, /* 1st oder lrmerge */
|
||||||
JOIN_TBROTSCALE, /* 1st oder tbmerge */
|
JOIN_TBROTSCALE, /* 1st oder tbmerge */
|
||||||
JOIN_CP, /* vips_copy operation */
|
JOIN_CP, /* vips_copy operation */
|
||||||
|
@ -3,11 +3,11 @@
|
|||||||
* @(#) The rounded integer result is returned into dx, dy
|
* @(#) The rounded integer result is returned into dx, dy
|
||||||
* @(#) No images are involved in this function.
|
* @(#) No images are involved in this function.
|
||||||
* @(#)
|
* @(#)
|
||||||
* @(#) int vips_avgdxdy( points, dx, dy )
|
* @(#) int vips__avgdxdy( points, dx, dy )
|
||||||
* @(#) TiePoints *points;
|
* @(#) TiePoints *points;
|
||||||
* @(#) int *dx, *dy;
|
* @(#) int *dx, *dy;
|
||||||
* @(#)
|
* @(#)
|
||||||
* @(#) Returns 0 on sucess and -1 on error.
|
* @(#) Returns 0 on success and -1 on error.
|
||||||
*
|
*
|
||||||
* Copyright: 1990, N. Dessipris.
|
* Copyright: 1990, N. Dessipris.
|
||||||
*
|
*
|
||||||
@ -62,7 +62,7 @@ vips__avgdxdy( TiePoints *points, int *dx, int *dy )
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
if( points->nopoints == 0 ) {
|
if( points->nopoints == 0 ) {
|
||||||
vips_error( "vips_avgdxdy", "%s", _( "no points to average" ) );
|
vips_error( "vips__avgdxdy", "%s", _( "no points to average" ) );
|
||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
* @(#) int vips__improve( inpoints, outpoints )
|
* @(#) int vips__improve( inpoints, outpoints )
|
||||||
* @(#) TiePoints *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.
|
* Copyright: 1990, N. Dessipris.
|
||||||
*
|
*
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
* @(#) Results are saved in the structure points
|
* @(#) Results are saved in the structure points
|
||||||
* @(#) The function expects the following valid data in points:
|
* @(#) The function expects the following valid data in points:
|
||||||
* @(#) deltax, deltay, nopoints, halfcorsize, halfareasize
|
* @(#) deltax, deltay, nopoints, halfcorsize, halfareasize
|
||||||
* @(#) and fills in the memebers:
|
* @(#) and fills in the members:
|
||||||
* @(#) x, y_reference[], contrast and x,y_secondary[],
|
* @(#) x, y_reference[], contrast and x,y_secondary[],
|
||||||
* @(#) based on deltax and deltay
|
* @(#) based on deltax and deltay
|
||||||
* @(#) Input image should are either memory mapped or in a buffer.
|
* @(#) Input image should are either memory mapped or in a buffer.
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
* @(#) int bandno;
|
* @(#) int bandno;
|
||||||
* @(#) TiePoints *points; see mosaic.h
|
* @(#) 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.
|
* Copyright: 1990, N. Dessipris.
|
||||||
*
|
*
|
||||||
|
@ -704,8 +704,8 @@ vips__build_mergestate( const char *domain,
|
|||||||
int x;
|
int x;
|
||||||
|
|
||||||
/* TODO(kleisauke): Copied from vips_insert, perhaps we
|
/* TODO(kleisauke): Copied from vips_insert, perhaps we
|
||||||
* need a separate function for this?
|
* need a separate function for this?
|
||||||
* (just like im__insert_base)
|
* (just like im__insert_base)
|
||||||
*/
|
*/
|
||||||
if( vips_image_pio_input( ref ) ||
|
if( vips_image_pio_input( ref ) ||
|
||||||
vips_image_pio_input( sec ) ||
|
vips_image_pio_input( sec ) ||
|
||||||
|
@ -119,7 +119,7 @@ vips__find_lroverlap( VipsImage *ref_in, VipsImage *sec_in, VipsImage *out,
|
|||||||
*/
|
*/
|
||||||
if( halfcorrelation < 0 || halfarea < 0 ||
|
if( halfcorrelation < 0 || halfarea < 0 ||
|
||||||
halfarea < halfcorrelation ) {
|
halfarea < halfcorrelation ) {
|
||||||
vips_error( "vips_lrmosaic", "%s", _( "bad area parameters" ) );
|
vips_error( "vips__lrmosaic", "%s", _( "bad area parameters" ) );
|
||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -139,7 +139,7 @@ vips__find_lroverlap( VipsImage *ref_in, VipsImage *sec_in, VipsImage *out,
|
|||||||
vips_rect_intersectrect( &left, &right, &overlap );
|
vips_rect_intersectrect( &left, &right, &overlap );
|
||||||
if( overlap.width < 2 * halfarea + 1 ||
|
if( overlap.width < 2 * halfarea + 1 ||
|
||||||
overlap.height < 2 * halfarea + 1 ) {
|
overlap.height < 2 * halfarea + 1 ) {
|
||||||
vips_error( "vips_lrmosaic",
|
vips_error( "vips__lrmosaic",
|
||||||
"%s", _( "overlap too small for search" ) );
|
"%s", _( "overlap too small for search" ) );
|
||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
@ -168,7 +168,7 @@ vips__find_lroverlap( VipsImage *ref_in, VipsImage *sec_in, VipsImage *out,
|
|||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
vips_error( "vips_lrmosaic", "%s", _( "unknown Coding type" ) );
|
vips_error( "vips__lrmosaic", "%s", _( "unknown Coding type" ) );
|
||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -227,7 +227,7 @@ lu_decomp( VipsImage *mat )
|
|||||||
* PRESS, W. et al, 1992. Numerical Recipies in C; The Art of Scientific
|
* PRESS, W. et al, 1992. Numerical Recipies in C; The Art of Scientific
|
||||||
* Computing, 2nd ed. Cambridge: Cambridge University Press, pp. 43-50.
|
* 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
|
* Returns: 0 on success, -1 on error
|
||||||
*/
|
*/
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
* - ANSIfied
|
* - ANSIfied
|
||||||
* - proper freeing on errors, ready for partial
|
* - proper freeing on errors, ready for partial
|
||||||
* 8/11/93 JC
|
* 8/11/93 JC
|
||||||
* - now propogates both input histories
|
* - now propagates both input histories
|
||||||
* - adds magic lines for global mosaic optimisation
|
* - adds magic lines for global mosaic optimisation
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
|
@ -78,7 +78,7 @@ vips__find_tboverlap( VipsImage *ref_in, VipsImage *sec_in, VipsImage *out,
|
|||||||
double *scale1, double *angle1, double *dx1, double *dy1 )
|
double *scale1, double *angle1, double *dx1, double *dy1 )
|
||||||
{
|
{
|
||||||
VipsImage **t = (VipsImage **)
|
VipsImage **t = (VipsImage **)
|
||||||
vips_object_local_array( VIPS_OBJECT( out ), 6 );
|
vips_object_local_array( VIPS_OBJECT( out ), 6 );
|
||||||
|
|
||||||
VipsRect top, bottom, overlap;
|
VipsRect top, bottom, overlap;
|
||||||
TiePoints points, *p_points; /* defined in mosaic.h */
|
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 ||
|
if( halfcorrelation < 0 || halfarea < 0 ||
|
||||||
halfarea < halfcorrelation ) {
|
halfarea < halfcorrelation ) {
|
||||||
vips_error( "vips_tbmosaic", "%s", _( "bad area parameters" ) );
|
vips_error( "vips__tbmosaic", "%s", _( "bad area parameters" ) );
|
||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -110,7 +110,7 @@ vips__find_tboverlap( VipsImage *ref_in, VipsImage *sec_in, VipsImage *out,
|
|||||||
vips_rect_intersectrect( &top, &bottom, &overlap );
|
vips_rect_intersectrect( &top, &bottom, &overlap );
|
||||||
if( overlap.width < 2 * halfarea + 1 ||
|
if( overlap.width < 2 * halfarea + 1 ||
|
||||||
overlap.height < 2 * halfarea + 1 ) {
|
overlap.height < 2 * halfarea + 1 ) {
|
||||||
vips_error( "vips_tbmosaic", "%s",
|
vips_error( "vips__tbmosaic", "%s",
|
||||||
_( "overlap too small for search" ) );
|
_( "overlap too small for search" ) );
|
||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
@ -139,7 +139,7 @@ vips__find_tboverlap( VipsImage *ref_in, VipsImage *sec_in, VipsImage *out,
|
|||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
vips_error( "vips_tbmosaic", "%s", _( "unknown Coding type" ) );
|
vips_error( "vips__tbmosaic", "%s", _( "unknown Coding type" ) );
|
||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user