From da47510e37f4c4da5fdb2ca5881ebb75ec0200a4 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Thu, 11 Jul 2013 14:37:53 +0100 Subject: [PATCH] fix some typos --- TODO | 13 ++++++++++--- libvips/colour/Lab2LabQ.c | 5 +++-- libvips/colour/Lab2LabS.c | 4 ++-- libvips/colour/LabQ2Lab.c | 4 ++-- libvips/colour/LabQ2LabS.c | 4 ++-- libvips/colour/LabS2Lab.c | 2 +- libvips/colour/LabS2LabQ.c | 2 +- libvips/colour/dE00.c | 6 +++--- libvips/colour/dE76.c | 2 +- libvips/colour/float2rad.c | 2 +- libvips/colour/icc_transform.c | 10 +++++----- libvips/colour/rad2float.c | 2 +- libvips/colour/scRGB2sRGB.c | 2 +- libvips/conversion/tilecache.c | 7 +++---- libvips/foreign/foreign.c | 2 +- 15 files changed, 37 insertions(+), 30 deletions(-) diff --git a/TODO b/TODO index 6960aa6b..e93e0d5b 100644 --- a/TODO +++ b/TODO @@ -1,10 +1,17 @@ +- need a new uncached mode for open via disc + + currently we have a huge linecache for "vips copy x.png x.v", in + effect what vips does for open-via-disc, and therefore see >100mb ram + use even in open-via-disc mode + +- why doesn't this work sequentially? + + vips flip Chicago.png x.png horizontal --vips-progress + - support multiscan jpeg write? see https://github.com/jcupitt/ruby-vips/issues/41 - -- doc comments in colour refer to im_LabQ2disp() etc. - - could VipsConversion now have an @in member? we've moved all the no-input ones of to create now, I think diff --git a/libvips/colour/Lab2LabQ.c b/libvips/colour/Lab2LabQ.c index 82e68bc1..dc22ae89 100644 --- a/libvips/colour/Lab2LabQ.c +++ b/libvips/colour/Lab2LabQ.c @@ -1,4 +1,5 @@ -/* @(#) im_Lab2LabQ: quantise FLOAT Lab image into 10 11 11 format +/* Lab2LabQ: quantise FLOAT Lab image into 10 11 11 format + * * 4 bytes per pel: l a b lsbs * this is an image wrapper which calls line-wise packing * Copyright K.Martinez 3/5/93 @@ -161,7 +162,7 @@ vips_Lab2LabQ_init( VipsLab2LabQ *Lab2LabQ ) * * Convert a Lab three-band float image to LabQ (#IM_CODING_LABQ). * - * See also: im_LabQ2Lab(). + * See also: vips_LabQ2Lab(). * * Returns: 0 on success, -1 on error. */ diff --git a/libvips/colour/Lab2LabS.c b/libvips/colour/Lab2LabS.c index c489a863..9c094a46 100644 --- a/libvips/colour/Lab2LabS.c +++ b/libvips/colour/Lab2LabS.c @@ -1,4 +1,4 @@ -/* im_Lab2LabS: quantise FLOAT Lab image into signed short format +/* Lab2LabS: quantise FLOAT Lab image into signed short format * * 12/12/02 JC * - from im_Lab2LabS @@ -104,7 +104,7 @@ vips_Lab2LabS_init( VipsLab2LabS *Lab2LabS ) * * Turn Lab to LabS, signed 16-bit int fixed point. * - * See also: im_LabQ2Lab(). + * See also: vips_LabQ2Lab(). * * Returns: 0 on success, -1 on error. */ diff --git a/libvips/colour/LabQ2Lab.c b/libvips/colour/LabQ2Lab.c index 111ed67a..6448864b 100644 --- a/libvips/colour/LabQ2Lab.c +++ b/libvips/colour/LabQ2Lab.c @@ -1,4 +1,4 @@ -/* im_LabQ2Lab +/* LabQ2Lab * * Copyright Kirk Martinez 2/5/1993 * @@ -147,7 +147,7 @@ vips_LabQ2Lab_init( VipsLabQ2Lab *LabQ2Lab ) * * Unpack a LabQ (#IM_CODING_LABQ) image to a three-band float image. * - * See also: im_LabQ2Lab(), im_LabQ2LabS(), im_rad2float(). + * See also: vips_LabQ2Lab(), vips_LabQ2LabS(), vips_rad2float(). * * Returns: 0 on success, -1 on error. */ diff --git a/libvips/colour/LabQ2LabS.c b/libvips/colour/LabQ2LabS.c index 4df0b2b5..f772785b 100644 --- a/libvips/colour/LabQ2LabS.c +++ b/libvips/colour/LabQ2LabS.c @@ -1,4 +1,4 @@ -/* im_LabQ2LabS +/* LabQ2LabS * * 17/11/93 JC * - adapted from im_LabQ2LabS() @@ -127,7 +127,7 @@ vips_LabQ2LabS_init( VipsLabQ2LabS *LabQ2LabS ) * * Unpack a LabQ (#IM_CODING_LABQ) image to a three-band short image. * - * See also: im_LabS2LabQ(), im_LabQ2LabS(), im_rad2float(). + * See also: vips_LabS2LabQ(), vips_LabQ2LabS(), vips_rad2float(). * * Returns: 0 on success, -1 on error. */ diff --git a/libvips/colour/LabS2Lab.c b/libvips/colour/LabS2Lab.c index fd326362..4e6b8de2 100644 --- a/libvips/colour/LabS2Lab.c +++ b/libvips/colour/LabS2Lab.c @@ -1,4 +1,4 @@ -/* im_LabS2Lab() +/* LabS2Lab() * * 12/12/02 JC * - adapted from im_LabS2LabQ() diff --git a/libvips/colour/LabS2LabQ.c b/libvips/colour/LabS2LabQ.c index 6d55e5ff..1af3e8cc 100644 --- a/libvips/colour/LabS2LabQ.c +++ b/libvips/colour/LabS2LabQ.c @@ -1,4 +1,4 @@ -/* im_LabS2LabQ() +/* LabS2LabQ() * * 17/11/93 JC * - adapted from im_LabS2LabQ() diff --git a/libvips/colour/dE00.c b/libvips/colour/dE00.c index 9148797d..52ff3374 100644 --- a/libvips/colour/dE00.c +++ b/libvips/colour/dE00.c @@ -76,7 +76,7 @@ vips_col_dE00( float L1, float a1, float b1, /* Code if you want XYZ params and the colour temp used in the reference float - im_col_dE00( float X1, float Y1, float Z1, + vips_col_dE00( float X1, float Y1, float Z1, float X2, float Y2, float Z2 ) { const double X0 = 94.811; @@ -120,13 +120,13 @@ vips_col_dE00( float L1, float a1, float b1, double a1d = (1 + G) * a1; double b1d = b1; double C1d = sqrt( a1d * a1d + b1d * b1d ); - double h1d = im_col_ab2h( a1d, b1d ); + double h1d = vips_col_ab2h( a1d, b1d ); double L2d = L2; double a2d = (1 + G) * a2; double b2d = b2; double C2d = sqrt( a2d * a2d + b2d * b2d ); - double h2d = im_col_ab2h( a2d, b2d ); + double h2d = vips_col_ab2h( a2d, b2d ); /* L' bar, C' bar, h' bar */ diff --git a/libvips/colour/dE76.c b/libvips/colour/dE76.c index 162ce908..5c97bfc3 100644 --- a/libvips/colour/dE76.c +++ b/libvips/colour/dE76.c @@ -1,4 +1,4 @@ -/* im_dE_fromLab.c +/* dE76.c * * Modified: * 16/11/94 JC diff --git a/libvips/colour/float2rad.c b/libvips/colour/float2rad.c index d777c8cd..ebac3fff 100644 --- a/libvips/colour/float2rad.c +++ b/libvips/colour/float2rad.c @@ -226,7 +226,7 @@ vips_float2rad_init( VipsFloat2rad *float2rad ) * * Convert a three-band float image to Radiance 32-bit packed format. * - * See also: im_rad2float(), #VipsFormatRad, im_LabQ2Lab(). + * See also: vips_rad2float(), #VipsFormatRad, vips_LabQ2Lab(). * * Returns: 0 on success, -1 on error. */ diff --git a/libvips/colour/icc_transform.c b/libvips/colour/icc_transform.c index 95fa52e1..a6a360f2 100644 --- a/libvips/colour/icc_transform.c +++ b/libvips/colour/icc_transform.c @@ -868,7 +868,7 @@ vips_icc_transform_init( VipsIccTransform *transform ) * Transform an image from absolute to relative colorimetry using the * MediaWhitePoint stored in the ICC profile. * - * See also: im_icc_transform(), im_icc_import(). + * See also: vips_icc_transform(), vips_icc_import(). * * Returns: 0 on success, -1 on error. */ @@ -890,8 +890,8 @@ vips_icc_ac2rc( VipsImage *in, VipsImage **out, const char *profile_filename ) cmsCIEXYZ *media; if( !(media = cmsReadTag( profile, cmsSigMediaWhitePointTag )) ) { - im_error( "im_icc_ac2rc", "%s", _( "unable to get media " - "white point" ) ); + vips_error( "vips_icc_ac2rc", + "%s", _( "unable to get media white point" ) ); return( -1 ); } @@ -904,8 +904,8 @@ vips_icc_ac2rc( VipsImage *in, VipsImage **out, const char *profile_filename ) cmsCIEXYZ media; if( !cmsTakeMediaWhitePoint( &media, profile ) ) { - im_error( "im_icc_ac2rc", "%s", _( "unable to get media " - "white point" ) ); + vips_error( "vips_icc_ac2rc", + "%s", _( "unable to get media white point" ) ); return( -1 ); } diff --git a/libvips/colour/rad2float.c b/libvips/colour/rad2float.c index 54ed611e..d698192f 100644 --- a/libvips/colour/rad2float.c +++ b/libvips/colour/rad2float.c @@ -213,7 +213,7 @@ vips_rad2float_init( VipsRad2float *rad2float ) * * Unpack a RAD (#IM_CODING_RAD) image to a three-band float image. * - * See also: im_rad2float(), im_LabQ2LabS(). + * See also: vips_float2rad(), vips_LabQ2LabS(). * * Returns: 0 on success, -1 on error. */ diff --git a/libvips/colour/scRGB2sRGB.c b/libvips/colour/scRGB2sRGB.c index 0a07ef13..6c811ed4 100644 --- a/libvips/colour/scRGB2sRGB.c +++ b/libvips/colour/scRGB2sRGB.c @@ -227,7 +227,7 @@ vips_scRGB2sRGB_init( VipsscRGB2sRGB *scRGB2sRGB ) * * Convert an scRGB image to sRGB. Set @depth to 16 to get 16-bit output. * - * See also: im_LabS2LabQ(), im_scRGB2sRGB(), im_rad2float(). + * See also: vips_LabS2LabQ(), vips_scRGB2sRGB(), vips_rad2float(). * * Returns: 0 on success, -1 on error. */ diff --git a/libvips/conversion/tilecache.c b/libvips/conversion/tilecache.c index 529d0f6c..e9d857da 100644 --- a/libvips/conversion/tilecache.c +++ b/libvips/conversion/tilecache.c @@ -903,9 +903,8 @@ vips_line_cache_build( VipsObject *object ) block_cache->max_tiles = 3 * (1 + nlines / block_cache->tile_height); VIPS_DEBUG_MSG( "vips_line_cache_build: max_tiles = %d, " - "tile_height = %d\n", - block_cache->max_tiles, - block_cache->tile_height ); + "tile_height = %d, nlines = %d\n", + block_cache->max_tiles, block_cache->tile_height, nlines ); if( vips_image_pio_input( block_cache->in ) ) return( -1 ); @@ -974,7 +973,7 @@ vips_line_cache_init( VipsLineCache *cache ) * vips_linecache() uses. The default is 1 (a single scanline). * * Normally, only a single thread at once is allowed to calculate tiles. If - * you set @threaded to %TRUE, vips_tilecache() will allow many threads to + * you set @threaded to %TRUE, vips_linecache() will allow many threads to * calculate tiles at once, and share the cache between them. * * See also: vips_cache(), vips_tilecache(). diff --git a/libvips/foreign/foreign.c b/libvips/foreign/foreign.c index 589886f4..feafc6fb 100644 --- a/libvips/foreign/foreign.c +++ b/libvips/foreign/foreign.c @@ -132,7 +132,7 @@ * * @VIPS_FOREIGN_BIGENDIAN means that image pixels are most-significant byte * first. Depending on the native byte order of the host machine, you may - * need to swap bytes. See copy_swap(). + * need to swap bytes. See vips_copy(). */ /**