diff --git a/ChangeLog b/ChangeLog index f131e760..51cb3fd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +3/3/09 started 7.17.2 +- im_magick2vips.c: allow funky bit depths, like 14 (thanks Mikkel) +- isradiance was returning TRUE too often +- radiance loader now loads packed RGBE/XYZE instead of unpacking to float +- added im_rad2float() + 11/10/08 started 7.17.0 - merge vips-7.16 brach back into trunk - bumped version number to 7.17.0 @@ -42,7 +48,6 @@ - added Matlab save file read - added Radiance file read - better file-not-found messages -- im_magick2vips.c: allow funky bit depths, like 14 (thanks Mikkel) 11/9/08 started 7.16.3 - oop typo in manpage for im_project() diff --git a/configure.in b/configure.in index e39d51a4..5ac408a6 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AM_CONFIG_HEADER(config.h) # user-visible library versioning IM_MAJOR_VERSION=7 IM_MINOR_VERSION=17 -IM_MICRO_VERSION=1 +IM_MICRO_VERSION=2 IM_VERSION=$IM_MAJOR_VERSION.$IM_MINOR_VERSION.$IM_MICRO_VERSION IM_VERSION_STRING=$IM_VERSION-`date` @@ -21,9 +21,9 @@ PACKAGE=vips # interface changes backwards compatible?: increment age # interface changes not backwards compatible?: reset age to 0 -LIBRARY_CURRENT=23 +LIBRARY_CURRENT=24 LIBRARY_REVISION=0 -LIBRARY_AGE=8 +LIBRARY_AGE=9 AM_INIT_AUTOMAKE($PACKAGE,$VERSION) diff --git a/include/vips/proto.h b/include/vips/proto.h index 7b1da909..eff14860 100644 --- a/include/vips/proto.h +++ b/include/vips/proto.h @@ -499,6 +499,7 @@ int im_vips2raw( IMAGE *in, int fd ); int im_Lab2LCh( IMAGE *, IMAGE * ); int im_LCh2Lab( IMAGE *, IMAGE * ); int im_LabQ2XYZ( IMAGE *, IMAGE * ); +int im_rad2float( IMAGE *, IMAGE * ); int im_LCh2UCS( IMAGE *, IMAGE * ); int im_Lab2LCh( IMAGE *, IMAGE * ); int im_Lab2LabQ( IMAGE *, IMAGE * ); diff --git a/include/vips/vipsc++.h b/include/vips/vipsc++.h index b300759c..2382eed9 100644 --- a/include/vips/vipsc++.h +++ b/include/vips/vipsc++.h @@ -1,8 +1,5 @@ // this file automatically generated from -// VIPS library 7.14.0-Fri Feb 29 12:02:58 GMT 2008 -VDMask estpar( VImage, int, int, int, double& ) throw( VError ); -VImage transform( VDMask, int, int ) throw( VError ); -VImage transform_search( VImage, double, int, int, int, int, VDMask&, double& ) throw( VError ); +// VIPS library 7.17.2-Tue Mar 3 14:42:34 GMT 2009 VImage abs() throw( VError ); VImage acos() throw( VError ); VImage add( VImage ) throw( VError ); @@ -102,6 +99,7 @@ VImage icc_import( char*, int ) throw( VError ); VImage icc_import_embedded( int ) throw( VError ); VImage icc_transform( char*, char*, int ) throw( VError ); VImage lab_morph( VDMask, double, double, double, double ) throw( VError ); +VImage rad2float() throw( VError ); VImage sRGB2XYZ() throw( VError ); VImage bandjoin( VImage ) throw( VError ); static VImage black( int, int, int ) throw( VError ); @@ -125,7 +123,6 @@ VImage copy() throw( VError ); VImage copy_morph( int, int, int ) throw( VError ); VImage copy_swap() throw( VError ); VImage copy_set( int, double, double, int, int ) throw( VError ); -static VImage csv2vips( char* ) throw( VError ); VImage extract_area( int, int, int, int ) throw( VError ); VImage extract_areabands( int, int, int, int, int, int ) throw( VError ); VImage extract_band( int ) throw( VError ); @@ -138,16 +135,10 @@ static VImage gbandjoin( std::vector ) throw( VError ); VImage grid( int, int, int ) throw( VError ); VImage insert( VImage, int, int ) throw( VError ); VImage insert_noexpand( VImage, int, int ) throw( VError ); -static VImage jpeg2vips( char* ) throw( VError ); VImage lrjoin( VImage ) throw( VError ); -static VImage magick2vips( char* ) throw( VError ); static VImage mask2vips( VDMask ) throw( VError ); VImage msb() throw( VError ); VImage msb_band( int ) throw( VError ); -static VImage png2vips( char* ) throw( VError ); -static VImage exr2vips( char* ) throw( VError ); -static VImage ppm2vips( char* ) throw( VError ); -static VImage analyze2vips( char* ) throw( VError ); VImage recomb( VDMask ) throw( VError ); VImage replicate( int, int ) throw( VError ); VImage ri2c( VImage ) throw( VError ); @@ -163,14 +154,7 @@ char* system( char* ) throw( VError ); VImage tbjoin( VImage ) throw( VError ); static VImage text( char*, char*, int, int, int ) throw( VError ); VImage thresh( double ) throw( VError ); -static VImage tiff2vips( char* ) throw( VError ); -void vips2csv( char* ) throw( VError ); -void vips2jpeg( char* ) throw( VError ); VDMask vips2mask() throw( VError ); -void vips2mimejpeg( int ) throw( VError ); -void vips2png( char* ) throw( VError ); -void vips2ppm( char* ) throw( VError ); -void vips2tiff( char* ) throw( VError ); VImage wrap( int, int ) throw( VError ); VImage zoom( int, int ) throw( VError ); VImage addgnoise( double ) throw( VError ); @@ -209,6 +193,20 @@ VImage spcor( VImage ) throw( VError ); VImage spcor_raw( VImage ) throw( VError ); VImage stretch3( double, double ) throw( VError ); VImage zerox( int ) throw( VError ); +static VImage csv2vips( char* ) throw( VError ); +static VImage jpeg2vips( char* ) throw( VError ); +static VImage magick2vips( char* ) throw( VError ); +static VImage png2vips( char* ) throw( VError ); +static VImage exr2vips( char* ) throw( VError ); +static VImage ppm2vips( char* ) throw( VError ); +static VImage analyze2vips( char* ) throw( VError ); +static VImage tiff2vips( char* ) throw( VError ); +void vips2csv( char* ) throw( VError ); +void vips2jpeg( char* ) throw( VError ); +void vips2mimejpeg( int ) throw( VError ); +void vips2png( char* ) throw( VError ); +void vips2ppm( char* ) throw( VError ); +void vips2tiff( char* ) throw( VError ); static VImage create_fmask( int, int, int, double, double, double, double, double ) throw( VError ); VImage disp_ps() throw( VError ); VImage flt_image_freq( int, double, double, double, double, double ) throw( VError ); @@ -261,7 +259,6 @@ VImage dilate_raw( VIMask ) throw( VError ); VImage erode( VIMask ) throw( VError ); VImage erode_raw( VIMask ) throw( VError ); VImage profile( int ) throw( VError ); -VImage affine( double, double, double, double, double, double, int, int, int, int ) throw( VError ); VImage align_bands() throw( VError ); double correl( VImage, int, int, int, int, int, int, int&, int& ) throw( VError ); int _find_lroverlap( VImage, int, int, int, int, int, int, int, int&, double&, double&, double&, double& ) throw( VError ); @@ -276,8 +273,6 @@ VImage match_linear( VImage, int, int, int, int, int, int, int, int ) throw( VEr VImage match_linear_search( VImage, int, int, int, int, int, int, int, int, int, int ) throw( VError ); double maxpos_subpel( double& ) throw( VError ); VImage remosaic( char*, char* ) throw( VError ); -VImage similarity_area( double, double, double, double, int, int, int, int ) throw( VError ); -VImage similarity( double, double, double, double ) throw( VError ); VImage tbmerge( VImage, int, int, int ) throw( VError ); VImage tbmerge1( VImage, int, int, int, int, int, int, int, int, int ) throw( VError ); VImage tbmosaic( VImage, int, int, int, int, int, int, int, int, int ) throw( VError ); @@ -312,5 +307,8 @@ VImage moreeq( double ) throw( VError ); VImage notequal( VImage ) throw( VError ); VImage notequal( std::vector ) throw( VError ); VImage notequal( double ) throw( VError ); +VImage affine( double, double, double, double, double, double, int, int, int, int ) throw( VError ); +VImage similarity_area( double, double, double, double, int, int, int, int ) throw( VError ); +VImage similarity( double, double, double, double ) throw( VError ); static VImage video_test( int, int ) throw( VError ); static VImage video_v4l1( char*, int, int, int, int, int, int ) throw( VError ); diff --git a/libsrc/colour/Makefile.am b/libsrc/colour/Makefile.am index fa17a8ad..71a6baba 100644 --- a/libsrc/colour/Makefile.am +++ b/libsrc/colour/Makefile.am @@ -25,6 +25,7 @@ libcolour_la_SOURCES = \ im_dE00_fromLab.c \ im_dECMC_fromLab.c \ im_dE_fromLab.c \ - im_disp2XYZ.c + im_disp2XYZ.c \ + im_rad2float.c INCLUDES = -I${top_srcdir}/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ diff --git a/libsrc/colour/colour_dispatch.c b/libsrc/colour/colour_dispatch.c index 032993de..ca80eb5d 100644 --- a/libsrc/colour/colour_dispatch.c +++ b/libsrc/colour/colour_dispatch.c @@ -467,6 +467,25 @@ static im_function LabQ2Lab_desc = { one_in_one_out /* Arg list */ }; +/* Call im_rad2float() via arg vector. + */ +static int +rad2float_vec( im_object *argv ) +{ + return( im_rad2float( argv[0], argv[1] ) ); +} + +/* Description of im_LabQ2Lab. + */ +static im_function rad2float_desc = { + "im_rad2float", /* Name */ + "convert Radiance packed to float", /* Description */ + IM_FN_PIO, /* Flags */ + rad2float_vec, /* Dispatch function */ + IM_NUMBER( one_in_one_out ), /* Size of arg list */ + one_in_one_out /* Arg list */ +}; + /* Call im_LabQ2LabS() via arg vector. */ static int @@ -1000,6 +1019,7 @@ static im_function *colour_list[] = { &icc_present_desc, &icc_transform_desc, &morph_desc, + &rad2float_desc, &sRGB2XYZ_desc }; diff --git a/libsrc/colour/im_rad2float.c b/libsrc/colour/im_rad2float.c new file mode 100644 index 00000000..ccbaa5cf --- /dev/null +++ b/libsrc/colour/im_rad2float.c @@ -0,0 +1,193 @@ +/* Convert Radiance 32bit packed format to float. + * 3/3/09 + * - from LabQ2Lab and Radiance sources + */ + +/* + + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + */ + +/* + + These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk + + */ + +/* + + Sections of this file from Greg Ward and Radiance with kind + permission. The Radience copyright notice appears below. + + */ + +/* ==================================================================== + * The Radiance Software License, Version 1.0 + * + * Copyright (c) 1990 - 2009 The Regents of the University of California, + * through Lawrence Berkeley National Laboratory. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes Radiance software + * (http://radsite.lbl.gov/) + * developed by the Lawrence Berkeley National Laboratory + * (http://www.lbl.gov/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Radiance," "Lawrence Berkeley National Laboratory" + * and "The Regents of the University of California" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact radiance@radsite.lbl.gov. + * + * 5. Products derived from this software may not be called "Radiance", + * nor may "Radiance" appear in their name, without prior written + * permission of Lawrence Berkeley National Laboratory. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of Lawrence Berkeley National Laboratory. For more + * information on Lawrence Berkeley National Laboratory, please see + * . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif /*HAVE_CONFIG_H*/ +#include + +#include +#include + +#include + +#ifdef WITH_DMALLOC +#include +#endif /*WITH_DMALLOC*/ + +/* Begin copy-paste from Radiance sources. + */ + +#define RED 0 +#define GRN 1 +#define BLU 2 +#define CIEX 0 /* or, if input is XYZ... */ +#define CIEY 1 +#define CIEZ 2 +#define EXP 3 /* exponent same for either format */ +#define COLXS 128 /* excess used for exponent */ +#define WHT 3 /* used for RGBPRIMS type */ + +#undef BYTE +#define BYTE unsigned char /* 8-bit unsigned integer */ + +typedef BYTE COLR[4]; /* red, green, blue (or X,Y,Z), exponent */ + +typedef float COLORV; +typedef COLORV COLOR[3]; /* red, green, blue (or X,Y,Z) */ + +#define copycolor(c1,c2) ((c1)[0]=(c2)[0],(c1)[1]=(c2)[1],(c1)[2]=(c2)[2]) + +static void +colr_color(col, clr) /* convert short to float color */ +register COLOR col; +register COLR clr; +{ + double f; + + if (clr[EXP] == 0) + col[RED] = col[GRN] = col[BLU] = 0.0; + else { + f = ldexp(1.0, (int)clr[EXP]-(COLXS+8)); + col[RED] = (clr[RED] + 0.5)*f; + col[GRN] = (clr[GRN] + 0.5)*f; + col[BLU] = (clr[BLU] + 0.5)*f; + } +} + +/* End copy-paste from Radiance sources. + */ + + +void +rad2float( COLR *inp, COLOR *outbuf, int n ) +{ + colr_color(outbuf[0], inp[0]); + while (--n > 0) { + outbuf++; inp++; + if (inp[0][RED] == inp[-1][RED] && + inp[0][GRN] == inp[-1][GRN] && + inp[0][BLU] == inp[-1][BLU] && + inp[0][EXP] == inp[-1][EXP]) + copycolor(outbuf[0], outbuf[-1]); + else + colr_color(outbuf[0], inp[0]); + } +} + +int +im_rad2float( IMAGE *in, IMAGE *out ) +{ + /* Must be 4-band uchar. + */ + if( in->Bands != 4 || in->BandFmt != IM_BANDFMT_UCHAR || + in->Coding != IM_CODING_NONE ) { + im_error( "im_rad2float", "%s", + _( "not a 4-band uchar uncoded image" ) ); + return( -1 ); + } + + if( im_cp_desc( out, in ) ) + return( -1 ); + out->Bands = 3; + out->BandFmt = IM_BANDFMT_FLOAT; + out->Bbits = im_bits_of_fmt( out->BandFmt ); + + if( im_wrapone( in, out, + (im_wrapone_fn) rad2float, NULL, NULL ) ) + return( -1 ); + + return( 0 ); +} diff --git a/libsrc/format/radiance.c b/libsrc/format/radiance.c index 722b74c8..b5bc6d58 100644 --- a/libsrc/format/radiance.c +++ b/libsrc/format/radiance.c @@ -574,24 +574,6 @@ char *buf; #define MINRUN 4 /* minimum run length */ -static char * -tempbuffer(len) /* get a temporary buffer */ -unsigned int len; -{ - static char *tempbuf = NULL; - static unsigned tempbuflen = 0; - - if (len > tempbuflen) { - if (tempbuflen > 0) - tempbuf = (char *)realloc((void *)tempbuf, len); - else - tempbuf = (char *)malloc(len); - tempbuflen = tempbuf==NULL ? 0 : len; - } - return(tempbuf); -} - - static int oldreadcolrs(scanline, len, fp) /* read in an old colr scanline */ @@ -686,54 +668,6 @@ register FILE *fp; -static void -colr_color(col, clr) /* convert short to float color */ -register COLOR col; -register COLR clr; -{ - double f; - - if (clr[EXP] == 0) - col[RED] = col[GRN] = col[BLU] = 0.0; - else { - f = ldexp(1.0, (int)clr[EXP]-(COLXS+8)); - col[RED] = (clr[RED] + 0.5)*f; - col[GRN] = (clr[GRN] + 0.5)*f; - col[BLU] = (clr[BLU] + 0.5)*f; - } -} - -static int -freadscan(scanline, len, fp) /* read in a scanline */ -register COLOR *scanline; -int len; -FILE *fp; -{ - register COLR *clrscan; - - if ((clrscan = (COLR *)tempbuffer(len*sizeof(COLR))) == NULL) - return(-1); - if (freadcolrs(clrscan, len, fp) < 0) - return(-1); - /* convert scanline */ - colr_color(scanline[0], clrscan[0]); - while (--len > 0) { - scanline++; clrscan++; - if (clrscan[0][RED] == clrscan[-1][RED] && - clrscan[0][GRN] == clrscan[-1][GRN] && - clrscan[0][BLU] == clrscan[-1][BLU] && - clrscan[0][EXP] == clrscan[-1][EXP]) - copycolor(scanline[0], scanline[-1]); - else - colr_color(scanline[0], clrscan[0]); - } - return(0); -} - - - - - /* End copy-paste from Radiance sources. @@ -752,7 +686,7 @@ typedef struct { double aspect; RGBPRIMS prims; - COLOR *buf; + COLR *buf; } Read; static int @@ -768,11 +702,11 @@ israd( const char *filename ) if( !(fin = fopen( filename, "r" )) ) return( 0 ); - strcpy( format, "*" ); + strcpy( format, PICFMT ); result = checkheader( fin, format, NULL ); fclose( fin ); - return( result ); + return( result == 1 ); } static void @@ -876,8 +810,8 @@ rad2vips_get_header( Read *read, FILE *fin, IMAGE *out ) out->Xsize = scanlen( &rs ); out->Ysize = numscans( &rs ); - out->Bands = 3; - out->BandFmt = IM_BANDFMT_FLOAT; + out->Bands = 4; + out->BandFmt = IM_BANDFMT_UCHAR; out->Bbits = im_bits_of_fmt( out->BandFmt ); out->Coding = IM_CODING_NONE; @@ -947,11 +881,11 @@ rad2vips_get_data( Read *read, FILE *fin, IMAGE *im ) if( im_outcheck( im ) || im_setupout( im ) ) return( -1 ); - if( !(read->buf = IM_ARRAY( NULL, im->Xsize, COLOR )) ) + if( !(read->buf = IM_ARRAY( NULL, im->Xsize, COLR )) ) return( -1 ); for( y = 0; y < im->Ysize; y++ ) { - if( freadscan( read->buf, im->Xsize, fin ) ) { + if( freadcolrs( read->buf, im->Xsize, fin ) ) { im_error( "rad2vips", "%s", _( "read error" ) ); return( -1 ); } diff --git a/libsrcCC/vipsc++.cc b/libsrcCC/vipsc++.cc index e03eb388..a78fc489 100644 --- a/libsrcCC/vipsc++.cc +++ b/libsrcCC/vipsc++.cc @@ -1,68 +1,5 @@ // this file automatically generated from -// VIPS library 7.14.0-Fri Feb 29 12:02:58 GMT 2008 -// im_estpar: estimate transform parms -VDMask VImage::estpar( VImage dst, int order, int ipol, int wrap, double& avg_displ ) throw( VError ) -{ - VImage src = *this; - VDMask params; - - Vargv _vec( "im_estpar" ); - - _vec.data(0) = src.image(); - _vec.data(1) = dst.image(); - ((im_mask_object*) _vec.data(2))->name = (char*)"noname"; - *((int*) _vec.data(3)) = order; - *((int*) _vec.data(4)) = ipol; - *((int*) _vec.data(5)) = wrap; - _vec.call(); - params.embed( (DOUBLEMASK *)((im_mask_object*)_vec.data(2))->mask ); - avg_displ = *((double*)_vec.data(6)); - - return( params ); -} - -// im_transform: transform an image -VImage VImage::transform( VDMask params, int ipol, int wrap ) throw( VError ) -{ - VImage in = *this; - VImage out; - - Vargv _vec( "im_transform" ); - - _vec.data(0) = in.image(); - _vec.data(1) = out.image(); - ((im_mask_object*) _vec.data(2))->mask = params.mask().dptr; - *((int*) _vec.data(3)) = ipol; - *((int*) _vec.data(4)) = wrap; - _vec.call(); - - return( out ); -} - -// im_transform_search: search for a transform -VImage VImage::transform_search( VImage dst, double error, int iterations, int order, int ipol, int wrap, VDMask& out_par, double& act_error ) throw( VError ) -{ - VImage src = *this; - VImage out; - - Vargv _vec( "im_transform_search" ); - - _vec.data(0) = src.image(); - _vec.data(1) = dst.image(); - _vec.data(2) = out.image(); - *((double*) _vec.data(3)) = error; - *((int*) _vec.data(4)) = iterations; - *((int*) _vec.data(5)) = order; - *((int*) _vec.data(6)) = ipol; - *((int*) _vec.data(7)) = wrap; - ((im_mask_object*) _vec.data(8))->name = (char*)"noname"; - _vec.call(); - out_par.embed( (DOUBLEMASK *)((im_mask_object*)_vec.data(8))->mask ); - act_error = *((double*)_vec.data(9)); - - return( out ); -} - +// VIPS library 7.17.2-Tue Mar 3 14:42:34 GMT 2009 // im_abs: absolute value VImage VImage::abs() throw( VError ) { @@ -1792,6 +1729,22 @@ VImage VImage::lab_morph( VDMask greyscale, double L_offset, double L_scale, dou return( out ); } +// im_rad2float: convert Radiance packed to float +VImage VImage::rad2float() throw( VError ) +{ + VImage in = *this; + VImage out; + + Vargv _vec( "im_rad2float" ); + + _vec.data(0) = in.image(); + _vec.data(1) = out.image(); + _vec.call(); + out._ref->addref( in._ref ); + + return( out ); +} + // im_sRGB2XYZ: convert sRGB to XYZ VImage VImage::sRGB2XYZ() throw( VError ) { @@ -2171,20 +2124,6 @@ VImage VImage::copy_set( int Type, double Xres, double Yres, int Xoffset, int Yo return( output ); } -// im_csv2vips: read a file in csv format -VImage VImage::csv2vips( char* filename ) throw( VError ) -{ - VImage im; - - Vargv _vec( "im_csv2vips" ); - - _vec.data(0) = (im_object) filename; - _vec.data(1) = im.image(); - _vec.call(); - - return( im ); -} - // im_extract_area: extract area VImage VImage::extract_area( int left, int top, int width, int height ) throw( VError ) { @@ -2409,20 +2348,6 @@ VImage VImage::insert_noexpand( VImage sub, int x, int y ) throw( VError ) return( out ); } -// im_jpeg2vips: convert from jpeg -VImage VImage::jpeg2vips( char* in ) throw( VError ) -{ - VImage out; - - Vargv _vec( "im_jpeg2vips" ); - - _vec.data(0) = (im_object) in; - _vec.data(1) = out.image(); - _vec.call(); - - return( out ); -} - // im_lrjoin: join two images left-right VImage VImage::lrjoin( VImage in2 ) throw( VError ) { @@ -2441,20 +2366,6 @@ VImage VImage::lrjoin( VImage in2 ) throw( VError ) return( out ); } -// im_magick2vips: load file with libMagick -VImage VImage::magick2vips( char* in ) throw( VError ) -{ - VImage out; - - Vargv _vec( "im_magick2vips" ); - - _vec.data(0) = (im_object) in; - _vec.data(1) = out.image(); - _vec.call(); - - return( out ); -} - // im_mask2vips: convert DOUBLEMASK to VIPS image VImage VImage::mask2vips( VDMask input ) throw( VError ) { @@ -2502,62 +2413,6 @@ VImage VImage::msb_band( int band ) throw( VError ) return( out ); } -// im_png2vips: convert PNG file to VIPS image -VImage VImage::png2vips( char* in ) throw( VError ) -{ - VImage out; - - Vargv _vec( "im_png2vips" ); - - _vec.data(0) = (im_object) in; - _vec.data(1) = out.image(); - _vec.call(); - - return( out ); -} - -// im_exr2vips: convert an OpenEXR file to VIPS -VImage VImage::exr2vips( char* in ) throw( VError ) -{ - VImage out; - - Vargv _vec( "im_exr2vips" ); - - _vec.data(0) = (im_object) in; - _vec.data(1) = out.image(); - _vec.call(); - - return( out ); -} - -// im_ppm2vips: read a file in pbm/pgm/ppm format -VImage VImage::ppm2vips( char* filename ) throw( VError ) -{ - VImage im; - - Vargv _vec( "im_ppm2vips" ); - - _vec.data(0) = (im_object) filename; - _vec.data(1) = im.image(); - _vec.call(); - - return( im ); -} - -// im_analyze2vips: read a file in analyze format -VImage VImage::analyze2vips( char* filename ) throw( VError ) -{ - VImage im; - - Vargv _vec( "im_analyze2vips" ); - - _vec.data(0) = (im_object) filename; - _vec.data(1) = im.image(); - _vec.call(); - - return( im ); -} - // im_recomb: linear recombination with mask VImage VImage::recomb( VDMask matrix ) throw( VError ) { @@ -2812,42 +2667,6 @@ VImage VImage::thresh( double threshold ) throw( VError ) return( output ); } -// im_tiff2vips: convert TIFF file to VIPS image -VImage VImage::tiff2vips( char* in ) throw( VError ) -{ - VImage out; - - Vargv _vec( "im_tiff2vips" ); - - _vec.data(0) = (im_object) in; - _vec.data(1) = out.image(); - _vec.call(); - - return( out ); -} - -// im_vips2csv: write an image in csv format -void VImage::vips2csv( char* filename ) throw( VError ) -{ - VImage in = *this; - Vargv _vec( "im_vips2csv" ); - - _vec.data(0) = in.image(); - _vec.data(1) = (im_object) filename; - _vec.call(); -} - -// im_vips2jpeg: convert to jpeg -void VImage::vips2jpeg( char* out ) throw( VError ) -{ - VImage in = *this; - Vargv _vec( "im_vips2jpeg" ); - - _vec.data(0) = in.image(); - _vec.data(1) = (im_object) out; - _vec.call(); -} - // im_vips2mask: convert VIPS image to DOUBLEMASK VDMask VImage::vips2mask() throw( VError ) { @@ -2864,50 +2683,6 @@ VDMask VImage::vips2mask() throw( VError ) return( output ); } -// im_vips2mimejpeg: convert to jpeg as mime type on stdout -void VImage::vips2mimejpeg( int qfac ) throw( VError ) -{ - VImage in = *this; - Vargv _vec( "im_vips2mimejpeg" ); - - _vec.data(0) = in.image(); - *((int*) _vec.data(1)) = qfac; - _vec.call(); -} - -// im_vips2png: convert VIPS image to PNG file -void VImage::vips2png( char* out ) throw( VError ) -{ - VImage in = *this; - Vargv _vec( "im_vips2png" ); - - _vec.data(0) = in.image(); - _vec.data(1) = (im_object) out; - _vec.call(); -} - -// im_vips2ppm: write a file in pbm/pgm/ppm format -void VImage::vips2ppm( char* filename ) throw( VError ) -{ - VImage im = *this; - Vargv _vec( "im_vips2ppm" ); - - _vec.data(0) = im.image(); - _vec.data(1) = (im_object) filename; - _vec.call(); -} - -// im_vips2tiff: convert VIPS image to TIFF file -void VImage::vips2tiff( char* out ) throw( VError ) -{ - VImage in = *this; - Vargv _vec( "im_vips2tiff" ); - - _vec.data(0) = in.image(); - _vec.data(1) = (im_object) out; - _vec.call(); -} - // im_wrap: shift image origin, wrapping at sides VImage VImage::wrap( int x, int y ) throw( VError ) { @@ -3581,6 +3356,184 @@ VImage VImage::zerox( int flag ) throw( VError ) return( out ); } +// im_csv2vips: read a file in csv format +VImage VImage::csv2vips( char* filename ) throw( VError ) +{ + VImage im; + + Vargv _vec( "im_csv2vips" ); + + _vec.data(0) = (im_object) filename; + _vec.data(1) = im.image(); + _vec.call(); + + return( im ); +} + +// im_jpeg2vips: convert from jpeg +VImage VImage::jpeg2vips( char* in ) throw( VError ) +{ + VImage out; + + Vargv _vec( "im_jpeg2vips" ); + + _vec.data(0) = (im_object) in; + _vec.data(1) = out.image(); + _vec.call(); + + return( out ); +} + +// im_magick2vips: load file with libMagick +VImage VImage::magick2vips( char* in ) throw( VError ) +{ + VImage out; + + Vargv _vec( "im_magick2vips" ); + + _vec.data(0) = (im_object) in; + _vec.data(1) = out.image(); + _vec.call(); + + return( out ); +} + +// im_png2vips: convert PNG file to VIPS image +VImage VImage::png2vips( char* in ) throw( VError ) +{ + VImage out; + + Vargv _vec( "im_png2vips" ); + + _vec.data(0) = (im_object) in; + _vec.data(1) = out.image(); + _vec.call(); + + return( out ); +} + +// im_exr2vips: convert an OpenEXR file to VIPS +VImage VImage::exr2vips( char* in ) throw( VError ) +{ + VImage out; + + Vargv _vec( "im_exr2vips" ); + + _vec.data(0) = (im_object) in; + _vec.data(1) = out.image(); + _vec.call(); + + return( out ); +} + +// im_ppm2vips: read a file in pbm/pgm/ppm format +VImage VImage::ppm2vips( char* filename ) throw( VError ) +{ + VImage im; + + Vargv _vec( "im_ppm2vips" ); + + _vec.data(0) = (im_object) filename; + _vec.data(1) = im.image(); + _vec.call(); + + return( im ); +} + +// im_analyze2vips: read a file in analyze format +VImage VImage::analyze2vips( char* filename ) throw( VError ) +{ + VImage im; + + Vargv _vec( "im_analyze2vips" ); + + _vec.data(0) = (im_object) filename; + _vec.data(1) = im.image(); + _vec.call(); + + return( im ); +} + +// im_tiff2vips: convert TIFF file to VIPS image +VImage VImage::tiff2vips( char* in ) throw( VError ) +{ + VImage out; + + Vargv _vec( "im_tiff2vips" ); + + _vec.data(0) = (im_object) in; + _vec.data(1) = out.image(); + _vec.call(); + + return( out ); +} + +// im_vips2csv: write an image in csv format +void VImage::vips2csv( char* filename ) throw( VError ) +{ + VImage in = *this; + Vargv _vec( "im_vips2csv" ); + + _vec.data(0) = in.image(); + _vec.data(1) = (im_object) filename; + _vec.call(); +} + +// im_vips2jpeg: convert to jpeg +void VImage::vips2jpeg( char* out ) throw( VError ) +{ + VImage in = *this; + Vargv _vec( "im_vips2jpeg" ); + + _vec.data(0) = in.image(); + _vec.data(1) = (im_object) out; + _vec.call(); +} + +// im_vips2mimejpeg: convert to jpeg as mime type on stdout +void VImage::vips2mimejpeg( int qfac ) throw( VError ) +{ + VImage in = *this; + Vargv _vec( "im_vips2mimejpeg" ); + + _vec.data(0) = in.image(); + *((int*) _vec.data(1)) = qfac; + _vec.call(); +} + +// im_vips2png: convert VIPS image to PNG file +void VImage::vips2png( char* out ) throw( VError ) +{ + VImage in = *this; + Vargv _vec( "im_vips2png" ); + + _vec.data(0) = in.image(); + _vec.data(1) = (im_object) out; + _vec.call(); +} + +// im_vips2ppm: write a file in pbm/pgm/ppm format +void VImage::vips2ppm( char* filename ) throw( VError ) +{ + VImage im = *this; + Vargv _vec( "im_vips2ppm" ); + + _vec.data(0) = im.image(); + _vec.data(1) = (im_object) filename; + _vec.call(); +} + +// im_vips2tiff: convert VIPS image to TIFF file +void VImage::vips2tiff( char* out ) throw( VError ) +{ + VImage in = *this; + Vargv _vec( "im_vips2tiff" ); + + _vec.data(0) = in.image(); + _vec.data(1) = (im_object) out; + _vec.call(); +} + // im_create_fmask: create frequency domain filter mask VImage VImage::create_fmask( int width, int height, int type, double p1, double p2, double p3, double p4, double p5 ) throw( VError ) { @@ -4474,32 +4427,6 @@ VImage VImage::profile( int direction ) throw( VError ) return( out ); } -// im_affine: affine transform -VImage VImage::affine( double a, double b, double c, double d, double dx, double dy, int x, int y, int w, int h ) throw( VError ) -{ - VImage in = *this; - VImage out; - - Vargv _vec( "im_affine" ); - - _vec.data(0) = in.image(); - _vec.data(1) = out.image(); - *((double*) _vec.data(2)) = a; - *((double*) _vec.data(3)) = b; - *((double*) _vec.data(4)) = c; - *((double*) _vec.data(5)) = d; - *((double*) _vec.data(6)) = dx; - *((double*) _vec.data(7)) = dy; - *((int*) _vec.data(8)) = x; - *((int*) _vec.data(9)) = y; - *((int*) _vec.data(10)) = w; - *((int*) _vec.data(11)) = h; - _vec.call(); - out._ref->addref( in._ref ); - - return( out ); -} - // im_align_bands: align the bands of an image VImage VImage::align_bands() throw( VError ) { @@ -4823,50 +4750,6 @@ VImage VImage::remosaic( char* old_str, char* new_str ) throw( VError ) return( out ); } -// im_similarity_area: output area xywh of similarity transformation -VImage VImage::similarity_area( double a, double b, double dx, double dy, int x, int y, int w, int h ) throw( VError ) -{ - VImage in = *this; - VImage out; - - Vargv _vec( "im_similarity_area" ); - - _vec.data(0) = in.image(); - _vec.data(1) = out.image(); - *((double*) _vec.data(2)) = a; - *((double*) _vec.data(3)) = b; - *((double*) _vec.data(4)) = dx; - *((double*) _vec.data(5)) = dy; - *((int*) _vec.data(6)) = x; - *((int*) _vec.data(7)) = y; - *((int*) _vec.data(8)) = w; - *((int*) _vec.data(9)) = h; - _vec.call(); - out._ref->addref( in._ref ); - - return( out ); -} - -// im_similarity: similarity transformation -VImage VImage::similarity( double a, double b, double dx, double dy ) throw( VError ) -{ - VImage in = *this; - VImage out; - - Vargv _vec( "im_similarity" ); - - _vec.data(0) = in.image(); - _vec.data(1) = out.image(); - *((double*) _vec.data(2)) = a; - *((double*) _vec.data(3)) = b; - *((double*) _vec.data(4)) = dx; - *((double*) _vec.data(5)) = dy; - _vec.call(); - out._ref->addref( in._ref ); - - return( out ); -} - // im_tbmerge: top-bottom merge of in1 and in2 VImage VImage::tbmerge( VImage sec, int dx, int dy, int mwidth ) throw( VError ) { @@ -5496,6 +5379,76 @@ VImage VImage::notequal( double c ) throw( VError ) return( out ); } +// im_affine: affine transform +VImage VImage::affine( double a, double b, double c, double d, double dx, double dy, int x, int y, int w, int h ) throw( VError ) +{ + VImage in = *this; + VImage out; + + Vargv _vec( "im_affine" ); + + _vec.data(0) = in.image(); + _vec.data(1) = out.image(); + *((double*) _vec.data(2)) = a; + *((double*) _vec.data(3)) = b; + *((double*) _vec.data(4)) = c; + *((double*) _vec.data(5)) = d; + *((double*) _vec.data(6)) = dx; + *((double*) _vec.data(7)) = dy; + *((int*) _vec.data(8)) = x; + *((int*) _vec.data(9)) = y; + *((int*) _vec.data(10)) = w; + *((int*) _vec.data(11)) = h; + _vec.call(); + out._ref->addref( in._ref ); + + return( out ); +} + +// im_similarity_area: output area xywh of similarity transformation +VImage VImage::similarity_area( double a, double b, double dx, double dy, int x, int y, int w, int h ) throw( VError ) +{ + VImage in = *this; + VImage out; + + Vargv _vec( "im_similarity_area" ); + + _vec.data(0) = in.image(); + _vec.data(1) = out.image(); + *((double*) _vec.data(2)) = a; + *((double*) _vec.data(3)) = b; + *((double*) _vec.data(4)) = dx; + *((double*) _vec.data(5)) = dy; + *((int*) _vec.data(6)) = x; + *((int*) _vec.data(7)) = y; + *((int*) _vec.data(8)) = w; + *((int*) _vec.data(9)) = h; + _vec.call(); + out._ref->addref( in._ref ); + + return( out ); +} + +// im_similarity: similarity transformation +VImage VImage::similarity( double a, double b, double dx, double dy ) throw( VError ) +{ + VImage in = *this; + VImage out; + + Vargv _vec( "im_similarity" ); + + _vec.data(0) = in.image(); + _vec.data(1) = out.image(); + *((double*) _vec.data(2)) = a; + *((double*) _vec.data(3)) = b; + *((double*) _vec.data(4)) = dx; + *((double*) _vec.data(5)) = dy; + _vec.call(); + out._ref->addref( in._ref ); + + return( out ); +} + // im_video_test: test video grabber VImage VImage::video_test( int brightness, int error ) throw( VError ) { diff --git a/po/POTFILES.in b/po/POTFILES.in index 311b8db3..f6006aff 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -54,6 +54,7 @@ libsrc/colour/derived.c libsrc/colour/im_disp2XYZ.c libsrc/colour/im_LabQ2Lab.c libsrc/colour/im_Lab2LabQ.c +libsrc/colour/im_rad2float.c libsrc/colour/im_XYZ2disp.c libsrc/colour/im_lab_morph.c libsrc/colour/im_dE00_fromLab.c @@ -331,344 +332,12 @@ src/other/glds.c src/other/sines.c src/other/cooc.c src/other/cooc_features.c -vips-7.17.1/contrib/vdump/vdump.c -vips-7.17.1/contrib/vips2dj/vips2ah.c -vips-7.17.1/contrib/vips2dj/vips2dj.c -vips-7.17.1/contrib/mitsub/mitsub.c -vips-7.17.1/libsrc/histograms_lut/im_invertlut.c -vips-7.17.1/libsrc/histograms_lut/hist_dispatch.c -vips-7.17.1/libsrc/histograms_lut/im_project.c -vips-7.17.1/libsrc/histograms_lut/im_hist.c -vips-7.17.1/libsrc/histograms_lut/im_histspec.c -vips-7.17.1/libsrc/histograms_lut/im_stdif.c -vips-7.17.1/libsrc/histograms_lut/im_maplut.c -vips-7.17.1/libsrc/histograms_lut/im_histgr.c -vips-7.17.1/libsrc/histograms_lut/im_identity.c -vips-7.17.1/libsrc/histograms_lut/im_histnD.c -vips-7.17.1/libsrc/histograms_lut/tone.c -vips-7.17.1/libsrc/histograms_lut/im_histplot.c -vips-7.17.1/libsrc/histograms_lut/im_gammacorrect.c -vips-7.17.1/libsrc/histograms_lut/im_heq.c -vips-7.17.1/libsrc/histograms_lut/im_histeq.c -vips-7.17.1/libsrc/histograms_lut/im_lhisteq.c -vips-7.17.1/libsrc/histograms_lut/im_buildlut.c -vips-7.17.1/libsrc/histograms_lut/im_hsp.c -vips-7.17.1/libsrc/mosaicing/im_tbmerge.c -vips-7.17.1/libsrc/mosaicing/im_lrmosaic.c -vips-7.17.1/libsrc/mosaicing/im_chkpair.c -vips-7.17.1/libsrc/mosaicing/global_balance.c -vips-7.17.1/libsrc/mosaicing/im_tbmosaic.c -vips-7.17.1/libsrc/mosaicing/im_improve.c -vips-7.17.1/libsrc/mosaicing/im_avgdxdy.c -vips-7.17.1/libsrc/mosaicing/mosaic1.c -vips-7.17.1/libsrc/mosaicing/im_remosaic.c -vips-7.17.1/libsrc/mosaicing/mosaicing_dispatch.c -vips-7.17.1/libsrc/mosaicing/im_maxpos_subpel.c -vips-7.17.1/libsrc/mosaicing/im_lrcalcon.c -vips-7.17.1/libsrc/mosaicing/im_lrmerge.c -vips-7.17.1/libsrc/mosaicing/im_initialize.c -vips-7.17.1/libsrc/mosaicing/im_tbcalcon.c -vips-7.17.1/libsrc/mosaicing/im_align_bands.c -vips-7.17.1/libsrc/mosaicing/match.c -vips-7.17.1/libsrc/mosaicing/im_clinear.c -vips-7.17.1/libsrc/matrix/im_mattrn.c -vips-7.17.1/libsrc/matrix/im_matcat.c -vips-7.17.1/libsrc/matrix/matalloc.c -vips-7.17.1/libsrc/matrix/matrix_dispatch.c -vips-7.17.1/libsrc/matrix/im_matinv.c -vips-7.17.1/libsrc/matrix/im_matmul.c -vips-7.17.1/libsrc/convolution/im_contrast_surface.c -vips-7.17.1/libsrc/convolution/im_zerox.c -vips-7.17.1/libsrc/convolution/im_rank_image.c -vips-7.17.1/libsrc/convolution/im_phasecor_fft.c -vips-7.17.1/libsrc/convolution/im_compass.c -vips-7.17.1/libsrc/convolution/rw_mask.c -vips-7.17.1/libsrc/convolution/im_resize_linear.c -vips-7.17.1/libsrc/convolution/im_sharpen.c -vips-7.17.1/libsrc/convolution/im_spcor.c -vips-7.17.1/libsrc/convolution/im_shrink.c -vips-7.17.1/libsrc/convolution/im_gaussnoise.c -vips-7.17.1/libsrc/convolution/rotmask.c -vips-7.17.1/libsrc/convolution/im_gradcor.c -vips-7.17.1/libsrc/convolution/im_rank.c -vips-7.17.1/libsrc/convolution/im_mpercent.c -vips-7.17.1/libsrc/convolution/im_convsepf.c -vips-7.17.1/libsrc/convolution/convol_dispatch.c -vips-7.17.1/libsrc/convolution/im_embed.c -vips-7.17.1/libsrc/convolution/im_stretch3.c -vips-7.17.1/libsrc/convolution/im_convsub.c -vips-7.17.1/libsrc/convolution/im_convsep.c -vips-7.17.1/libsrc/convolution/im_convf.c -vips-7.17.1/libsrc/convolution/im_gaussmasks.c -vips-7.17.1/libsrc/convolution/im_fastcor.c -vips-7.17.1/libsrc/convolution/im_conv.c -vips-7.17.1/libsrc/convolution/im_logmasks.c -vips-7.17.1/libsrc/convolution/im_addgnoise.c -vips-7.17.1/libsrc/format/matlab.c -vips-7.17.1/libsrc/format/im_magick2vips.c -vips-7.17.1/libsrc/format/im_vips2csv.c -vips-7.17.1/libsrc/format/im_csv2vips.c -vips-7.17.1/libsrc/format/radiance.c -vips-7.17.1/libsrc/format/format.c -vips-7.17.1/libsrc/format/im_analyze2vips.c -vips-7.17.1/libsrc/format/im_vips2tiff.c -vips-7.17.1/libsrc/format/im_ppm2vips.c -vips-7.17.1/libsrc/format/format_dispatch.c -vips-7.17.1/libsrc/format/im_tile_cache.c -vips-7.17.1/libsrc/format/im_jpeg2vips.c -vips-7.17.1/libsrc/format/im_png2vips.c -vips-7.17.1/libsrc/format/im_vips2ppm.c -vips-7.17.1/libsrc/format/im_vips2png.c -vips-7.17.1/libsrc/format/im_vips2raw.c -vips-7.17.1/libsrc/format/im_vips2jpeg.c -vips-7.17.1/libsrc/format/im_tiff2vips.c -vips-7.17.1/libsrc/format/im_exr2vips.c -vips-7.17.1/libsrc/format/im_raw2vips.c -vips-7.17.1/libsrc/acquire/im_clamp.c -vips-7.17.1/libsrc/other/im_simcontr.c -vips-7.17.1/libsrc/other/im_zone.c -vips-7.17.1/libsrc/other/im_spatres.c -vips-7.17.1/libsrc/other/cooc_funcs.c -vips-7.17.1/libsrc/other/im_benchmark.c -vips-7.17.1/libsrc/other/other_dispatch.c -vips-7.17.1/libsrc/other/glds_funcs.c -vips-7.17.1/libsrc/other/im_meanstd.c -vips-7.17.1/libsrc/other/im_dif_std.c -vips-7.17.1/libsrc/other/im_make_xy.c -vips-7.17.1/libsrc/other/im_eye.c -vips-7.17.1/libsrc/other/im_sines.c -vips-7.17.1/libsrc/other/im_grey.c -vips-7.17.1/libsrc/iofuncs/im_setbox.c -vips-7.17.1/libsrc/iofuncs/rect.c -vips-7.17.1/libsrc/iofuncs/im_open.c -vips-7.17.1/libsrc/iofuncs/im_writeline.c -vips-7.17.1/libsrc/iofuncs/util.c -vips-7.17.1/libsrc/iofuncs/im_iocheck.c -vips-7.17.1/libsrc/iofuncs/im_mapfile.c -vips-7.17.1/libsrc/iofuncs/package.c -vips-7.17.1/libsrc/iofuncs/window.c -vips-7.17.1/libsrc/iofuncs/im_wrapmany.c -vips-7.17.1/libsrc/iofuncs/im_setbuf.c -vips-7.17.1/libsrc/iofuncs/im_open_vips.c -vips-7.17.1/libsrc/iofuncs/meta.c -vips-7.17.1/libsrc/iofuncs/buf.c -vips-7.17.1/libsrc/iofuncs/im_prepare.c -vips-7.17.1/libsrc/iofuncs/im_init_world.c -vips-7.17.1/libsrc/iofuncs/debug.c -vips-7.17.1/libsrc/iofuncs/callback.c -vips-7.17.1/libsrc/iofuncs/im_iterate.c -vips-7.17.1/libsrc/iofuncs/im_cp_desc.c -vips-7.17.1/libsrc/iofuncs/im_unmapfile.c -vips-7.17.1/libsrc/iofuncs/im_close.c -vips-7.17.1/libsrc/iofuncs/im_image.c -vips-7.17.1/libsrc/iofuncs/im_init.c -vips-7.17.1/libsrc/iofuncs/memory.c -vips-7.17.1/libsrc/iofuncs/buffer.c -vips-7.17.1/libsrc/iofuncs/im_render.c -vips-7.17.1/libsrc/iofuncs/time.c -vips-7.17.1/libsrc/iofuncs/im_generate.c -vips-7.17.1/libsrc/iofuncs/im_histlin.c -vips-7.17.1/libsrc/iofuncs/im_header.c -vips-7.17.1/libsrc/iofuncs/threadgroup.c -vips-7.17.1/libsrc/iofuncs/im_guess_prefix.c -vips-7.17.1/libsrc/iofuncs/im_demand_hint.c -vips-7.17.1/libsrc/iofuncs/error.c -vips-7.17.1/libsrc/iofuncs/im_makerw.c -vips-7.17.1/libsrc/iofuncs/im_printdesc.c -vips-7.17.1/libsrc/iofuncs/im_piocheck.c -vips-7.17.1/libsrc/iofuncs/object.c -vips-7.17.1/libsrc/iofuncs/base64.c -vips-7.17.1/libsrc/iofuncs/predicate.c -vips-7.17.1/libsrc/iofuncs/semaphore.c -vips-7.17.1/libsrc/iofuncs/im_binfile.c -vips-7.17.1/libsrc/iofuncs/im_debugim.c -vips-7.17.1/libsrc/iofuncs/im_printlines.c -vips-7.17.1/libsrc/iofuncs/im_partial.c -vips-7.17.1/libsrc/iofuncs/im_wbuffer.c -vips-7.17.1/libsrc/iofuncs/im_setupout.c -vips-7.17.1/libsrc/iofuncs/im_updatehist.c -vips-7.17.1/libsrc/iofuncs/im_bits_of_fmt.c -vips-7.17.1/libsrc/iofuncs/im_initdesc.c -vips-7.17.1/libsrc/iofuncs/error_exit.c -vips-7.17.1/libsrc/iofuncs/im_wraptwo.c -vips-7.17.1/libsrc/iofuncs/dispatch_types.c -vips-7.17.1/libsrc/iofuncs/region.c -vips-7.17.1/libsrc/morphology/im_profile.c -vips-7.17.1/libsrc/morphology/morph_dispatch.c -vips-7.17.1/libsrc/morphology/im_dilate.c -vips-7.17.1/libsrc/morphology/im_cntlines.c -vips-7.17.1/libsrc/morphology/im_erode.c -vips-7.17.1/libsrc/video/video_dispatch.c -vips-7.17.1/libsrc/video/im_video_v4l1.c -vips-7.17.1/libsrc/video/im_video_test.c -vips-7.17.1/libsrc/dummy.c -vips-7.17.1/libsrc/relational/im_ifthenelse.c -vips-7.17.1/libsrc/relational/relational_dispatch.c -vips-7.17.1/libsrc/relational/relational.c -vips-7.17.1/libsrc/relational/im_blend.c -vips-7.17.1/libsrc/cimg/cimg_dispatch.c -vips-7.17.1/libsrc/arithmetic/im_cmulnorm.c -vips-7.17.1/libsrc/arithmetic/im_litecor.c -vips-7.17.1/libsrc/arithmetic/im_logtra.c -vips-7.17.1/libsrc/arithmetic/im_gadd.c -vips-7.17.1/libsrc/arithmetic/im_sign.c -vips-7.17.1/libsrc/arithmetic/im_minpos.c -vips-7.17.1/libsrc/arithmetic/im_maxpos_avg.c -vips-7.17.1/libsrc/arithmetic/im_subtract.c -vips-7.17.1/libsrc/arithmetic/im_max.c -vips-7.17.1/libsrc/arithmetic/im_remainder.c -vips-7.17.1/libsrc/arithmetic/im_gfadd.c -vips-7.17.1/libsrc/arithmetic/im_multiply.c -vips-7.17.1/libsrc/arithmetic/im_linreg.c -vips-7.17.1/libsrc/arithmetic/im_gaddim.c -vips-7.17.1/libsrc/arithmetic/im_abs.c -vips-7.17.1/libsrc/arithmetic/im_ceil.c -vips-7.17.1/libsrc/arithmetic/im_cross_phase.c -vips-7.17.1/libsrc/arithmetic/im_avg.c -vips-7.17.1/libsrc/arithmetic/im_bandmean.c -vips-7.17.1/libsrc/arithmetic/im_add.c -vips-7.17.1/libsrc/arithmetic/im_min.c -vips-7.17.1/libsrc/arithmetic/im_deviate.c -vips-7.17.1/libsrc/arithmetic/im_stats.c -vips-7.17.1/libsrc/arithmetic/im_maxpos_vec.c -vips-7.17.1/libsrc/arithmetic/im_lintra.c -vips-7.17.1/libsrc/arithmetic/im_measure.c -vips-7.17.1/libsrc/arithmetic/im_log10tra.c -vips-7.17.1/libsrc/arithmetic/im_powtra.c -vips-7.17.1/libsrc/arithmetic/im_costra.c -vips-7.17.1/libsrc/arithmetic/im_maxpos.c -vips-7.17.1/libsrc/arithmetic/im_invert.c -vips-7.17.1/libsrc/arithmetic/im_rint.c -vips-7.17.1/libsrc/arithmetic/im_sintra.c -vips-7.17.1/libsrc/arithmetic/arith_dispatch.c -vips-7.17.1/libsrc/arithmetic/im_point_bilinear.c -vips-7.17.1/libsrc/arithmetic/im_expntra.c -vips-7.17.1/libsrc/arithmetic/im_tantra.c -vips-7.17.1/libsrc/arithmetic/im_divide.c -vips-7.17.1/libsrc/arithmetic/im_fav4.c -vips-7.17.1/libsrc/arithmetic/im_floor.c -vips-7.17.1/libsrc/boolean/boolean.c -vips-7.17.1/libsrc/boolean/bool_dispatch.c -vips-7.17.1/libsrc/inplace/im_flood.c -vips-7.17.1/libsrc/inplace/inplace_dispatch.c -vips-7.17.1/libsrc/inplace/im_paintrect.c -vips-7.17.1/libsrc/inplace/smudge_area.c -vips-7.17.1/libsrc/inplace/im_insertplace.c -vips-7.17.1/libsrc/inplace/im_plotmask.c -vips-7.17.1/libsrc/inplace/plot_point.c -vips-7.17.1/libsrc/inplace/im_circle.c -vips-7.17.1/libsrc/inplace/line_draw.c -vips-7.17.1/libsrc/inplace/im_line.c -vips-7.17.1/libsrc/colour/im_dE_fromLab.c -vips-7.17.1/libsrc/colour/im_Lab2LCh.c -vips-7.17.1/libsrc/colour/im_dECMC_fromLab.c -vips-7.17.1/libsrc/colour/im_XYZ2Yxy.c -vips-7.17.1/libsrc/colour/derived.c -vips-7.17.1/libsrc/colour/im_disp2XYZ.c -vips-7.17.1/libsrc/colour/im_LabQ2Lab.c -vips-7.17.1/libsrc/colour/im_Lab2LabQ.c -vips-7.17.1/libsrc/colour/im_XYZ2disp.c -vips-7.17.1/libsrc/colour/im_lab_morph.c -vips-7.17.1/libsrc/colour/im_dE00_fromLab.c -vips-7.17.1/libsrc/colour/im_Lab2XYZ.c -vips-7.17.1/libsrc/colour/colour_dispatch.c -vips-7.17.1/libsrc/colour/colour.c -vips-7.17.1/libsrc/colour/im_LabQ2disp.c -vips-7.17.1/libsrc/colour/im_Yxy2XYZ.c -vips-7.17.1/libsrc/colour/im_XYZ2Lab.c -vips-7.17.1/libsrc/colour/im_LCh2Lab.c -vips-7.17.1/libsrc/colour/im_LabS2LabQ.c -vips-7.17.1/libsrc/colour/im_LabQ2LabS.c -vips-7.17.1/libsrc/colour/im_UCS2LCh.c -vips-7.17.1/libsrc/colour/im_Lab2LabS.c -vips-7.17.1/libsrc/colour/im_icc_transform.c -vips-7.17.1/libsrc/colour/im_LCh2UCS.c -vips-7.17.1/libsrc/colour/im_LabS2Lab.c -vips-7.17.1/libsrc/conversion/im_recomb.c -vips-7.17.1/libsrc/conversion/im_tbjoin.c -vips-7.17.1/libsrc/conversion/im_flipver.c -vips-7.17.1/libsrc/conversion/im_c2rect.c -vips-7.17.1/libsrc/conversion/im_rot90.c -vips-7.17.1/libsrc/conversion/im_c2ps.c -vips-7.17.1/libsrc/conversion/im_rightshift_size.c -vips-7.17.1/libsrc/conversion/im_insert.c -vips-7.17.1/libsrc/conversion/im_c2imag.c -vips-7.17.1/libsrc/conversion/im_falsecolour.c -vips-7.17.1/libsrc/conversion/im_text.c -vips-7.17.1/libsrc/conversion/conver_dispatch.c -vips-7.17.1/libsrc/conversion/im_bandjoin.c -vips-7.17.1/libsrc/conversion/im_slice.c -vips-7.17.1/libsrc/conversion/im_wrap.c -vips-7.17.1/libsrc/conversion/im_rot180.c -vips-7.17.1/libsrc/conversion/im_scale.c -vips-7.17.1/libsrc/conversion/im_black.c -vips-7.17.1/libsrc/conversion/im_c2real.c -vips-7.17.1/libsrc/conversion/im_scaleps.c -vips-7.17.1/libsrc/conversion/im_msb.c -vips-7.17.1/libsrc/conversion/im_ri2c.c -vips-7.17.1/libsrc/conversion/im_print.c -vips-7.17.1/libsrc/conversion/im_system.c -vips-7.17.1/libsrc/conversion/im_c2amph.c -vips-7.17.1/libsrc/conversion/im_bernd.c -vips-7.17.1/libsrc/conversion/im_lrjoin.c -vips-7.17.1/libsrc/conversion/im_copy.c -vips-7.17.1/libsrc/conversion/im_extract.c -vips-7.17.1/libsrc/conversion/im_thresh.c -vips-7.17.1/libsrc/conversion/im_zoom.c -vips-7.17.1/libsrc/conversion/im_clip.c -vips-7.17.1/libsrc/conversion/im_vips2mask.c -vips-7.17.1/libsrc/conversion/im_replicate.c -vips-7.17.1/libsrc/conversion/im_rot270.c -vips-7.17.1/libsrc/conversion/im_grid.c -vips-7.17.1/libsrc/conversion/im_fliphor.c -vips-7.17.1/libsrc/conversion/im_gbandjoin.c -vips-7.17.1/libsrc/conversion/im_subsample.c -vips-7.17.1/libsrc/conversion/im_mask2vips.c -vips-7.17.1/libsrc/resample/im_affine.c -vips-7.17.1/libsrc/resample/transform.c -vips-7.17.1/libsrc/resample/interpolate.c -vips-7.17.1/libsrc/resample/resample_dispatch.c -vips-7.17.1/libsrc/resample/similarity.c -vips-7.17.1/libsrc/freq_filt/im_freq_mask.c -vips-7.17.1/libsrc/freq_filt/im_invfft.c -vips-7.17.1/libsrc/freq_filt/freq_dispatch.c -vips-7.17.1/libsrc/freq_filt/im_disp_ps.c -vips-7.17.1/libsrc/freq_filt/fft_sp.c -vips-7.17.1/libsrc/freq_filt/fmaskcir.c -vips-7.17.1/libsrc/freq_filt/im_fwfft.c -vips-7.17.1/libsrc/freq_filt/im_fractsurf.c -vips-7.17.1/libsrc/freq_filt/im_freqflt.c -vips-7.17.1/libsrc/freq_filt/im_invfftr.c -vips-7.17.1/libsrc/freq_filt/im_rotquad.c -vips-7.17.1/libsrc/freq_filt/fmask4th.c -vips-7.17.1/src/mosaicing/find_mosaic.c -vips-7.17.1/src/mosaicing/mergeup.c -vips-7.17.1/src/other/spatres.c -vips-7.17.1/src/other/squares.c -vips-7.17.1/src/other/simcontr.c -vips-7.17.1/src/other/glds_features.c -vips-7.17.1/src/other/glds.c -vips-7.17.1/src/other/sines.c -vips-7.17.1/src/other/cooc.c -vips-7.17.1/src/other/cooc_features.c -vips-7.17.1/src/iofuncs/binfile.c -vips-7.17.1/src/iofuncs/vips.c -vips-7.17.1/src/iofuncs/debugim.c -vips-7.17.1/src/iofuncs/header.c -vips-7.17.1/src/iofuncs/edvips.c -vips-7.17.1/src/iofuncs/printlines.c libsrcCC/VDisplay.cc libsrcCC/VError.cc libsrcCC/VImage.cc libsrcCC/vipsc++.cc libsrcCC/VMask.cc libsrc/dummy2.cc -vips-7.17.1/libsrc/dummy2.cc -vips-7.17.1/libsrcCC/VMask.cc -vips-7.17.1/libsrcCC/vipsc++.cc -vips-7.17.1/libsrcCC/VError.cc -vips-7.17.1/libsrcCC/VImage.cc -vips-7.17.1/libsrcCC/VDisplay.cc contrib/vips2dj/vips2dj.h include/vips/mosaic.h include/vips/proto.h @@ -714,41 +383,3 @@ libsrc/mosaicing/global_balance.h libsrc/resample/templates.h libsrc/video/im_video_v4l1.h python/vipsCC/VImage.h -vips-7.17.1/contrib/vips2dj/vips2dj.h -vips-7.17.1/include/vips/mosaic.h -vips-7.17.1/include/vips/proto.h -vips-7.17.1/include/vips/VDisplay.h -vips-7.17.1/include/vips/debug.h -vips-7.17.1/include/vips/colour.h -vips-7.17.1/include/vips/region.h -vips-7.17.1/include/vips/meta.h -vips-7.17.1/include/vips/vips.h -vips-7.17.1/include/vips/format.h -vips-7.17.1/include/vips/VError.h -vips-7.17.1/include/vips/transform.h -vips-7.17.1/include/vips/util.h -vips-7.17.1/include/vips/interpolate.h -vips-7.17.1/include/vips/thread.h -vips-7.17.1/include/vips/vipscpp.h -vips-7.17.1/include/vips/r_access.h -vips-7.17.1/include/vips/threadgroup.h -vips-7.17.1/include/vips/object.h -vips-7.17.1/include/vips/version.h -vips-7.17.1/include/vips/VMask.h -vips-7.17.1/include/vips/struct.h -vips-7.17.1/include/vips/internal.h -vips-7.17.1/include/vips/intl.h -vips-7.17.1/include/vips/VImage.h -vips-7.17.1/include/vips/rect.h -vips-7.17.1/include/vips/fmask.h -vips-7.17.1/include/vips/vipsc++.h -vips-7.17.1/include/vips/buf.h -vips-7.17.1/include/vips/semaphore.h -vips-7.17.1/include/vips/dispatch.h -vips-7.17.1/libsrc/mosaicing/merge.h -vips-7.17.1/libsrc/mosaicing/mosaic.h -vips-7.17.1/libsrc/mosaicing/global_balance.h -vips-7.17.1/libsrc/format/dbh.h -vips-7.17.1/libsrc/iofuncs/base64.h -vips-7.17.1/libsrc/cimg/CImg.h -vips-7.17.1/libsrc/resample/templates.h diff --git a/po/en_GB.gmo b/po/en_GB.gmo index 71572c81..27828da2 100644 Binary files a/po/en_GB.gmo and b/po/en_GB.gmo differ diff --git a/po/en_GB.po b/po/en_GB.po index 45a27c79..a7a364df 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: vips 7.16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 18:02+0000\n" +"POT-Creation-Date: 2009-03-03 17:05+0000\n" "PO-Revision-Date: Fri Sep 5 10:27:43 BST 2008\n" "Last-Translator: john \n" "Language-Team: \n" @@ -12,11 +12,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libsrc/acquire/im_clamp.c:70 vips-7.17.1/libsrc/acquire/im_clamp.c:70 +#: libsrc/acquire/im_clamp.c:70 msgid "bad input format" msgstr "" -#: libsrc/acquire/im_clamp.c:75 vips-7.17.1/libsrc/acquire/im_clamp.c:75 +#: libsrc/acquire/im_clamp.c:75 #, fuzzy msgid "bad black format" msgstr "bad colourmap" @@ -36,36 +36,6 @@ msgstr "bad colourmap" #: libsrc/arithmetic/im_sintra.c:202 libsrc/arithmetic/im_expntra.c:184 #: libsrc/arithmetic/im_tantra.c:117 libsrc/arithmetic/im_tantra.c:203 #: libsrc/arithmetic/im_divide.c:186 libsrc/arithmetic/im_floor.c:106 -#: vips-7.17.1/libsrc/arithmetic/im_logtra.c:124 -#: vips-7.17.1/libsrc/arithmetic/im_sign.c:146 -#: vips-7.17.1/libsrc/arithmetic/im_subtract.c:187 -#: vips-7.17.1/libsrc/arithmetic/im_max.c:239 -#: vips-7.17.1/libsrc/arithmetic/im_remainder.c:108 -#: vips-7.17.1/libsrc/arithmetic/im_remainder.c:214 -#: vips-7.17.1/libsrc/arithmetic/im_multiply.c:203 -#: vips-7.17.1/libsrc/arithmetic/im_abs.c:221 -#: vips-7.17.1/libsrc/arithmetic/im_ceil.c:92 -#: vips-7.17.1/libsrc/arithmetic/im_avg.c:191 -#: vips-7.17.1/libsrc/arithmetic/im_add.c:255 -#: vips-7.17.1/libsrc/arithmetic/im_min.c:236 -#: vips-7.17.1/libsrc/arithmetic/im_deviate.c:199 -#: vips-7.17.1/libsrc/arithmetic/im_stats.c:241 -#: vips-7.17.1/libsrc/arithmetic/im_lintra.c:320 -#: vips-7.17.1/libsrc/arithmetic/im_measure.c:189 -#: vips-7.17.1/libsrc/arithmetic/im_log10tra.c:124 -#: vips-7.17.1/libsrc/arithmetic/im_powtra.c:184 -#: vips-7.17.1/libsrc/arithmetic/im_costra.c:117 -#: vips-7.17.1/libsrc/arithmetic/im_costra.c:202 -#: vips-7.17.1/libsrc/arithmetic/im_maxpos.c:94 -#: vips-7.17.1/libsrc/arithmetic/im_invert.c:119 -#: vips-7.17.1/libsrc/arithmetic/im_rint.c:92 -#: vips-7.17.1/libsrc/arithmetic/im_sintra.c:117 -#: vips-7.17.1/libsrc/arithmetic/im_sintra.c:202 -#: vips-7.17.1/libsrc/arithmetic/im_expntra.c:184 -#: vips-7.17.1/libsrc/arithmetic/im_tantra.c:117 -#: vips-7.17.1/libsrc/arithmetic/im_tantra.c:203 -#: vips-7.17.1/libsrc/arithmetic/im_divide.c:186 -#: vips-7.17.1/libsrc/arithmetic/im_floor.c:106 msgid "not uncoded" msgstr "" @@ -73,26 +43,14 @@ msgstr "" #: libsrc/arithmetic/im_powtra.c:188 libsrc/arithmetic/im_sintra.c:121 #: libsrc/arithmetic/im_sintra.c:206 libsrc/arithmetic/im_expntra.c:188 #: libsrc/arithmetic/im_tantra.c:121 libsrc/arithmetic/im_tantra.c:207 -#: vips-7.17.1/libsrc/arithmetic/im_logtra.c:128 -#: vips-7.17.1/libsrc/arithmetic/im_log10tra.c:128 -#: vips-7.17.1/libsrc/arithmetic/im_powtra.c:188 -#: vips-7.17.1/libsrc/arithmetic/im_sintra.c:121 -#: vips-7.17.1/libsrc/arithmetic/im_sintra.c:206 -#: vips-7.17.1/libsrc/arithmetic/im_expntra.c:188 -#: vips-7.17.1/libsrc/arithmetic/im_tantra.c:121 -#: vips-7.17.1/libsrc/arithmetic/im_tantra.c:207 msgid "not non-complex" msgstr "" #: libsrc/arithmetic/im_gadd.c:91 libsrc/arithmetic/im_gadd.c:107 -#: vips-7.17.1/libsrc/arithmetic/im_gadd.c:91 -#: vips-7.17.1/libsrc/arithmetic/im_gadd.c:107 msgid "Unable to accept image1" msgstr "" #: libsrc/arithmetic/im_minpos.c:80 libsrc/format/im_vips2csv.c:128 -#: vips-7.17.1/libsrc/format/im_vips2csv.c:128 -#: vips-7.17.1/libsrc/arithmetic/im_minpos.c:80 msgid "input must be uncoded" msgstr "" @@ -102,502 +60,391 @@ msgstr "" #: libsrc/conversion/im_rightshift_size.c:130 #: libsrc/conversion/im_vips2mask.c:86 libsrc/histograms_lut/im_project.c:258 #: libsrc/histograms_lut/im_histgr.c:310 -#: vips-7.17.1/libsrc/histograms_lut/im_project.c:258 -#: vips-7.17.1/libsrc/histograms_lut/im_histgr.c:310 -#: vips-7.17.1/libsrc/arithmetic/im_maxpos_avg.c:95 -#: vips-7.17.1/libsrc/arithmetic/im_maxpos_vec.c:132 -#: vips-7.17.1/libsrc/arithmetic/im_maxpos_vec.c:178 -#: vips-7.17.1/libsrc/arithmetic/im_point_bilinear.c:75 -#: vips-7.17.1/libsrc/boolean/boolean.c:128 -#: vips-7.17.1/libsrc/conversion/im_rightshift_size.c:130 -#: vips-7.17.1/libsrc/conversion/im_vips2mask.c:86 msgid "uncoded images only" msgstr "" #: libsrc/arithmetic/im_maxpos_avg.c:99 libsrc/arithmetic/im_maxpos_vec.c:122 #: libsrc/arithmetic/im_maxpos_vec.c:168 #: libsrc/arithmetic/im_point_bilinear.c:79 -#: vips-7.17.1/libsrc/arithmetic/im_maxpos_avg.c:99 -#: vips-7.17.1/libsrc/arithmetic/im_maxpos_vec.c:122 -#: vips-7.17.1/libsrc/arithmetic/im_maxpos_vec.c:168 -#: vips-7.17.1/libsrc/arithmetic/im_point_bilinear.c:79 msgid "scalar images only" msgstr "" #: libsrc/arithmetic/im_maxpos_avg.c:103 libsrc/arithmetic/im_maxpos_vec.c:127 #: libsrc/arithmetic/im_maxpos_vec.c:173 -#: vips-7.17.1/libsrc/arithmetic/im_maxpos_avg.c:103 -#: vips-7.17.1/libsrc/arithmetic/im_maxpos_vec.c:127 -#: vips-7.17.1/libsrc/arithmetic/im_maxpos_vec.c:173 msgid "single band images only" msgstr "" #: libsrc/arithmetic/im_maxpos_avg.c:107 libsrc/arithmetic/im_maxpos_vec.c:137 #: libsrc/arithmetic/im_maxpos_vec.c:183 -#: vips-7.17.1/libsrc/arithmetic/im_maxpos_avg.c:107 -#: vips-7.17.1/libsrc/arithmetic/im_maxpos_vec.c:137 -#: vips-7.17.1/libsrc/arithmetic/im_maxpos_vec.c:183 msgid "invalid argument" msgstr "" #: libsrc/arithmetic/im_subtract.c:183 libsrc/arithmetic/im_remainder.c:104 #: libsrc/arithmetic/im_multiply.c:199 libsrc/arithmetic/im_add.c:251 #: libsrc/arithmetic/im_divide.c:182 -#: vips-7.17.1/libsrc/arithmetic/im_subtract.c:183 -#: vips-7.17.1/libsrc/arithmetic/im_remainder.c:104 -#: vips-7.17.1/libsrc/arithmetic/im_multiply.c:199 -#: vips-7.17.1/libsrc/arithmetic/im_add.c:251 -#: vips-7.17.1/libsrc/arithmetic/im_divide.c:182 msgid "not same number of bands" msgstr "" #: libsrc/arithmetic/im_remainder.c:98 libsrc/arithmetic/im_multiply.c:193 -#: vips-7.17.1/libsrc/arithmetic/im_remainder.c:98 -#: vips-7.17.1/libsrc/arithmetic/im_multiply.c:193 msgid "not same size" msgstr "" #: libsrc/arithmetic/im_remainder.c:219 libsrc/arithmetic/im_lintra.c:329 #: libsrc/arithmetic/im_powtra.c:193 libsrc/arithmetic/im_expntra.c:193 -#: vips-7.17.1/libsrc/arithmetic/im_remainder.c:219 -#: vips-7.17.1/libsrc/arithmetic/im_lintra.c:329 -#: vips-7.17.1/libsrc/arithmetic/im_powtra.c:193 -#: vips-7.17.1/libsrc/arithmetic/im_expntra.c:193 #, c-format msgid "not 1 or %d elements in vector" msgstr "" #: libsrc/arithmetic/im_remainder.c:241 -#: vips-7.17.1/libsrc/arithmetic/im_remainder.c:241 msgid "division by zero" msgstr "" -#: libsrc/arithmetic/im_abs.c:257 vips-7.17.1/libsrc/arithmetic/im_abs.c:257 +#: libsrc/arithmetic/im_abs.c:257 msgid "unknown input type" msgstr "" #: libsrc/arithmetic/im_avg.c:187 libsrc/arithmetic/im_deviate.c:203 #: libsrc/arithmetic/im_stats.c:237 libsrc/arithmetic/im_measure.c:193 #: libsrc/arithmetic/im_costra.c:121 libsrc/arithmetic/im_costra.c:206 -#: vips-7.17.1/libsrc/arithmetic/im_avg.c:187 -#: vips-7.17.1/libsrc/arithmetic/im_deviate.c:203 -#: vips-7.17.1/libsrc/arithmetic/im_stats.c:237 -#: vips-7.17.1/libsrc/arithmetic/im_measure.c:193 -#: vips-7.17.1/libsrc/arithmetic/im_costra.c:121 -#: vips-7.17.1/libsrc/arithmetic/im_costra.c:206 msgid "bad input type" msgstr "" #: libsrc/arithmetic/im_bandmean.c:142 -#: vips-7.17.1/libsrc/arithmetic/im_bandmean.c:142 msgid "uncoded multiband only" msgstr "" -#: libsrc/arithmetic/im_add.c:191 vips-7.17.1/libsrc/arithmetic/im_add.c:191 +#: libsrc/arithmetic/im_add.c:191 #, c-format msgid "not one band or %d bands" msgstr "" -#: libsrc/arithmetic/im_add.c:195 vips-7.17.1/libsrc/arithmetic/im_add.c:195 +#: libsrc/arithmetic/im_add.c:195 msgid "bad bands" msgstr "" #: libsrc/arithmetic/im_measure.c:106 -#: vips-7.17.1/libsrc/arithmetic/im_measure.c:106 #, c-format msgid "patch %d is out of range" msgstr "" #: libsrc/arithmetic/im_measure.c:148 -#: vips-7.17.1/libsrc/arithmetic/im_measure.c:148 #, c-format msgid "patch %d, band %d: avg = %g, sdev = %g" msgstr "" #: libsrc/arithmetic/im_invert.c:123 -#: vips-7.17.1/libsrc/arithmetic/im_invert.c:123 msgid "not UCHAR" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:79 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:79 msgid "absolute value" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:98 libsrc/iofuncs/type.c:345 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:98 msgid "add two images" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:123 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:123 msgid "average value of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:171 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:171 msgid "multiply two complex images, normalising output" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:196 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:196 msgid "standard deviation of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:215 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:215 msgid "10^pel of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:234 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:234 msgid "e^pel of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:263 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:263 msgid "x^pel of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:292 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:292 msgid "[x,y,z]^pel of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:328 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:328 msgid "average of 4 images" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:347 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:347 msgid "divide two images" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:381 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:381 msgid "calculate a*in1 + b*in2 + c = outfile" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:400 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:400 msgid "photographic negative" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:431 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:431 msgid "calculate a*in + b = outfile" msgstr "" #: libsrc/arithmetic/arith_dispatch.c:457 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:457 msgid "vectors not equal length" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:468 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:468 msgid "calculate a*in + b -> out, a and b vectors" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:500 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:500 msgid "calculate max(white)*factor*(in/white), if clip == 1" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:519 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:519 msgid "log10 of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:538 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:538 msgid "ln of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:557 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:557 msgid "tan of image (angles in degrees)" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:576 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:576 msgid "atan of image (result in degrees)" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:595 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:595 msgid "cos of image (angles in degrees)" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:614 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:614 msgid "acos of image (result in degrees)" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:633 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:633 msgid "round to smallest integal value not less than" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:652 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:652 msgid "round to largest integal value not greater than" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:671 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:671 msgid "round to nearest integal value" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:690 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:690 msgid "sin of image (angles in degrees)" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:709 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:709 msgid "average image bands" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:728 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:728 msgid "unit vector in direction of value" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:747 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:747 msgid "asin of image (result in degrees)" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:772 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:772 msgid "maximum value of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:807 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:807 msgid "position of maximum value of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:973 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:973 msgid "measure averages of a grid of patches" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:998 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:998 msgid "minimum value of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1026 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:1026 msgid "position of minimum value of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1045 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:1045 msgid "remainder after integer division" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1074 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:1074 msgid "remainder after integer division by a constant" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1103 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:1103 msgid "remainder after integer division by a vector of constants" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1123 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:1123 msgid "multiply two images" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1144 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:1144 msgid "pel^x ofbuildimage" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1165 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:1165 msgid "pel^[x,y,z] of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1196 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:1196 msgid "many image statistics in one pass" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1215 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:1215 msgid "subtract two images" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1263 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:1263 msgid "pixelwise linear regression" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1282 -#: vips-7.17.1/libsrc/arithmetic/arith_dispatch.c:1282 msgid "phase of cross power spectrum of two complex images" msgstr "" #: libsrc/arithmetic/im_point_bilinear.c:83 #: libsrc/arithmetic/im_point_bilinear.c:97 -#: vips-7.17.1/libsrc/arithmetic/im_point_bilinear.c:83 -#: vips-7.17.1/libsrc/arithmetic/im_point_bilinear.c:97 msgid "coords outside image" msgstr "" #: libsrc/arithmetic/im_point_bilinear.c:87 -#: vips-7.17.1/libsrc/arithmetic/im_point_bilinear.c:87 msgid "invalid arguments" msgstr "" -#: libsrc/boolean/boolean.c:140 vips-7.17.1/libsrc/boolean/boolean.c:140 +#: libsrc/boolean/boolean.c:140 msgid "images differ in size" msgstr "" #: libsrc/boolean/boolean.c:458 libsrc/boolean/boolean.c:483 -#: libsrc/boolean/boolean.c:508 vips-7.17.1/libsrc/boolean/boolean.c:458 -#: vips-7.17.1/libsrc/boolean/boolean.c:483 -#: vips-7.17.1/libsrc/boolean/boolean.c:508 +#: libsrc/boolean/boolean.c:508 msgid "vec size does not match bands" msgstr "" -#: libsrc/colour/im_disp2XYZ.c:93 vips-7.17.1/libsrc/colour/im_disp2XYZ.c:93 +#: libsrc/colour/im_disp2XYZ.c:93 msgid "input not 3-band uncoded char" msgstr "" -#: libsrc/colour/im_XYZ2disp.c:143 vips-7.17.1/libsrc/colour/im_XYZ2disp.c:143 +#: libsrc/colour/im_rad2float.c:178 +msgid "not a 4-band uchar uncoded image" +msgstr "" + +#: libsrc/colour/im_XYZ2disp.c:143 msgid "3-band uncoded float only" msgstr "" #: libsrc/colour/im_Lab2XYZ.c:121 libsrc/colour/im_XYZ2Lab.c:163 -#: vips-7.17.1/libsrc/colour/im_Lab2XYZ.c:121 -#: vips-7.17.1/libsrc/colour/im_XYZ2Lab.c:163 msgid "not 3-band uncoded float" msgstr "" #: libsrc/colour/im_icc_transform.c:63 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:63 msgid "lcms library not linked to this VIPS" msgstr "" #: libsrc/colour/im_icc_transform.c:73 libsrc/colour/im_icc_transform.c:82 #: libsrc/colour/im_icc_transform.c:92 libsrc/colour/im_icc_transform.c:102 #: libsrc/colour/im_icc_transform.c:111 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:73 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:82 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:92 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:102 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:111 msgid "lmcs library not linked to this VIPS" msgstr "" #: libsrc/colour/im_icc_transform.c:233 libsrc/colour/im_icc_transform.c:243 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:233 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:243 #, c-format msgid "unable to open profile \"%s\"" msgstr "" #: libsrc/colour/im_icc_transform.c:254 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:254 msgid "unable to create profiles" msgstr "" #: libsrc/colour/im_icc_transform.c:273 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:273 msgid "unable to read profile" msgstr "" #: libsrc/colour/im_icc_transform.c:386 libsrc/colour/im_icc_transform.c:523 #: libsrc/conversion/im_gbandjoin.c:191 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:386 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:523 -#: vips-7.17.1/libsrc/conversion/im_gbandjoin.c:191 msgid "uncoded input only" msgstr "" #: libsrc/colour/im_icc_transform.c:414 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:414 msgid "CMYK input profile needs a 4 band input image" msgstr "" #: libsrc/colour/im_icc_transform.c:424 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:424 msgid "RGB input profile needs a 3 band input image" msgstr "" #: libsrc/colour/im_icc_transform.c:432 libsrc/colour/im_icc_transform.c:565 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:432 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:565 #, fuzzy, c-format msgid "unimplemented input colour space 0x%x" msgstr "unsupported colourspace %d" #: libsrc/colour/im_icc_transform.c:460 libsrc/colour/im_icc_transform.c:723 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:460 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:723 #, fuzzy, c-format msgid "unimplemented output colour space 0x%x" msgstr "unsupported colourspace %d" #: libsrc/colour/im_icc_transform.c:476 libsrc/colour/im_icc_transform.c:581 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:476 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:581 msgid "uchar or ushort input only" msgstr "" #: libsrc/colour/im_icc_transform.c:529 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:529 #, c-format msgid "" "intent %d (%s) not supported by profile; falling back to default intent " @@ -605,193 +452,146 @@ msgid "" msgstr "" #: libsrc/colour/im_icc_transform.c:547 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:547 msgid "CMYK profile needs a 4 band input image" msgstr "" #: libsrc/colour/im_icc_transform.c:557 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:557 msgid "RGB profile needs a 3 band input image" msgstr "" #: libsrc/colour/im_icc_transform.c:620 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:620 msgid "no embedded profile" msgstr "" #: libsrc/colour/im_icc_transform.c:676 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:676 msgid "3-band uncoded Lab float only" msgstr "" #: libsrc/colour/im_icc_transform.c:681 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:681 #, fuzzy msgid "unsupported bit depth" msgstr "unsupported colourspace %d" #: libsrc/colour/im_icc_transform.c:766 -#: vips-7.17.1/libsrc/colour/im_icc_transform.c:766 msgid "unable to get media white point" msgstr "" #: libsrc/conversion/im_rot90.c:142 libsrc/conversion/im_rot180.c:140 #: libsrc/conversion/im_rot270.c:142 libsrc/format/im_vips2ppm.c:277 #: libsrc/inplace/im_flood.c:330 libsrc/inplace/im_flood.c:377 -#: vips-7.17.1/libsrc/format/im_vips2ppm.c:277 -#: vips-7.17.1/libsrc/inplace/im_flood.c:330 -#: vips-7.17.1/libsrc/inplace/im_flood.c:377 -#: vips-7.17.1/libsrc/conversion/im_rot90.c:142 -#: vips-7.17.1/libsrc/conversion/im_rot180.c:140 -#: vips-7.17.1/libsrc/conversion/im_rot270.c:142 msgid "uncoded or IM_CODING_LABQ only" msgstr "" #: libsrc/conversion/im_rightshift_size.c:114 libsrc/conversion/im_msb.c:213 #: libsrc/convolution/rw_mask.c:141 libsrc/convolution/rw_mask.c:198 #: libsrc/convolution/rw_mask.c:434 -#: vips-7.17.1/libsrc/convolution/rw_mask.c:141 -#: vips-7.17.1/libsrc/convolution/rw_mask.c:198 -#: vips-7.17.1/libsrc/convolution/rw_mask.c:434 -#: vips-7.17.1/libsrc/conversion/im_rightshift_size.c:114 -#: vips-7.17.1/libsrc/conversion/im_msb.c:213 msgid "bad arguments" msgstr "" #: libsrc/conversion/im_rightshift_size.c:118 -#: vips-7.17.1/libsrc/conversion/im_rightshift_size.c:118 msgid "shift by zero: falling back to im_copy" msgstr "" #: libsrc/conversion/im_rightshift_size.c:122 -#: vips-7.17.1/libsrc/conversion/im_rightshift_size.c:122 msgid "would result in zero size output image" msgstr "" #: libsrc/conversion/im_rightshift_size.c:126 -#: vips-7.17.1/libsrc/conversion/im_rightshift_size.c:126 msgid "integer type images only" msgstr "" #: libsrc/conversion/im_rightshift_size.c:135 -#: vips-7.17.1/libsrc/conversion/im_rightshift_size.c:135 msgid "unsigned input means that output must be unsigned int, short or char" msgstr "" #: libsrc/conversion/im_rightshift_size.c:141 -#: vips-7.17.1/libsrc/conversion/im_rightshift_size.c:141 msgid "signed input means that output must be signed int, short or char" msgstr "" #: libsrc/conversion/im_insert.c:234 libsrc/conversion/im_insert.c:324 #: libsrc/inplace/im_insertplace.c:84 -#: vips-7.17.1/libsrc/inplace/im_insertplace.c:84 -#: vips-7.17.1/libsrc/conversion/im_insert.c:234 -#: vips-7.17.1/libsrc/conversion/im_insert.c:324 msgid "inputs differ in format" msgstr "" #: libsrc/conversion/im_insert.c:239 libsrc/conversion/im_insert.c:329 #: libsrc/inplace/im_insertplace.c:89 -#: vips-7.17.1/libsrc/inplace/im_insertplace.c:89 -#: vips-7.17.1/libsrc/conversion/im_insert.c:239 -#: vips-7.17.1/libsrc/conversion/im_insert.c:329 msgid "input should be uncoded or IM_CODING_LABQ" msgstr "" #: libsrc/conversion/im_insert.c:243 libsrc/conversion/im_insert.c:333 -#: vips-7.17.1/libsrc/conversion/im_insert.c:243 -#: vips-7.17.1/libsrc/conversion/im_insert.c:333 msgid "xy out of range" msgstr "" #: libsrc/conversion/im_falsecolour.c:340 -#: vips-7.17.1/libsrc/conversion/im_falsecolour.c:340 msgid "input image not one band uchar uncoded" msgstr "" -#: libsrc/conversion/im_text.c:146 vips-7.17.1/libsrc/conversion/im_text.c:146 +#: libsrc/conversion/im_text.c:146 msgid "no text to render" msgstr "" -#: libsrc/conversion/im_text.c:202 vips-7.17.1/libsrc/conversion/im_text.c:202 +#: libsrc/conversion/im_text.c:202 msgid "invalid markup in text" msgstr "" -#: libsrc/conversion/im_text.c:235 vips-7.17.1/libsrc/conversion/im_text.c:235 +#: libsrc/conversion/im_text.c:235 msgid "pangoft2 support disabled" msgstr "" #: libsrc/conversion/im_msb.c:143 libsrc/conversion/im_msb.c:230 -#: vips-7.17.1/libsrc/conversion/im_msb.c:143 -#: vips-7.17.1/libsrc/conversion/im_msb.c:230 msgid "char, short or int only" msgstr "" #: libsrc/conversion/im_msb.c:179 libsrc/conversion/im_msb.c:278 #: libsrc/conversion/im_extract.c:180 -#: vips-7.17.1/libsrc/conversion/im_msb.c:179 -#: vips-7.17.1/libsrc/conversion/im_msb.c:278 -#: vips-7.17.1/libsrc/conversion/im_extract.c:180 msgid "unknown coding" msgstr "" #: libsrc/conversion/im_msb.c:237 libsrc/conversion/im_msb.c:264 -#: vips-7.17.1/libsrc/conversion/im_msb.c:237 -#: vips-7.17.1/libsrc/conversion/im_msb.c:264 msgid "image does not have that many bands" msgstr "" #: libsrc/conversion/im_bernd.c:69 libsrc/format/im_vips2jpeg.c:886 -#: vips-7.17.1/libsrc/format/im_vips2jpeg.c:886 -#: vips-7.17.1/libsrc/conversion/im_bernd.c:69 msgid "error writing output" msgstr "" #: libsrc/conversion/im_copy.c:134 libsrc/conversion/im_copy.c:281 #: libsrc/conversion/im_clip.c:441 libsrc/conversion/im_fliphor.c:128 -#: vips-7.17.1/libsrc/conversion/im_copy.c:134 -#: vips-7.17.1/libsrc/conversion/im_copy.c:281 -#: vips-7.17.1/libsrc/conversion/im_clip.c:441 -#: vips-7.17.1/libsrc/conversion/im_fliphor.c:128 msgid "in must be uncoded" msgstr "" -#: libsrc/conversion/im_copy.c:138 vips-7.17.1/libsrc/conversion/im_copy.c:138 +#: libsrc/conversion/im_copy.c:138 msgid "Coding must be NONE or LABQ" msgstr "" -#: libsrc/conversion/im_copy.c:142 vips-7.17.1/libsrc/conversion/im_copy.c:142 +#: libsrc/conversion/im_copy.c:142 #, c-format msgid "BandFmt must be in range [0,%d]" msgstr "" -#: libsrc/conversion/im_copy.c:165 vips-7.17.1/libsrc/conversion/im_copy.c:165 +#: libsrc/conversion/im_copy.c:165 msgid "sizeof( pixel ) has changed" msgstr "" -#: libsrc/conversion/im_copy.c:318 vips-7.17.1/libsrc/conversion/im_copy.c:318 +#: libsrc/conversion/im_copy.c:318 #, fuzzy msgid "unsupported image type" msgstr "unsupported colourspace %d" -#: libsrc/conversion/im_copy.c:345 vips-7.17.1/libsrc/conversion/im_copy.c:345 +#: libsrc/conversion/im_copy.c:345 #, c-format msgid "bad architecture: %d" msgstr "" #: libsrc/conversion/im_extract.c:166 -#: vips-7.17.1/libsrc/conversion/im_extract.c:166 msgid "band selection out of range" msgstr "" #: libsrc/conversion/im_extract.c:174 -#: vips-7.17.1/libsrc/conversion/im_extract.c:174 msgid "bad extract area" msgstr "" #: libsrc/conversion/im_extract.c:188 -#: vips-7.17.1/libsrc/conversion/im_extract.c:188 msgid "can only extract areas from LABQ" msgstr "" @@ -799,37 +599,29 @@ msgstr "" #: libsrc/format/im_vips2tiff.c:1587 libsrc/format/im_file2vips.c:758 #: libsrc/iofuncs/im_open_vips.c:1077 libsrc/mosaicing/im_tbmerge.c:633 #: libsrc/mosaicing/im_lrmerge.c:811 libsrc/resample/im_affine.c:440 -#: vips-7.17.1/libsrc/mosaicing/im_tbmerge.c:633 -#: vips-7.17.1/libsrc/mosaicing/im_lrmerge.c:811 -#: vips-7.17.1/libsrc/convolution/im_shrink.c:318 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1587 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:1077 -#: vips-7.17.1/libsrc/conversion/im_zoom.c:328 -#: vips-7.17.1/libsrc/resample/im_affine.c:440 msgid "unknown coding type" msgstr "" -#: libsrc/conversion/im_zoom.c:332 vips-7.17.1/libsrc/conversion/im_zoom.c:332 +#: libsrc/conversion/im_zoom.c:332 msgid "zoom factors should be >= 0" msgstr "" #. Make sure we won't get integer overflow. #. -#: libsrc/conversion/im_zoom.c:339 vips-7.17.1/libsrc/conversion/im_zoom.c:339 +#: libsrc/conversion/im_zoom.c:339 msgid "zoom factors too large" msgstr "" -#: libsrc/conversion/im_clip.c:124 vips-7.17.1/libsrc/conversion/im_clip.c:124 +#: libsrc/conversion/im_clip.c:124 #, c-format msgid "%d underflows and %d overflows detected" msgstr "" -#: libsrc/conversion/im_clip.c:445 vips-7.17.1/libsrc/conversion/im_clip.c:445 +#: libsrc/conversion/im_clip.c:445 msgid "ofmt out of range" msgstr "" #: libsrc/conversion/im_vips2mask.c:103 -#: vips-7.17.1/libsrc/conversion/im_vips2mask.c:103 msgid "one band, nx1, or 1xn images only" msgstr "" @@ -837,226 +629,168 @@ msgstr "" #: libsrc/convolution/im_contrast_surface.c:153 #: libsrc/format/im_tile_cache.c:373 libsrc/iofuncs/im_render.c:1188 #: libsrc/iofuncs/im_binfile.c:93 -#: vips-7.17.1/libsrc/convolution/im_contrast_surface.c:153 -#: vips-7.17.1/libsrc/format/im_tile_cache.c:373 -#: vips-7.17.1/libsrc/iofuncs/im_render.c:1188 -#: vips-7.17.1/libsrc/iofuncs/im_binfile.c:93 -#: vips-7.17.1/libsrc/conversion/im_grid.c:151 msgid "bad parameters" msgstr "" -#: libsrc/conversion/im_grid.c:156 vips-7.17.1/libsrc/conversion/im_grid.c:156 +#: libsrc/conversion/im_grid.c:156 msgid "bad grid geometry" msgstr "" #: libsrc/conversion/im_gbandjoin.c:175 -#: vips-7.17.1/libsrc/conversion/im_gbandjoin.c:175 msgid "zero input images!" msgstr "" #: libsrc/conversion/im_gbandjoin.c:197 -#: vips-7.17.1/libsrc/conversion/im_gbandjoin.c:197 msgid "input images differ in format" msgstr "" #: libsrc/conversion/im_gbandjoin.c:203 -#: vips-7.17.1/libsrc/conversion/im_gbandjoin.c:203 msgid "input images differ in size" msgstr "" #: libsrc/conversion/im_subsample.c:199 -#: vips-7.17.1/libsrc/conversion/im_subsample.c:199 msgid "factors should both be >= 1" msgstr "" #: libsrc/conversion/im_subsample.c:217 libsrc/convolution/im_shrink.c:267 -#: vips-7.17.1/libsrc/convolution/im_shrink.c:267 -#: vips-7.17.1/libsrc/conversion/im_subsample.c:217 msgid "image has shrunk to nothing" msgstr "" #: libsrc/convolution/im_contrast_surface.c:147 -#: vips-7.17.1/libsrc/convolution/im_contrast_surface.c:147 msgid "one band uncoded uchar only" msgstr "" #: libsrc/convolution/im_contrast_surface.c:160 -#: vips-7.17.1/libsrc/convolution/im_contrast_surface.c:160 msgid "parameters would result in zero size output image" msgstr "" #: libsrc/convolution/im_zerox.c:138 -#: vips-7.17.1/libsrc/convolution/im_zerox.c:138 msgid "flag not -1 ot 1" msgstr "" #: libsrc/convolution/im_zerox.c:144 libsrc/convolution/im_convsepf.c:290 #: libsrc/convolution/im_convsep.c:383 libsrc/convolution/im_convf.c:289 -#: vips-7.17.1/libsrc/convolution/im_zerox.c:144 -#: vips-7.17.1/libsrc/convolution/im_convsepf.c:290 -#: vips-7.17.1/libsrc/convolution/im_convsep.c:383 -#: vips-7.17.1/libsrc/convolution/im_convf.c:289 msgid "non-complex uncoded only" msgstr "" #: libsrc/convolution/im_zerox.c:148 -#: vips-7.17.1/libsrc/convolution/im_zerox.c:148 msgid "image too narrow" msgstr "" #: libsrc/convolution/rw_mask.c:254 -#: vips-7.17.1/libsrc/convolution/rw_mask.c:254 #, c-format msgid "Unable to open \"%s\" for input" msgstr "" #: libsrc/convolution/rw_mask.c:268 -#: vips-7.17.1/libsrc/convolution/rw_mask.c:268 msgid "unexpected EOF" msgstr "" #: libsrc/convolution/rw_mask.c:307 -#: vips-7.17.1/libsrc/convolution/rw_mask.c:307 msgid "error reading matrix header" msgstr "" #: libsrc/convolution/rw_mask.c:312 -#: vips-7.17.1/libsrc/convolution/rw_mask.c:312 msgid "scale should be non-zero" msgstr "" #: libsrc/convolution/rw_mask.c:392 -#: vips-7.17.1/libsrc/convolution/rw_mask.c:392 msgid "scale and offset should be int" msgstr "" #: libsrc/convolution/rw_mask.c:400 -#: vips-7.17.1/libsrc/convolution/rw_mask.c:400 #, c-format msgid "cofficient at position (%d, %d) is not int" msgstr "" #: libsrc/convolution/rw_mask.c:542 libsrc/format/im_vips2tiff.c:265 -#: libsrc/format/im_vips2ppm.c:93 vips-7.17.1/libsrc/convolution/rw_mask.c:542 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:265 -#: vips-7.17.1/libsrc/format/im_vips2ppm.c:93 +#: libsrc/format/im_vips2ppm.c:93 #, c-format msgid "unable to open \"%s\" for output" msgstr "" #: libsrc/convolution/rw_mask.c:559 -#: vips-7.17.1/libsrc/convolution/rw_mask.c:559 msgid "write error, disc full?" msgstr "" #: libsrc/convolution/rw_mask.c:617 libsrc/convolution/rw_mask.c:668 -#: vips-7.17.1/libsrc/convolution/rw_mask.c:617 -#: vips-7.17.1/libsrc/convolution/rw_mask.c:668 msgid "filename not set" msgstr "" #: libsrc/convolution/im_sharpen.c:249 -#: vips-7.17.1/libsrc/convolution/im_sharpen.c:249 msgid "input not 3-band short" msgstr "" #: libsrc/convolution/im_sharpen.c:260 -#: vips-7.17.1/libsrc/convolution/im_sharpen.c:260 msgid "parameters out of range" msgstr "" #: libsrc/convolution/im_spcor.c:257 -#: vips-7.17.1/libsrc/convolution/im_spcor.c:257 msgid "ref not smaller than in" msgstr "" #: libsrc/convolution/im_spcor.c:269 -#: vips-7.17.1/libsrc/convolution/im_spcor.c:269 msgid "input not uncoded 1 band" msgstr "" #: libsrc/convolution/im_spcor.c:277 -#: vips-7.17.1/libsrc/convolution/im_spcor.c:277 msgid "input not char/uchar/short/ushort" msgstr "" #: libsrc/convolution/im_shrink.c:231 -#: vips-7.17.1/libsrc/convolution/im_shrink.c:231 #, fuzzy msgid "unsupported input format" msgstr "unsupported colourspace %d" #: libsrc/convolution/im_shrink.c:246 -#: vips-7.17.1/libsrc/convolution/im_shrink.c:246 msgid "non-complex input only" msgstr "" #: libsrc/convolution/im_shrink.c:251 -#: vips-7.17.1/libsrc/convolution/im_shrink.c:251 msgid "shrink factors should both be >1" msgstr "" #: libsrc/convolution/im_convsepf.c:296 -#: vips-7.17.1/libsrc/convolution/im_convsepf.c:296 msgid "bad mask parameters" msgstr "" #: libsrc/convolution/im_convsepf.c:301 libsrc/convolution/im_convsep.c:394 -#: vips-7.17.1/libsrc/convolution/im_convsepf.c:301 -#: vips-7.17.1/libsrc/convolution/im_convsep.c:394 msgid "expect 1xN or Nx1 input mask" msgstr "" #: libsrc/convolution/im_convsepf.c:322 libsrc/convolution/im_convsep.c:410 #: libsrc/convolution/im_convf.c:315 libsrc/morphology/im_dilate.c:280 #: libsrc/morphology/im_erode.c:276 -#: vips-7.17.1/libsrc/convolution/im_convsepf.c:322 -#: vips-7.17.1/libsrc/convolution/im_convsep.c:410 -#: vips-7.17.1/libsrc/convolution/im_convf.c:315 -#: vips-7.17.1/libsrc/morphology/im_dilate.c:280 -#: vips-7.17.1/libsrc/morphology/im_erode.c:276 msgid "image too small for mask" msgstr "" #: libsrc/convolution/im_embed.c:358 libsrc/convolution/im_embed.c:447 #: libsrc/iofuncs/im_generate.c:382 libsrc/iofuncs/im_setupout.c:98 -#: vips-7.17.1/libsrc/convolution/im_embed.c:358 -#: vips-7.17.1/libsrc/convolution/im_embed.c:447 -#: vips-7.17.1/libsrc/iofuncs/im_generate.c:382 -#: vips-7.17.1/libsrc/iofuncs/im_setupout.c:98 msgid "bad dimensions" msgstr "" #: libsrc/convolution/im_embed.c:439 -#: vips-7.17.1/libsrc/convolution/im_embed.c:439 msgid "unknown image coding type" msgstr "" #: libsrc/convolution/im_embed.c:443 -#: vips-7.17.1/libsrc/convolution/im_embed.c:443 msgid "unknown flag" msgstr "" #: libsrc/convolution/im_stretch3.c:272 -#: vips-7.17.1/libsrc/convolution/im_stretch3.c:272 msgid "not uncoded unsigned short" msgstr "" #: libsrc/convolution/im_stretch3.c:277 -#: vips-7.17.1/libsrc/convolution/im_stretch3.c:277 msgid "displacements out of range [0,1)" msgstr "" #: libsrc/convolution/im_convsep.c:98 libsrc/convolution/im_conv.c:152 -#: vips-7.17.1/libsrc/convolution/im_convsep.c:98 -#: vips-7.17.1/libsrc/convolution/im_conv.c:152 #, c-format msgid "%d overflows and %d underflows detected" msgstr "" #: libsrc/convolution/im_convsep.c:389 libsrc/convolution/im_convf.c:295 -#: vips-7.17.1/libsrc/convolution/im_convsep.c:389 -#: vips-7.17.1/libsrc/convolution/im_convf.c:295 msgid "nonsense mask parameters" msgstr "" @@ -1067,193 +801,157 @@ msgstr "" #: libsrc/format/im_vips2png.c:302 libsrc/format/im_vips2jpeg.c:693 #: libsrc/mosaicing/global_balance.c:1203 #: libsrc/mosaicing/global_balance.c:1537 -#: vips-7.17.1/libsrc/mosaicing/global_balance.c:1203 -#: vips-7.17.1/libsrc/mosaicing/global_balance.c:1537 -#: vips-7.17.1/libsrc/format/matlab.c:111 -#: vips-7.17.1/libsrc/format/im_vips2csv.c:133 -#: vips-7.17.1/libsrc/format/im_csv2vips.c:286 -#: vips-7.17.1/libsrc/format/im_ppm2vips.c:404 -#: vips-7.17.1/libsrc/format/im_ppm2vips.c:434 -#: vips-7.17.1/libsrc/format/im_ppm2vips.c:464 -#: vips-7.17.1/libsrc/format/im_jpeg2vips.c:662 -#: vips-7.17.1/libsrc/format/im_png2vips.c:144 -#: vips-7.17.1/libsrc/format/im_vips2png.c:302 -#: vips-7.17.1/libsrc/format/im_vips2jpeg.c:693 #, c-format msgid "unable to open \"%s\"" msgstr "" -#: libsrc/format/matlab.c:119 vips-7.17.1/libsrc/format/matlab.c:119 +#: libsrc/format/matlab.c:119 #, c-format msgid "no matrix variables in \"%s\"" msgstr "" -#: libsrc/format/matlab.c:177 vips-7.17.1/libsrc/format/matlab.c:177 +#: libsrc/format/matlab.c:177 #, fuzzy, c-format msgid "unsupported bands %d\n" msgstr "unsupported colourspace %d" -#: libsrc/format/matlab.c:191 vips-7.17.1/libsrc/format/matlab.c:191 +#: libsrc/format/matlab.c:191 #, fuzzy, c-format msgid "unsupported class type %d\n" msgstr "unsupported colourspace %d" -#: libsrc/format/matlab.c:231 vips-7.17.1/libsrc/format/matlab.c:231 +#: libsrc/format/matlab.c:231 msgid "Mat_VarReadDataAll failed" msgstr "" -#: libsrc/format/matlab.c:293 vips-7.17.1/libsrc/format/matlab.c:293 +#: libsrc/format/matlab.c:293 msgid "Matlab" msgstr "" -#: libsrc/format/im_magick2vips.c:67 -#: vips-7.17.1/libsrc/format/im_magick2vips.c:67 +#: libsrc/format/im_magick2vips.c:69 msgid "libMagick support disabled" msgstr "" -#: libsrc/format/im_magick2vips.c:202 libsrc/format/im_magick2vips.c:299 -#: vips-7.17.1/libsrc/format/im_magick2vips.c:202 -#: vips-7.17.1/libsrc/format/im_magick2vips.c:299 +#: libsrc/format/im_magick2vips.c:204 libsrc/format/im_magick2vips.c:289 #, c-format msgid "unsupported colorspace %d" msgstr "unsupported colourspace %d" -#: libsrc/format/im_magick2vips.c:267 -#: vips-7.17.1/libsrc/format/im_magick2vips.c:267 +#: libsrc/format/im_magick2vips.c:255 #, fuzzy, c-format msgid "unsupported bit depth %d" msgstr "unsupported colourspace %d" -#: libsrc/format/im_magick2vips.c:578 -#: vips-7.17.1/libsrc/format/im_magick2vips.c:578 +#: libsrc/format/im_magick2vips.c:568 msgid "unable to read pixels" msgstr "" -#: libsrc/format/im_magick2vips.c:600 -#: vips-7.17.1/libsrc/format/im_magick2vips.c:600 +#: libsrc/format/im_magick2vips.c:590 #, c-format msgid "" "unable to read file \"%s\"\n" "libMagick error: %s %s" msgstr "" -#: libsrc/format/im_magick2vips.c:625 -#: vips-7.17.1/libsrc/format/im_magick2vips.c:625 +#: libsrc/format/im_magick2vips.c:615 #, c-format msgid "" "unable to ping file \"%s\"\n" "libMagick error: %s %s" msgstr "" -#: libsrc/format/im_magick2vips.c:636 -#: vips-7.17.1/libsrc/format/im_magick2vips.c:636 +#: libsrc/format/im_magick2vips.c:626 msgid "bad image size" msgstr "" -#: libsrc/format/im_magick2vips.c:672 -#: vips-7.17.1/libsrc/format/im_magick2vips.c:672 +#: libsrc/format/im_magick2vips.c:662 msgid "libMagick-supported" msgstr "" -#: libsrc/format/im_csv2vips.c:122 vips-7.17.1/libsrc/format/im_csv2vips.c:122 +#: libsrc/format/im_csv2vips.c:122 #, c-format msgid "error parsing number, line %d, column %d" msgstr "" -#: libsrc/format/im_csv2vips.c:175 vips-7.17.1/libsrc/format/im_csv2vips.c:175 +#: libsrc/format/im_csv2vips.c:175 msgid "end of file while skipping start" msgstr "" #: libsrc/format/im_csv2vips.c:184 libsrc/iofuncs/util.c:1088 -#: libsrc/iofuncs/util.c:1094 vips-7.17.1/libsrc/format/im_csv2vips.c:184 -#: vips-7.17.1/libsrc/iofuncs/util.c:1088 -#: vips-7.17.1/libsrc/iofuncs/util.c:1094 +#: libsrc/iofuncs/util.c:1094 msgid "unable to seek" msgstr "" -#: libsrc/format/im_csv2vips.c:193 vips-7.17.1/libsrc/format/im_csv2vips.c:193 +#: libsrc/format/im_csv2vips.c:193 msgid "empty line" msgstr "" -#: libsrc/format/im_csv2vips.c:227 vips-7.17.1/libsrc/format/im_csv2vips.c:227 +#: libsrc/format/im_csv2vips.c:227 msgid "unexpected end of file" msgstr "" -#: libsrc/format/im_csv2vips.c:232 vips-7.17.1/libsrc/format/im_csv2vips.c:232 +#: libsrc/format/im_csv2vips.c:232 msgid "unexpected end of line" msgstr "" -#: libsrc/format/im_csv2vips.c:333 vips-7.17.1/libsrc/format/im_csv2vips.c:333 +#: libsrc/format/im_csv2vips.c:333 msgid "CSV" msgstr "" -#: libsrc/format/radiance.c:873 vips-7.17.1/libsrc/format/radiance.c:873 +#: libsrc/format/radiance.c:807 msgid "error reading radiance header" msgstr "" -#: libsrc/format/radiance.c:955 libsrc/format/im_tiff2vips.c:1322 -#: vips-7.17.1/libsrc/format/radiance.c:955 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:1322 +#: libsrc/format/radiance.c:889 libsrc/format/im_tiff2vips.c:1322 msgid "read error" msgstr "" -#: libsrc/format/radiance.c:1000 vips-7.17.1/libsrc/format/radiance.c:1000 +#: libsrc/format/radiance.c:934 msgid "Radiance" msgstr "" -#: libsrc/format/format.c:181 vips-7.17.1/libsrc/format/format.c:181 +#: libsrc/format/format.c:181 msgid "VIPS" msgstr "" #: libsrc/format/format.c:269 libsrc/mosaicing/im_remosaic.c:80 -#: vips-7.17.1/libsrc/mosaicing/im_remosaic.c:80 -#: vips-7.17.1/libsrc/format/format.c:269 #, c-format msgid "file \"%s\" not found" msgstr "" -#: libsrc/format/format.c:277 vips-7.17.1/libsrc/format/format.c:277 +#: libsrc/format/format.c:277 #, c-format msgid "file \"%s\" not a known format" msgstr "" -#: libsrc/format/format.c:308 vips-7.17.1/libsrc/format/format.c:308 +#: libsrc/format/format.c:308 #, fuzzy, c-format msgid "\"%s\" is not a supported image format." msgstr "unsupported colourspace %d" #: libsrc/format/im_analyze2vips.c:369 -#: vips-7.17.1/libsrc/format/im_analyze2vips.c:369 #, c-format msgid "%d-dimensional images not supported" msgstr "" #: libsrc/format/im_analyze2vips.c:422 -#: vips-7.17.1/libsrc/format/im_analyze2vips.c:422 #, c-format msgid "datatype %d not supported" msgstr "" #: libsrc/format/im_analyze2vips.c:523 libsrc/format/im_analyze2vips.c:563 -#: vips-7.17.1/libsrc/format/im_analyze2vips.c:523 -#: vips-7.17.1/libsrc/format/im_analyze2vips.c:563 msgid "header file size incorrect" msgstr "" #: libsrc/format/im_analyze2vips.c:606 -#: vips-7.17.1/libsrc/format/im_analyze2vips.c:606 msgid "Analyze 6.0" msgstr "" #: libsrc/format/im_vips2tiff.c:153 libsrc/format/im_tiff2vips.c:153 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:153 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:153 msgid "TIFF support disabled" msgstr "" #: libsrc/format/im_vips2tiff.c:281 libsrc/format/im_tiff2vips.c:1406 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:281 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:1406 #, c-format msgid "unable to open \"%s\" for input" msgstr "" @@ -1261,33 +959,26 @@ msgstr "" #. Out of space! #. #: libsrc/format/im_vips2tiff.c:692 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:692 msgid "layer buffer exhausted -- try making TIFF output tiles smaller" msgstr "" #: libsrc/format/im_vips2tiff.c:923 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:923 msgid "TIFF write tile failed" msgstr "" #: libsrc/format/im_vips2tiff.c:999 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:999 msgid "internal error #9876345" msgstr "" #: libsrc/format/im_vips2tiff.c:1248 libsrc/format/im_vips2tiff.c:1259 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1248 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1259 msgid "bad predictor parameter" msgstr "" #: libsrc/format/im_vips2tiff.c:1270 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1270 msgid "bad JPEG quality parameter" msgstr "" #: libsrc/format/im_vips2tiff.c:1276 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1276 #, c-format msgid "" "unknown compression mode \"%s\"\n" @@ -1296,23 +987,19 @@ msgid "" msgstr "" #: libsrc/format/im_vips2tiff.c:1291 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1291 msgid "bad tile sizes" msgstr "" #: libsrc/format/im_vips2tiff.c:1298 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1298 #, c-format msgid "bad tile size %dx%d" msgstr "" #: libsrc/format/im_vips2tiff.c:1306 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1306 msgid "tile size not a multiple of 16" msgstr "" #: libsrc/format/im_vips2tiff.c:1315 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1315 #, c-format msgid "" "unknown layout mode \"%s\"\n" @@ -1320,7 +1007,6 @@ msgid "" msgstr "" #: libsrc/format/im_vips2tiff.c:1327 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1327 #, c-format msgid "" "unknown multi-res mode \"%s\"\n" @@ -1328,7 +1014,6 @@ msgid "" msgstr "" #: libsrc/format/im_vips2tiff.c:1339 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1339 #, c-format msgid "" "unknown format \"%s\"\n" @@ -1336,7 +1021,6 @@ msgid "" msgstr "" #: libsrc/format/im_vips2tiff.c:1361 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1361 #, c-format msgid "" "unknown resolution unit \"%s\"\n" @@ -1344,228 +1028,186 @@ msgid "" msgstr "" #: libsrc/format/im_vips2tiff.c:1371 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1371 msgid "bad resolution values" msgstr "" #: libsrc/format/im_vips2tiff.c:1385 libsrc/format/im_vips2jpeg.c:664 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1385 -#: vips-7.17.1/libsrc/format/im_vips2jpeg.c:664 #, c-format msgid "unknown extra options \"%s\"" msgstr "" #: libsrc/format/im_vips2tiff.c:1389 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1389 msgid "can't have strip pyramid -- enabling tiling" msgstr "" #: libsrc/format/im_vips2tiff.c:1399 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1399 msgid "can only pyramid LABQ and non-complex images" msgstr "" #: libsrc/format/im_vips2tiff.c:1415 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1415 msgid "can't have 1-bit JPEG -- disabling JPEG" msgstr "" #: libsrc/format/im_vips2tiff.c:1596 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1596 msgid "unsigned 8-bit int, 16-bit int, and 32-bit float only" msgstr "" #: libsrc/format/im_vips2tiff.c:1603 -#: vips-7.17.1/libsrc/format/im_vips2tiff.c:1603 msgid "1 to 5 bands only" msgstr "" -#: libsrc/format/im_ppm2vips.c:114 vips-7.17.1/libsrc/format/im_ppm2vips.c:114 +#: libsrc/format/im_ppm2vips.c:114 msgid "bad unsigned int" msgstr "" -#: libsrc/format/im_ppm2vips.c:164 vips-7.17.1/libsrc/format/im_ppm2vips.c:164 +#: libsrc/format/im_ppm2vips.c:164 msgid "bad magic number" msgstr "" -#: libsrc/format/im_ppm2vips.c:194 vips-7.17.1/libsrc/format/im_ppm2vips.c:194 +#: libsrc/format/im_ppm2vips.c:194 msgid "not whitespace before start of binary data" msgstr "" -#: libsrc/format/im_ppm2vips.c:518 vips-7.17.1/libsrc/format/im_ppm2vips.c:518 +#: libsrc/format/im_ppm2vips.c:518 msgid "PPM/PBM/PNM" msgstr "" #: libsrc/format/im_jpeg2vips.c:70 libsrc/format/im_vips2jpeg.c:73 #: libsrc/format/im_vips2jpeg.c:81 libsrc/format/im_vips2jpeg.c:89 -#: vips-7.17.1/libsrc/format/im_jpeg2vips.c:70 -#: vips-7.17.1/libsrc/format/im_vips2jpeg.c:73 -#: vips-7.17.1/libsrc/format/im_vips2jpeg.c:81 -#: vips-7.17.1/libsrc/format/im_vips2jpeg.c:89 msgid "JPEG support disabled" msgstr "" #: libsrc/format/im_jpeg2vips.c:136 libsrc/format/im_vips2jpeg.c:155 -#: vips-7.17.1/libsrc/format/im_jpeg2vips.c:136 -#: vips-7.17.1/libsrc/format/im_vips2jpeg.c:155 #, c-format msgid "%s" msgstr "" #: libsrc/format/im_jpeg2vips.c:339 -#: vips-7.17.1/libsrc/format/im_jpeg2vips.c:339 msgid "error reading resolution" msgstr "" #: libsrc/format/im_jpeg2vips.c:359 -#: vips-7.17.1/libsrc/format/im_jpeg2vips.c:359 msgid "bad resolution unit" msgstr "" #: libsrc/format/im_jpeg2vips.c:589 -#: vips-7.17.1/libsrc/format/im_jpeg2vips.c:589 msgid "truncated JPEG file" msgstr "" #: libsrc/format/im_jpeg2vips.c:633 -#: vips-7.17.1/libsrc/format/im_jpeg2vips.c:633 #, c-format msgid "bad shrink factor %d" msgstr "" #: libsrc/format/im_jpeg2vips.c:687 -#: vips-7.17.1/libsrc/format/im_jpeg2vips.c:687 #, c-format msgid "read gave %ld warnings" msgstr "" #: libsrc/format/im_jpeg2vips.c:735 -#: vips-7.17.1/libsrc/format/im_jpeg2vips.c:735 msgid "JPEG" msgstr "" #: libsrc/format/im_png2vips.c:61 libsrc/format/im_vips2png.c:59 -#: vips-7.17.1/libsrc/format/im_png2vips.c:61 -#: vips-7.17.1/libsrc/format/im_vips2png.c:59 msgid "PNG support disabled" msgstr "" #: libsrc/format/im_png2vips.c:87 libsrc/format/im_vips2png.c:85 -#: vips-7.17.1/libsrc/format/im_png2vips.c:87 -#: vips-7.17.1/libsrc/format/im_vips2png.c:85 #, c-format msgid "PNG error: \"%s\"" msgstr "" #: libsrc/format/im_png2vips.c:93 libsrc/format/im_vips2png.c:91 -#: vips-7.17.1/libsrc/format/im_png2vips.c:93 -#: vips-7.17.1/libsrc/format/im_vips2png.c:91 #, c-format msgid "PNG warning: \"%s\"" msgstr "" -#: libsrc/format/im_png2vips.c:262 vips-7.17.1/libsrc/format/im_png2vips.c:262 +#: libsrc/format/im_png2vips.c:262 #, fuzzy msgid "unsupported colour type" msgstr "unsupported colourspace %d" -#: libsrc/format/im_png2vips.c:388 vips-7.17.1/libsrc/format/im_png2vips.c:388 +#: libsrc/format/im_png2vips.c:388 msgid "PNG" msgstr "" #: libsrc/format/im_vips2ppm.c:143 libsrc/format/im_vips2ppm.c:160 -#: vips-7.17.1/libsrc/format/im_vips2ppm.c:143 -#: vips-7.17.1/libsrc/format/im_vips2ppm.c:160 msgid "write error ... disc full?" msgstr "" -#: libsrc/format/im_vips2ppm.c:259 vips-7.17.1/libsrc/format/im_vips2ppm.c:259 +#: libsrc/format/im_vips2ppm.c:259 msgid "bad mode string, should be \"binary\" or \"ascii\"" msgstr "" -#: libsrc/format/im_vips2ppm.c:267 vips-7.17.1/libsrc/format/im_vips2ppm.c:267 +#: libsrc/format/im_vips2ppm.c:267 msgid "can't write binary >8 bit images" msgstr "" -#: libsrc/format/im_vips2ppm.c:272 vips-7.17.1/libsrc/format/im_vips2ppm.c:272 +#: libsrc/format/im_vips2ppm.c:272 msgid "unsigned int formats only" msgstr "" -#: libsrc/format/im_vips2ppm.c:281 vips-7.17.1/libsrc/format/im_vips2ppm.c:281 +#: libsrc/format/im_vips2ppm.c:281 msgid "1 or 3 band images only" msgstr "" -#: libsrc/format/im_vips2png.c:130 vips-7.17.1/libsrc/format/im_vips2png.c:130 +#: libsrc/format/im_vips2png.c:130 msgid "unable to convert to RGB for save" msgstr "" -#: libsrc/format/im_vips2png.c:212 vips-7.17.1/libsrc/format/im_vips2png.c:212 +#: libsrc/format/im_vips2png.c:212 msgid "compress should be in [0,9]" msgstr "" -#: libsrc/format/im_vips2png.c:312 vips-7.17.1/libsrc/format/im_vips2png.c:312 +#: libsrc/format/im_vips2png.c:312 #, c-format msgid "unable to write \"%s\"" msgstr "" #: libsrc/format/im_vips2jpeg.c:226 -#: vips-7.17.1/libsrc/format/im_vips2jpeg.c:226 msgid "unable to convert to saveable format" msgstr "" #: libsrc/format/im_vips2jpeg.c:327 -#: vips-7.17.1/libsrc/format/im_vips2jpeg.c:327 msgid "error setting JPEG resolution" msgstr "" #: libsrc/format/im_vips2jpeg.c:370 -#: vips-7.17.1/libsrc/format/im_vips2jpeg.c:370 msgid "error saving EXIF" msgstr "" #: libsrc/format/im_vips2jpeg.c:560 -#: vips-7.17.1/libsrc/format/im_vips2jpeg.c:560 msgid "qfac should be in 0-100" msgstr "" #: libsrc/format/im_tiff2vips.c:266 libsrc/format/im_tiff2vips.c:289 #: libsrc/format/im_tiff2vips.c:308 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:266 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:289 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:308 #, c-format msgid "required field %d missing" msgstr "" #: libsrc/format/im_tiff2vips.c:270 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:270 #, c-format msgid "required field %d=%d, not %d" msgstr "" #: libsrc/format/im_tiff2vips.c:679 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:679 msgid "bad colormap" msgstr "bad colourmap" #: libsrc/format/im_tiff2vips.c:734 libsrc/format/im_tiff2vips.c:783 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:734 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:783 msgid "3 or 4 bands RGB TIFF only" msgstr "" #: libsrc/format/im_tiff2vips.c:873 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:873 msgid "4 or 5 bands CMYK TIFF only" msgstr "" #: libsrc/format/im_tiff2vips.c:924 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:924 msgid "unknown resolution unit" msgstr "" #: libsrc/format/im_tiff2vips.c:929 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:929 #, c-format msgid "" "no resolution information for TIFF image \"%s\" -- defaulting to 1 pixel per " @@ -1573,127 +1215,105 @@ msgid "" msgstr "" #: libsrc/format/im_tiff2vips.c:996 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:996 #, c-format msgid "unsupported sample format %d for lab image" msgstr "" #: libsrc/format/im_tiff2vips.c:1006 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:1006 #, c-format msgid "unsupported depth %d for LAB image" msgstr "" #: libsrc/format/im_tiff2vips.c:1053 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:1053 #, c-format msgid "unsupported sample format %d for greyscale image" msgstr "" #: libsrc/format/im_tiff2vips.c:1062 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:1062 #, c-format msgid "unsupported depth %d for greyscale image" msgstr "" #: libsrc/format/im_tiff2vips.c:1102 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:1102 #, c-format msgid "unsupported sample format %d for rgb image" msgstr "" #: libsrc/format/im_tiff2vips.c:1111 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:1111 #, c-format msgid "unsupported depth %d for RGB image" msgstr "" #: libsrc/format/im_tiff2vips.c:1125 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:1125 #, c-format msgid "unknown photometric interpretation %d" msgstr "" #: libsrc/format/im_tiff2vips.c:1384 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:1384 #, c-format msgid "bad page number %d" msgstr "" #: libsrc/format/im_tiff2vips.c:1460 libsrc/format/im_tiff2vips.c:1492 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:1460 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:1492 #, c-format msgid "TIFF file does not contain page %d" msgstr "" #: libsrc/format/im_tiff2vips.c:1567 -#: vips-7.17.1/libsrc/format/im_tiff2vips.c:1567 msgid "TIFF" msgstr "" -#: libsrc/format/im_exr2vips.c:68 vips-7.17.1/libsrc/format/im_exr2vips.c:68 +#: libsrc/format/im_exr2vips.c:68 msgid "OpenEXR support disabled" msgstr "" -#: libsrc/format/im_exr2vips.c:110 vips-7.17.1/libsrc/format/im_exr2vips.c:110 +#: libsrc/format/im_exr2vips.c:110 #, c-format msgid "EXR error: %s" msgstr "" -#: libsrc/format/im_exr2vips.c:476 vips-7.17.1/libsrc/format/im_exr2vips.c:476 +#: libsrc/format/im_exr2vips.c:476 msgid "OpenEXR" msgstr "" #: libsrc/format/im_file2vips.c:125 libsrc/format/im_file2vips.c:642 #: libsrc/iofuncs/im_open_vips.c:126 libsrc/iofuncs/im_open_vips.c:917 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:126 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:917 #, c-format msgid "unable to open \"%s\", %s" msgstr "" #: libsrc/format/im_file2vips.c:252 libsrc/iofuncs/im_open_vips.c:253 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:253 #, c-format msgid "\"%s\" is not a VIPS image" msgstr "" #: libsrc/format/im_file2vips.c:312 libsrc/iofuncs/im_open_vips.c:313 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:313 msgid "unable to read history" msgstr "" #: libsrc/format/im_file2vips.c:349 libsrc/iofuncs/im_open_vips.c:350 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:350 msgid "more than a 10 megabytes of XML? sufferin' succotash!" msgstr "" #: libsrc/format/im_file2vips.c:396 libsrc/iofuncs/im_open_vips.c:398 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:398 msgid "incorrect namespace in XML" msgstr "" #: libsrc/format/im_file2vips.c:517 libsrc/iofuncs/im_open_vips.c:520 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:520 msgid "error transforming from save format" msgstr "" #: libsrc/format/im_file2vips.c:631 libsrc/iofuncs/im_open_vips.c:906 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:906 #, c-format msgid "unable to read header for \"%s\", %s" msgstr "" #: libsrc/format/im_file2vips.c:643 libsrc/iofuncs/im_open_vips.c:724 #: libsrc/iofuncs/im_open_vips.c:918 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:724 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:918 msgid "file has been truncated" msgstr "" #: libsrc/format/im_file2vips.c:656 libsrc/iofuncs/im_open_vips.c:931 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:931 #, c-format msgid "error reading XML: %s" msgstr "" @@ -1702,14 +1322,6 @@ msgstr "" #: libsrc/freq_filt/im_fwfft.c:113 libsrc/freq_filt/im_fwfft.c:218 #: libsrc/freq_filt/im_fwfft.c:309 libsrc/freq_filt/im_fwfft.c:423 #: libsrc/freq_filt/im_invfftr.c:90 libsrc/freq_filt/im_invfftr.c:173 -#: vips-7.17.1/libsrc/freq_filt/im_invfft.c:95 -#: vips-7.17.1/libsrc/freq_filt/im_invfft.c:145 -#: vips-7.17.1/libsrc/freq_filt/im_fwfft.c:113 -#: vips-7.17.1/libsrc/freq_filt/im_fwfft.c:218 -#: vips-7.17.1/libsrc/freq_filt/im_fwfft.c:309 -#: vips-7.17.1/libsrc/freq_filt/im_fwfft.c:423 -#: vips-7.17.1/libsrc/freq_filt/im_invfftr.c:90 -#: vips-7.17.1/libsrc/freq_filt/im_invfftr.c:173 msgid "one band uncoded only" msgstr "" @@ -1717,50 +1329,32 @@ msgstr "" #: libsrc/freq_filt/im_fwfft.c:124 libsrc/freq_filt/im_fwfft.c:229 #: libsrc/freq_filt/im_fwfft.c:323 libsrc/freq_filt/im_fwfft.c:437 #: libsrc/freq_filt/im_invfftr.c:127 libsrc/freq_filt/im_invfftr.c:212 -#: vips-7.17.1/libsrc/freq_filt/im_invfft.c:108 -#: vips-7.17.1/libsrc/freq_filt/im_invfft.c:160 -#: vips-7.17.1/libsrc/freq_filt/im_fwfft.c:124 -#: vips-7.17.1/libsrc/freq_filt/im_fwfft.c:229 -#: vips-7.17.1/libsrc/freq_filt/im_fwfft.c:323 -#: vips-7.17.1/libsrc/freq_filt/im_fwfft.c:437 -#: vips-7.17.1/libsrc/freq_filt/im_invfftr.c:127 -#: vips-7.17.1/libsrc/freq_filt/im_invfftr.c:212 msgid "unable to create transform plan" msgstr "" #: libsrc/freq_filt/im_invfft.c:204 libsrc/freq_filt/im_invfftr.c:256 -#: vips-7.17.1/libsrc/freq_filt/im_invfft.c:204 -#: vips-7.17.1/libsrc/freq_filt/im_invfftr.c:256 msgid "one band complex uncoded only" msgstr "" #: libsrc/freq_filt/im_invfft.c:209 libsrc/freq_filt/im_fwfft.c:520 #: libsrc/freq_filt/im_invfftr.c:261 -#: vips-7.17.1/libsrc/freq_filt/im_invfft.c:209 -#: vips-7.17.1/libsrc/freq_filt/im_fwfft.c:520 -#: vips-7.17.1/libsrc/freq_filt/im_invfftr.c:261 msgid "sides must be power of 2" msgstr "" #: libsrc/freq_filt/im_invfft.c:230 libsrc/freq_filt/im_fwfft.c:541 #: libsrc/freq_filt/im_invfftr.c:282 -#: vips-7.17.1/libsrc/freq_filt/im_invfft.c:230 -#: vips-7.17.1/libsrc/freq_filt/im_fwfft.c:541 -#: vips-7.17.1/libsrc/freq_filt/im_invfftr.c:282 msgid "fft_sp failed" msgstr "" -#: libsrc/freq_filt/im_fwfft.c:515 vips-7.17.1/libsrc/freq_filt/im_fwfft.c:515 +#: libsrc/freq_filt/im_fwfft.c:515 msgid "one band non-complex uncoded only" msgstr "" #: libsrc/histograms_lut/im_project.c:262 -#: vips-7.17.1/libsrc/histograms_lut/im_project.c:262 msgid "non-complex images only" msgstr "" #: libsrc/histograms_lut/im_maplut.c:122 -#: vips-7.17.1/libsrc/histograms_lut/im_maplut.c:122 #, c-format msgid "%d overflows detected" msgstr "" @@ -1768,7 +1362,6 @@ msgstr "" #. Switch for input types. Has to be uint type! #. #: libsrc/histograms_lut/im_maplut.c:484 -#: vips-7.17.1/libsrc/histograms_lut/im_maplut.c:484 msgid "bad input file" msgstr "" @@ -1777,210 +1370,166 @@ msgstr "" #. * uchar. #. #: libsrc/histograms_lut/im_maplut.c:515 -#: vips-7.17.1/libsrc/histograms_lut/im_maplut.c:515 msgid "bad lut file" msgstr "" #: libsrc/histograms_lut/im_maplut.c:568 -#: vips-7.17.1/libsrc/histograms_lut/im_maplut.c:568 msgid "lut is not uncoded" msgstr "" #: libsrc/histograms_lut/im_maplut.c:572 -#: vips-7.17.1/libsrc/histograms_lut/im_maplut.c:572 msgid "lut seems very large!" msgstr "" #: libsrc/histograms_lut/im_maplut.c:584 -#: vips-7.17.1/libsrc/histograms_lut/im_maplut.c:584 msgid "input is not uncoded" msgstr "" #: libsrc/histograms_lut/im_maplut.c:589 -#: vips-7.17.1/libsrc/histograms_lut/im_maplut.c:589 msgid "input is not some unsigned integer type" msgstr "" #: libsrc/histograms_lut/im_maplut.c:593 -#: vips-7.17.1/libsrc/histograms_lut/im_maplut.c:593 msgid "" "lut should have 1 band, or same number of bands as input, or any number of " "bands if input has 1 band" msgstr "" #: libsrc/histograms_lut/im_maplut.c:600 -#: vips-7.17.1/libsrc/histograms_lut/im_maplut.c:600 msgid "input is uchar and lut does not have 256 elements" msgstr "" #: libsrc/histograms_lut/im_histgr.c:322 -#: vips-7.17.1/libsrc/histograms_lut/im_histgr.c:322 msgid "input not uchar or ushort" msgstr "" #: libsrc/histograms_lut/im_histgr.c:329 -#: vips-7.17.1/libsrc/histograms_lut/im_histgr.c:329 msgid "bad band parameter" msgstr "" #: libsrc/histograms_lut/im_histnD.c:217 -#: vips-7.17.1/libsrc/histograms_lut/im_histnD.c:217 msgid " uncoded images only" msgstr "" #: libsrc/histograms_lut/im_histnD.c:223 -#: vips-7.17.1/libsrc/histograms_lut/im_histnD.c:223 msgid " unsigned 8 or 16 bit images only" msgstr "" #: libsrc/histograms_lut/im_histnD.c:230 -#: vips-7.17.1/libsrc/histograms_lut/im_histnD.c:230 #, c-format msgid " bins out of range [1,%d]" msgstr "" #: libsrc/histograms_lut/tone.c:233 -#: vips-7.17.1/libsrc/histograms_lut/tone.c:233 msgid "bad in_max, out_max parameters" msgstr "" #: libsrc/histograms_lut/tone.c:238 -#: vips-7.17.1/libsrc/histograms_lut/tone.c:238 msgid "bad Lb, Lw parameters" msgstr "" #: libsrc/histograms_lut/tone.c:243 -#: vips-7.17.1/libsrc/histograms_lut/tone.c:243 msgid "Ps not in range [0.0,1.0]" msgstr "" #: libsrc/histograms_lut/tone.c:248 -#: vips-7.17.1/libsrc/histograms_lut/tone.c:248 msgid "Pm not in range [0.0,1.0]" msgstr "" #: libsrc/histograms_lut/tone.c:253 -#: vips-7.17.1/libsrc/histograms_lut/tone.c:253 msgid "Ph not in range [0.0,1.0]" msgstr "" #: libsrc/histograms_lut/tone.c:258 -#: vips-7.17.1/libsrc/histograms_lut/tone.c:258 msgid "S not in range [-30,+30]" msgstr "" #: libsrc/histograms_lut/tone.c:263 -#: vips-7.17.1/libsrc/histograms_lut/tone.c:263 msgid "M not in range [-30,+30]" msgstr "" #: libsrc/histograms_lut/tone.c:268 -#: vips-7.17.1/libsrc/histograms_lut/tone.c:268 msgid "H not in range [-30,+30]" msgstr "" #: libsrc/histograms_lut/tone.c:350 libsrc/histograms_lut/tone.c:399 -#: vips-7.17.1/libsrc/histograms_lut/tone.c:350 -#: vips-7.17.1/libsrc/histograms_lut/tone.c:399 msgid "not 1 by n or n by 1 image" msgstr "" #: libsrc/histograms_lut/tone.c:405 -#: vips-7.17.1/libsrc/histograms_lut/tone.c:405 msgid "not 1024-point IM_BANDFMT_SHORT lut" msgstr "" #: libsrc/histograms_lut/tone.c:423 libsrc/histograms_lut/tone.c:498 -#: vips-7.17.1/libsrc/histograms_lut/tone.c:423 -#: vips-7.17.1/libsrc/histograms_lut/tone.c:498 msgid "input not LabS or LabQ" msgstr "" #: libsrc/histograms_lut/im_histplot.c:93 -#: vips-7.17.1/libsrc/histograms_lut/im_histplot.c:93 msgid "uncoded only" msgstr "" #: libsrc/histograms_lut/im_histplot.c:97 -#: vips-7.17.1/libsrc/histograms_lut/im_histplot.c:97 msgid "non-complex only" msgstr "" #: libsrc/histograms_lut/im_histplot.c:188 #: libsrc/histograms_lut/im_histplot.c:243 -#: vips-7.17.1/libsrc/histograms_lut/im_histplot.c:188 -#: vips-7.17.1/libsrc/histograms_lut/im_histplot.c:243 msgid "internal error #8255" msgstr "" #: libsrc/histograms_lut/im_histplot.c:272 -#: vips-7.17.1/libsrc/histograms_lut/im_histplot.c:272 msgid "internal error #8254" msgstr "" #: libsrc/histograms_lut/im_histplot.c:331 -#: vips-7.17.1/libsrc/histograms_lut/im_histplot.c:331 msgid "Xsize or Ysize not 1" msgstr "" #: libsrc/histograms_lut/im_histeq.c:99 -#: vips-7.17.1/libsrc/histograms_lut/im_histeq.c:99 msgid "input coded" msgstr "" #: libsrc/histograms_lut/im_histeq.c:103 -#: vips-7.17.1/libsrc/histograms_lut/im_histeq.c:103 msgid "input too large" msgstr "" #: libsrc/histograms_lut/im_lhisteq.c:161 -#: vips-7.17.1/libsrc/histograms_lut/im_lhisteq.c:161 msgid "one band uchar uncoded only" msgstr "" #: libsrc/histograms_lut/im_lhisteq.c:165 -#: vips-7.17.1/libsrc/histograms_lut/im_lhisteq.c:165 msgid "window too large" msgstr "" #: libsrc/histograms_lut/im_lhisteq.c:169 -#: vips-7.17.1/libsrc/histograms_lut/im_lhisteq.c:169 msgid "window too small" msgstr "" #: libsrc/histograms_lut/im_buildlut.c:135 -#: vips-7.17.1/libsrc/histograms_lut/im_buildlut.c:135 msgid "x value not an int" msgstr "" #: libsrc/histograms_lut/im_buildlut.c:147 -#: vips-7.17.1/libsrc/histograms_lut/im_buildlut.c:147 msgid "x range too small" msgstr "" #: libsrc/histograms_lut/im_buildlut.c:218 -#: vips-7.17.1/libsrc/histograms_lut/im_buildlut.c:218 msgid "bad input matrix size" msgstr "" #: libsrc/inplace/inplace_dispatch.c:170 -#: vips-7.17.1/libsrc/inplace/inplace_dispatch.c:170 msgid "vectors not same length" msgstr "" #: libsrc/inplace/inplace_dispatch.c:240 -#: vips-7.17.1/libsrc/inplace/inplace_dispatch.c:240 msgid "bad vector length" msgstr "" #: libsrc/inplace/smudge_area.c:185 libsrc/inplace/smudge_area.c:312 -#: vips-7.17.1/libsrc/inplace/smudge_area.c:185 -#: vips-7.17.1/libsrc/inplace/smudge_area.c:312 msgid "unknown band format" msgstr "" #: libsrc/inplace/im_insertplace.c:108 -#: vips-7.17.1/libsrc/inplace/im_insertplace.c:108 msgid "small not inside big" msgstr "" @@ -1988,50 +1537,43 @@ msgstr "" #: libsrc/mosaicing/im_tbmerge.c:217 libsrc/mosaicing/im_tbmerge.c:535 #: libsrc/mosaicing/im_lrmerge.c:223 libsrc/mosaicing/im_lrmerge.c:272 #: libsrc/mosaicing/im_lrmerge.c:613 -#: vips-7.17.1/libsrc/mosaicing/im_tbmerge.c:163 -#: vips-7.17.1/libsrc/mosaicing/im_tbmerge.c:217 -#: vips-7.17.1/libsrc/mosaicing/im_tbmerge.c:535 -#: vips-7.17.1/libsrc/mosaicing/im_lrmerge.c:223 -#: vips-7.17.1/libsrc/mosaicing/im_lrmerge.c:272 -#: vips-7.17.1/libsrc/mosaicing/im_lrmerge.c:613 -#: vips-7.17.1/libsrc/inplace/im_plotmask.c:229 msgid "internal error" msgstr "" -#: libsrc/inplace/line_draw.c:415 vips-7.17.1/libsrc/inplace/line_draw.c:415 +#: libsrc/inplace/line_draw.c:415 msgid "mask image not 1 band 8 bit uncoded" msgstr "" -#: libsrc/inplace/line_draw.c:421 vips-7.17.1/libsrc/inplace/line_draw.c:421 +#: libsrc/inplace/line_draw.c:421 msgid "ink image does not match in image" msgstr "" -#: libsrc/inplace/line_draw.c:425 vips-7.17.1/libsrc/inplace/line_draw.c:425 +#: libsrc/inplace/line_draw.c:425 msgid "ink image not 1x1 pixels" msgstr "" -#: libsrc/iofuncs/im_open.c:319 vips-7.17.1/libsrc/iofuncs/im_open.c:319 +#: libsrc/iofuncs/im_open.c:319 #, c-format msgid "%s %s: %d%% complete" msgstr "" #. Spaces at end help to erase the %complete message we overwrite. #. -#: libsrc/iofuncs/im_open.c:337 vips-7.17.1/libsrc/iofuncs/im_open.c:337 +#: libsrc/iofuncs/im_open.c:337 #, c-format msgid "%s %s: done in %ds \n" msgstr "" -#: libsrc/iofuncs/im_open.c:357 vips-7.17.1/libsrc/iofuncs/im_open.c:357 +#: libsrc/iofuncs/im_open.c:357 msgid "NULL filename or mode" msgstr "" -#: libsrc/iofuncs/im_open.c:406 vips-7.17.1/libsrc/iofuncs/im_open.c:406 +#: libsrc/iofuncs/im_open.c:406 #, fuzzy, c-format msgid "unsupported filetype \"%s\"" msgstr "unsupported colourspace %d" -#: libsrc/iofuncs/im_open.c:422 vips-7.17.1/libsrc/iofuncs/im_open.c:422 +#: libsrc/iofuncs/im_open.c:422 #, c-format msgid "bad mode \"%s\"" msgstr "" @@ -2039,367 +1581,318 @@ msgstr "" #. Not a known output style. #. #: libsrc/iofuncs/im_writeline.c:110 libsrc/iofuncs/im_generate.c:464 -#: vips-7.17.1/libsrc/iofuncs/im_writeline.c:110 -#: vips-7.17.1/libsrc/iofuncs/im_generate.c:464 #, c-format msgid "unable to output to a %s image" msgstr "" -#: libsrc/iofuncs/util.c:302 vips-7.17.1/libsrc/iofuncs/util.c:302 +#: libsrc/iofuncs/util.c:302 msgid "unable to build class" msgstr "" -#: libsrc/iofuncs/util.c:340 vips-7.17.1/libsrc/iofuncs/util.c:340 +#: libsrc/iofuncs/util.c:340 #, c-format msgid "base class \"%s\" not found" msgstr "" -#: libsrc/iofuncs/util.c:347 vips-7.17.1/libsrc/iofuncs/util.c:347 +#: libsrc/iofuncs/util.c:347 #, c-format msgid "class \"%s\" not found" msgstr "" -#: libsrc/iofuncs/util.c:788 vips-7.17.1/libsrc/iofuncs/util.c:788 +#: libsrc/iofuncs/util.c:788 msgid "unable to get file stats" msgstr "" #: libsrc/iofuncs/util.c:805 libsrc/iofuncs/im_wbuffer.c:357 -#: libsrc/iofuncs/im_wbuffer.c:394 vips-7.17.1/libsrc/iofuncs/util.c:805 -#: vips-7.17.1/libsrc/iofuncs/im_wbuffer.c:357 -#: vips-7.17.1/libsrc/iofuncs/im_wbuffer.c:394 +#: libsrc/iofuncs/im_wbuffer.c:394 msgid "write failed" msgstr "" #. Seems crazy! #. -#: libsrc/iofuncs/util.c:832 vips-7.17.1/libsrc/iofuncs/util.c:832 +#: libsrc/iofuncs/util.c:832 #, c-format msgid "\"%s\" too long" msgstr "" -#: libsrc/iofuncs/util.c:849 vips-7.17.1/libsrc/iofuncs/util.c:849 +#: libsrc/iofuncs/util.c:849 msgid "out of memory" msgstr "" -#: libsrc/iofuncs/util.c:875 vips-7.17.1/libsrc/iofuncs/util.c:875 +#: libsrc/iofuncs/util.c:875 #, c-format msgid "error reading from file \"%s\"" msgstr "" -#: libsrc/iofuncs/util.c:902 vips-7.17.1/libsrc/iofuncs/util.c:902 +#: libsrc/iofuncs/util.c:902 #, c-format msgid "unable to open file \"%s\"" msgstr "" #: libsrc/iofuncs/util.c:1122 libsrc/iofuncs/util.c:1129 -#: vips-7.17.1/libsrc/iofuncs/util.c:1122 -#: vips-7.17.1/libsrc/iofuncs/util.c:1129 msgid "unable to truncate" msgstr "" -#: libsrc/iofuncs/util.c:1149 vips-7.17.1/libsrc/iofuncs/util.c:1149 +#: libsrc/iofuncs/util.c:1149 #, c-format msgid "writing error (%zd out of %zd blocks written) ... disc full?" msgstr "" -#: libsrc/iofuncs/util.c:1320 vips-7.17.1/libsrc/iofuncs/util.c:1320 +#: libsrc/iofuncs/util.c:1320 msgid "unexpected end of string" msgstr "" -#: libsrc/iofuncs/util.c:1333 vips-7.17.1/libsrc/iofuncs/util.c:1333 +#: libsrc/iofuncs/util.c:1333 msgid "opening brace" msgstr "" -#: libsrc/iofuncs/util.c:1334 vips-7.17.1/libsrc/iofuncs/util.c:1334 +#: libsrc/iofuncs/util.c:1334 msgid "closing brace" msgstr "" -#: libsrc/iofuncs/util.c:1335 vips-7.17.1/libsrc/iofuncs/util.c:1335 +#: libsrc/iofuncs/util.c:1335 msgid "string" msgstr "" -#: libsrc/iofuncs/util.c:1355 vips-7.17.1/libsrc/iofuncs/util.c:1355 +#: libsrc/iofuncs/util.c:1355 #, c-format msgid "expected %s, saw %s" msgstr "" -#: libsrc/iofuncs/im_iocheck.c:163 vips-7.17.1/libsrc/iofuncs/im_iocheck.c:163 +#: libsrc/iofuncs/im_iocheck.c:163 msgid "no image data" msgstr "" -#: libsrc/iofuncs/im_iocheck.c:207 vips-7.17.1/libsrc/iofuncs/im_iocheck.c:207 +#: libsrc/iofuncs/im_iocheck.c:207 #, c-format msgid "auto-rewind for %s failed" msgstr "" -#: libsrc/iofuncs/im_iocheck.c:216 vips-7.17.1/libsrc/iofuncs/im_iocheck.c:216 +#: libsrc/iofuncs/im_iocheck.c:216 msgid "image not readable" msgstr "" #: libsrc/iofuncs/im_iocheck.c:238 libsrc/iofuncs/im_iocheck.c:254 -#: vips-7.17.1/libsrc/iofuncs/im_iocheck.c:238 -#: vips-7.17.1/libsrc/iofuncs/im_iocheck.c:254 msgid "image already written" msgstr "" -#: libsrc/iofuncs/im_iocheck.c:268 vips-7.17.1/libsrc/iofuncs/im_iocheck.c:268 +#: libsrc/iofuncs/im_iocheck.c:268 msgid "image not writeable" msgstr "" -#: libsrc/iofuncs/im_iocheck.c:291 vips-7.17.1/libsrc/iofuncs/im_iocheck.c:291 +#: libsrc/iofuncs/im_iocheck.c:291 msgid "unable to rewind file" msgstr "" -#: libsrc/iofuncs/im_iocheck.c:315 vips-7.17.1/libsrc/iofuncs/im_iocheck.c:315 +#: libsrc/iofuncs/im_iocheck.c:315 msgid "bad file type" msgstr "" #: libsrc/iofuncs/im_mapfile.c:140 libsrc/iofuncs/im_mapfile.c:307 -#: vips-7.17.1/libsrc/iofuncs/im_mapfile.c:140 -#: vips-7.17.1/libsrc/iofuncs/im_mapfile.c:307 msgid "unable to CreateFileMapping" msgstr "" #: libsrc/iofuncs/im_mapfile.c:150 libsrc/iofuncs/im_mapfile.c:319 -#: vips-7.17.1/libsrc/iofuncs/im_mapfile.c:150 -#: vips-7.17.1/libsrc/iofuncs/im_mapfile.c:319 msgid "unable to MapViewOfFile" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:178 vips-7.17.1/libsrc/iofuncs/im_mapfile.c:178 +#: libsrc/iofuncs/im_mapfile.c:178 msgid "unable to mmap" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:179 vips-7.17.1/libsrc/iofuncs/im_mapfile.c:179 +#: libsrc/iofuncs/im_mapfile.c:179 #, c-format msgid "" "map failed (%s), running very low on system resources, expect a crash soon" msgstr "" #: libsrc/iofuncs/im_mapfile.c:196 libsrc/iofuncs/im_mapfile.c:313 -#: vips-7.17.1/libsrc/iofuncs/im_mapfile.c:196 -#: vips-7.17.1/libsrc/iofuncs/im_mapfile.c:313 msgid "unable to UnmapViewOfFile" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:202 vips-7.17.1/libsrc/iofuncs/im_mapfile.c:202 +#: libsrc/iofuncs/im_mapfile.c:202 msgid "unable to munmap file" msgstr "" #: libsrc/iofuncs/im_mapfile.c:226 libsrc/iofuncs/im_mapfile.c:270 -#: vips-7.17.1/libsrc/iofuncs/im_mapfile.c:226 -#: vips-7.17.1/libsrc/iofuncs/im_mapfile.c:270 msgid "unable to get file status" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:232 vips-7.17.1/libsrc/iofuncs/im_mapfile.c:232 +#: libsrc/iofuncs/im_mapfile.c:232 msgid "file is less than 64 bytes" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:237 vips-7.17.1/libsrc/iofuncs/im_mapfile.c:237 +#: libsrc/iofuncs/im_mapfile.c:237 msgid "not a regular file" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:276 vips-7.17.1/libsrc/iofuncs/im_mapfile.c:276 +#: libsrc/iofuncs/im_mapfile.c:276 msgid "unable to read data" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:339 vips-7.17.1/libsrc/iofuncs/im_mapfile.c:339 +#: libsrc/iofuncs/im_mapfile.c:339 #, c-format msgid "unable to mmap: \"%s\" - %s" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:349 vips-7.17.1/libsrc/iofuncs/im_mapfile.c:349 +#: libsrc/iofuncs/im_mapfile.c:349 #, c-format msgid "unable to mmap \"%s\" to same address" msgstr "" -#: libsrc/iofuncs/package.c:487 vips-7.17.1/libsrc/iofuncs/package.c:487 +#: libsrc/iofuncs/package.c:487 #, c-format msgid "unable to close plugin \"%s\"" msgstr "" -#: libsrc/iofuncs/package.c:512 vips-7.17.1/libsrc/iofuncs/package.c:512 +#: libsrc/iofuncs/package.c:512 msgid "plugins not supported on this platform" msgstr "" -#: libsrc/iofuncs/package.c:535 vips-7.17.1/libsrc/iofuncs/package.c:535 +#: libsrc/iofuncs/package.c:535 #, c-format msgid "unable to open plugin \"%s\"" msgstr "" -#: libsrc/iofuncs/package.c:549 vips-7.17.1/libsrc/iofuncs/package.c:549 +#: libsrc/iofuncs/package.c:549 #, c-format msgid "unable to find symbol \"package_table\" in plugin \"%s\"" msgstr "" -#: libsrc/iofuncs/package.c:562 vips-7.17.1/libsrc/iofuncs/package.c:562 +#: libsrc/iofuncs/package.c:562 #, c-format msgid "corrupted package table in plugin \"%s\"" msgstr "" #: libsrc/iofuncs/package.c:682 libsrc/iofuncs/package.c:709 -#: libsrc/iofuncs/package.c:737 vips-7.17.1/libsrc/iofuncs/package.c:682 -#: vips-7.17.1/libsrc/iofuncs/package.c:709 -#: vips-7.17.1/libsrc/iofuncs/package.c:737 +#: libsrc/iofuncs/package.c:737 #, c-format msgid "\"%s\" not found" msgstr "" -#: libsrc/iofuncs/package.c:847 vips-7.17.1/libsrc/iofuncs/package.c:847 +#: libsrc/iofuncs/package.c:847 msgid "too few arguments" msgstr "" -#: libsrc/iofuncs/package.c:868 vips-7.17.1/libsrc/iofuncs/package.c:868 +#: libsrc/iofuncs/package.c:868 msgid "too many arguments" msgstr "" -#: libsrc/iofuncs/package.c:1085 vips-7.17.1/libsrc/iofuncs/package.c:1085 +#: libsrc/iofuncs/package.c:1085 msgid "flag not 0,1,2" msgstr "" #: libsrc/iofuncs/im_wrapmany.c:166 -#: vips-7.17.1/libsrc/iofuncs/im_wrapmany.c:166 msgid "too many input images" msgstr "" #: libsrc/iofuncs/im_wrapmany.c:184 -#: vips-7.17.1/libsrc/iofuncs/im_wrapmany.c:184 msgid "descriptors differ in size" msgstr "" #: libsrc/iofuncs/im_open_vips.c:628 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:628 #, c-format msgid "unable to set property \"%s\" to value \"%s\"." msgstr "" #: libsrc/iofuncs/im_open_vips.c:676 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:676 msgid "error transforming to save format" msgstr "" #: libsrc/iofuncs/im_open_vips.c:838 libsrc/iofuncs/im_open_vips.c:847 #: libsrc/iofuncs/im_open_vips.c:870 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:838 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:847 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:870 msgid "xml save error" msgstr "" #: libsrc/iofuncs/im_open_vips.c:1028 -#: vips-7.17.1/libsrc/iofuncs/im_open_vips.c:1028 msgid "open for read-write for native format images only" msgstr "" -#: libsrc/iofuncs/meta.c:294 vips-7.17.1/libsrc/iofuncs/meta.c:294 +#: libsrc/iofuncs/meta.c:294 #, c-format msgid "field \"%s\" not found" msgstr "" -#: libsrc/iofuncs/meta.c:339 vips-7.17.1/libsrc/iofuncs/meta.c:339 +#: libsrc/iofuncs/meta.c:339 #, c-format msgid "field \"%s\" is of type %s, not %s" msgstr "" -#: libsrc/iofuncs/im_prepare.c:98 vips-7.17.1/libsrc/iofuncs/im_prepare.c:98 +#: libsrc/iofuncs/im_prepare.c:98 #, c-format msgid "killed for image \"%s\"" msgstr "" #: libsrc/iofuncs/im_prepare.c:164 libsrc/iofuncs/im_prepare.c:372 #: libsrc/iofuncs/im_generate.c:503 -#: vips-7.17.1/libsrc/iofuncs/im_prepare.c:164 -#: vips-7.17.1/libsrc/iofuncs/im_prepare.c:372 -#: vips-7.17.1/libsrc/iofuncs/im_generate.c:503 #, c-format msgid "unable to input from a %s image" msgstr "" -#: libsrc/iofuncs/im_prepare.c:229 vips-7.17.1/libsrc/iofuncs/im_prepare.c:229 +#: libsrc/iofuncs/im_prepare.c:229 msgid "incomplete header" msgstr "" #: libsrc/iofuncs/im_prepare.c:278 libsrc/iofuncs/region.c:475 -#: vips-7.17.1/libsrc/iofuncs/im_prepare.c:278 -#: vips-7.17.1/libsrc/iofuncs/region.c:475 msgid "inappropriate region type" msgstr "" #: libsrc/iofuncs/im_prepare.c:304 libsrc/iofuncs/region.c:508 -#: vips-7.17.1/libsrc/iofuncs/im_prepare.c:304 -#: vips-7.17.1/libsrc/iofuncs/region.c:508 msgid "dest too small" msgstr "" #: libsrc/iofuncs/im_prepare.c:322 libsrc/iofuncs/region.c:339 #: libsrc/iofuncs/region.c:394 libsrc/iofuncs/region.c:527 -#: vips-7.17.1/libsrc/iofuncs/im_prepare.c:322 -#: vips-7.17.1/libsrc/iofuncs/region.c:339 -#: vips-7.17.1/libsrc/iofuncs/region.c:394 -#: vips-7.17.1/libsrc/iofuncs/region.c:527 msgid "valid clipped to nothing" msgstr "" #: libsrc/iofuncs/im_init_world.c:209 -#: vips-7.17.1/libsrc/iofuncs/im_init_world.c:209 msgid "evaluate with N concurrent threads" msgstr "" #: libsrc/iofuncs/im_init_world.c:211 -#: vips-7.17.1/libsrc/iofuncs/im_init_world.c:211 msgid "set tile width to N (DEBUG)" msgstr "" #: libsrc/iofuncs/im_init_world.c:213 -#: vips-7.17.1/libsrc/iofuncs/im_init_world.c:213 msgid "set tile height to N (DEBUG)" msgstr "" #: libsrc/iofuncs/im_init_world.c:216 -#: vips-7.17.1/libsrc/iofuncs/im_init_world.c:216 msgid "set thinstrip height to N (DEBUG)" msgstr "" #: libsrc/iofuncs/im_init_world.c:219 -#: vips-7.17.1/libsrc/iofuncs/im_init_world.c:219 msgid "set fatstrip height to N (DEBUG)" msgstr "" #: libsrc/iofuncs/im_init_world.c:221 -#: vips-7.17.1/libsrc/iofuncs/im_init_world.c:221 msgid "show progress feedback" msgstr "" #: libsrc/iofuncs/im_init_world.c:234 -#: vips-7.17.1/libsrc/iofuncs/im_init_world.c:234 msgid "VIPS Options" msgstr "" #: libsrc/iofuncs/im_init_world.c:234 -#: vips-7.17.1/libsrc/iofuncs/im_init_world.c:234 msgid "Show VIPS options" msgstr "" -#: libsrc/iofuncs/im_iterate.c:161 vips-7.17.1/libsrc/iofuncs/im_iterate.c:161 +#: libsrc/iofuncs/im_iterate.c:161 #, c-format msgid "start function failed for image \"%s\"" msgstr "" -#: libsrc/iofuncs/im_iterate.c:183 vips-7.17.1/libsrc/iofuncs/im_iterate.c:183 +#: libsrc/iofuncs/im_iterate.c:183 #, c-format msgid "stop function failed for image \"%s\"" msgstr "" #: libsrc/iofuncs/im_cp_desc.c:141 libsrc/iofuncs/im_demand_hint.c:184 -#: vips-7.17.1/libsrc/iofuncs/im_cp_desc.c:141 -#: vips-7.17.1/libsrc/iofuncs/im_demand_hint.c:184 msgid "too many images" msgstr "" #: libsrc/iofuncs/memory.c:162 libsrc/iofuncs/memory.c:165 -#: vips-7.17.1/libsrc/iofuncs/memory.c:162 -#: vips-7.17.1/libsrc/iofuncs/memory.c:165 #, c-format msgid "out of memory --- size == %dMB" msgstr "" @@ -2414,582 +1907,508 @@ msgstr "" #: libsrc/iofuncs/im_render.c:567 libsrc/iofuncs/im_render.c:726 #: libsrc/iofuncs/threadgroup.c:469 libsrc/iofuncs/im_wbuffer.c:176 -#: vips-7.17.1/libsrc/iofuncs/im_render.c:567 -#: vips-7.17.1/libsrc/iofuncs/im_render.c:726 -#: vips-7.17.1/libsrc/iofuncs/threadgroup.c:469 -#: vips-7.17.1/libsrc/iofuncs/im_wbuffer.c:176 msgid "unable to create thread" msgstr "" #: libsrc/iofuncs/im_generate.c:394 libsrc/iofuncs/im_generate.c:418 -#: vips-7.17.1/libsrc/iofuncs/im_generate.c:394 -#: vips-7.17.1/libsrc/iofuncs/im_generate.c:418 msgid "func already attached" msgstr "" -#: libsrc/iofuncs/im_header.c:107 vips-7.17.1/libsrc/iofuncs/im_header.c:107 +#: libsrc/iofuncs/im_header.c:107 #, c-format msgid "no such int field \"%s\"" msgstr "" -#: libsrc/iofuncs/im_header.c:129 vips-7.17.1/libsrc/iofuncs/im_header.c:129 +#: libsrc/iofuncs/im_header.c:129 #, c-format msgid "no such double field \"%s\"" msgstr "" -#: libsrc/iofuncs/im_header.c:151 vips-7.17.1/libsrc/iofuncs/im_header.c:151 +#: libsrc/iofuncs/im_header.c:151 #, c-format msgid "no such string field \"%s\"" msgstr "" #: libsrc/iofuncs/threadgroup.c:145 -#: vips-7.17.1/libsrc/iofuncs/threadgroup.c:145 #, c-format msgid "threads clipped to %d" msgstr "" -#: libsrc/iofuncs/error.c:128 vips-7.17.1/libsrc/iofuncs/error.c:128 +#: libsrc/iofuncs/error.c:128 msgid "windows error" msgstr "" -#: libsrc/iofuncs/error.c:137 vips-7.17.1/libsrc/iofuncs/error.c:137 +#: libsrc/iofuncs/error.c:137 msgid "unix error" msgstr "" #: libsrc/iofuncs/error.c:166 libsrc/iofuncs/error.c:167 #: libsrc/iofuncs/error.c:189 libsrc/iofuncs/error.c:190 -#: vips-7.17.1/libsrc/iofuncs/error.c:166 -#: vips-7.17.1/libsrc/iofuncs/error.c:167 -#: vips-7.17.1/libsrc/iofuncs/error.c:189 -#: vips-7.17.1/libsrc/iofuncs/error.c:190 #, c-format msgid "%s: " msgstr "" -#: libsrc/iofuncs/error.c:166 vips-7.17.1/libsrc/iofuncs/error.c:166 +#: libsrc/iofuncs/error.c:166 msgid "vips diagnostic" msgstr "" -#: libsrc/iofuncs/error.c:189 vips-7.17.1/libsrc/iofuncs/error.c:189 +#: libsrc/iofuncs/error.c:189 msgid "vips warning" msgstr "" #: libsrc/iofuncs/im_printdesc.c:157 -#: vips-7.17.1/libsrc/iofuncs/im_printdesc.c:157 msgid "" msgstr "" #: libsrc/iofuncs/im_printdesc.c:163 -#: vips-7.17.1/libsrc/iofuncs/im_printdesc.c:163 msgid "" msgstr "" #: libsrc/iofuncs/im_printdesc.c:169 -#: vips-7.17.1/libsrc/iofuncs/im_printdesc.c:169 msgid "" msgstr "" #: libsrc/iofuncs/im_printdesc.c:175 -#: vips-7.17.1/libsrc/iofuncs/im_printdesc.c:175 msgid "" msgstr "" #: libsrc/iofuncs/im_printdesc.c:181 -#: vips-7.17.1/libsrc/iofuncs/im_printdesc.c:181 msgid "" msgstr "" #: libsrc/iofuncs/im_printdesc.c:187 -#: vips-7.17.1/libsrc/iofuncs/im_printdesc.c:187 msgid "" msgstr "" -#: libsrc/iofuncs/object.c:665 vips-7.17.1/libsrc/iofuncs/object.c:665 +#: libsrc/iofuncs/object.c:665 #, c-format msgid "required construct param %s to %s %s not set" msgstr "" -#: libsrc/iofuncs/object.c:760 vips-7.17.1/libsrc/iofuncs/object.c:760 +#: libsrc/iofuncs/object.c:760 msgid "VIPS base class" msgstr "" -#: libsrc/iofuncs/object.c:784 vips-7.17.1/libsrc/iofuncs/object.c:784 +#: libsrc/iofuncs/object.c:784 msgid "Nickname" msgstr "" -#: libsrc/iofuncs/object.c:785 vips-7.17.1/libsrc/iofuncs/object.c:785 +#: libsrc/iofuncs/object.c:785 msgid "Class nickname" msgstr "" -#: libsrc/iofuncs/object.c:795 vips-7.17.1/libsrc/iofuncs/object.c:795 +#: libsrc/iofuncs/object.c:795 msgid "Description" msgstr "" -#: libsrc/iofuncs/object.c:796 vips-7.17.1/libsrc/iofuncs/object.c:796 +#: libsrc/iofuncs/object.c:796 msgid "Class description" msgstr "" -#: libsrc/iofuncs/object.c:897 vips-7.17.1/libsrc/iofuncs/object.c:897 +#: libsrc/iofuncs/object.c:897 #, c-format msgid "no unset required arguments for %s" msgstr "" -#: libsrc/iofuncs/object.c:946 vips-7.17.1/libsrc/iofuncs/object.c:946 +#: libsrc/iofuncs/object.c:946 msgid "not , or ) after parameter" msgstr "" -#: libsrc/iofuncs/object.c:953 vips-7.17.1/libsrc/iofuncs/object.c:953 +#: libsrc/iofuncs/object.c:953 msgid "extra tokens after ')'" msgstr "" -#: libsrc/iofuncs/object.c:991 vips-7.17.1/libsrc/iofuncs/object.c:991 +#: libsrc/iofuncs/object.c:991 msgid "bad object arguments" msgstr "" -#: libsrc/iofuncs/base64.c:168 vips-7.17.1/libsrc/iofuncs/base64.c:168 +#: libsrc/iofuncs/base64.c:168 msgid "too little data" msgstr "" #. We shouldn't really be used for large amounts of data. #. #: libsrc/iofuncs/base64.c:174 libsrc/iofuncs/base64.c:239 -#: vips-7.17.1/libsrc/iofuncs/base64.c:174 -#: vips-7.17.1/libsrc/iofuncs/base64.c:239 msgid "too much data" msgstr "" -#: libsrc/iofuncs/im_binfile.c:123 vips-7.17.1/libsrc/iofuncs/im_binfile.c:123 +#: libsrc/iofuncs/im_binfile.c:123 #, c-format msgid "unable to open %s: file has been truncated" msgstr "" -#: libsrc/iofuncs/im_binfile.c:133 vips-7.17.1/libsrc/iofuncs/im_binfile.c:133 +#: libsrc/iofuncs/im_binfile.c:133 #, c-format msgid "%s is longer than expected" msgstr "" #: libsrc/iofuncs/im_setupout.c:127 -#: vips-7.17.1/libsrc/iofuncs/im_setupout.c:127 msgid "called twice!" msgstr "" #: libsrc/iofuncs/im_setupout.c:145 -#: vips-7.17.1/libsrc/iofuncs/im_setupout.c:145 #, c-format msgid "unable to write to \"%s\"" msgstr "" #: libsrc/iofuncs/im_setupout.c:158 -#: vips-7.17.1/libsrc/iofuncs/im_setupout.c:158 msgid "bad image descriptor" msgstr "" #: libsrc/iofuncs/im_bits_of_fmt.c:61 -#: vips-7.17.1/libsrc/iofuncs/im_bits_of_fmt.c:61 #, fuzzy, c-format msgid "unsupported band format: %d" msgstr "unsupported colourspace %d" #: libsrc/iofuncs/dispatch_types.c:72 -#: vips-7.17.1/libsrc/iofuncs/dispatch_types.c:72 #, c-format msgid "unknown display type \"%s\"" msgstr "" #: libsrc/iofuncs/dispatch_types.c:74 -#: vips-7.17.1/libsrc/iofuncs/dispatch_types.c:74 msgid "display should be one of:\n" msgstr "" #: libsrc/iofuncs/dispatch_types.c:456 -#: vips-7.17.1/libsrc/iofuncs/dispatch_types.c:456 #, c-format msgid "bad double \"%s\"" msgstr "" #: libsrc/iofuncs/dispatch_types.c:542 -#: vips-7.17.1/libsrc/iofuncs/dispatch_types.c:542 #, c-format msgid "bad integer \"%s\"" msgstr "" #: libsrc/iofuncs/dispatch_types.c:602 -#: vips-7.17.1/libsrc/iofuncs/dispatch_types.c:602 #, fuzzy msgid "bad format" msgstr "bad colourmap" -#: libsrc/iofuncs/region.c:124 vips-7.17.1/libsrc/iofuncs/region.c:124 +#: libsrc/iofuncs/region.c:124 #, c-format msgid "start function failed for image %s" msgstr "" -#: libsrc/iofuncs/region.c:440 vips-7.17.1/libsrc/iofuncs/region.c:440 +#: libsrc/iofuncs/region.c:440 msgid "bad image type" msgstr "" -#: libsrc/iofuncs/region.c:578 vips-7.17.1/libsrc/iofuncs/region.c:578 +#: libsrc/iofuncs/region.c:578 msgid "bad position" msgstr "" #: libsrc/morphology/im_dilate.c:198 libsrc/morphology/im_erode.c:198 -#: vips-7.17.1/libsrc/morphology/im_dilate.c:198 -#: vips-7.17.1/libsrc/morphology/im_erode.c:198 #, c-format msgid "bad mask element (%d should be 0, 128 or 255)" msgstr "" #: libsrc/morphology/im_dilate.c:256 libsrc/morphology/im_erode.c:252 -#: vips-7.17.1/libsrc/morphology/im_dilate.c:256 -#: vips-7.17.1/libsrc/morphology/im_erode.c:252 msgid "mask size not odd" msgstr "" #: libsrc/morphology/im_dilate.c:266 -#: vips-7.17.1/libsrc/morphology/im_dilate.c:266 msgid "uchar uncoded only" msgstr "" #: libsrc/morphology/im_erode.c:262 -#: vips-7.17.1/libsrc/morphology/im_erode.c:262 msgid "1-band uchar uncoded only" msgstr "" #: libsrc/mosaicing/im_tbmerge.c:651 libsrc/mosaicing/im_lrmerge.c:828 -#: vips-7.17.1/libsrc/mosaicing/im_tbmerge.c:651 -#: vips-7.17.1/libsrc/mosaicing/im_lrmerge.c:828 msgid "too much overlap" msgstr "" #: libsrc/mosaicing/im_tbmerge.c:673 libsrc/mosaicing/im_lrmerge.c:1073 -#: vips-7.17.1/libsrc/mosaicing/im_tbmerge.c:673 -#: vips-7.17.1/libsrc/mosaicing/im_lrmerge.c:1073 msgid "input images incompatible" msgstr "" #: libsrc/mosaicing/im_tbmerge.c:678 libsrc/mosaicing/im_lrmerge.c:1078 -#: vips-7.17.1/libsrc/mosaicing/im_tbmerge.c:678 -#: vips-7.17.1/libsrc/mosaicing/im_lrmerge.c:1078 msgid "inputs not uncoded or IM_CODING_LABQ" msgstr "" #: libsrc/mosaicing/global_balance.c:147 -#: vips-7.17.1/libsrc/mosaicing/global_balance.c:147 msgid "no matching '>'" msgstr "" #: libsrc/mosaicing/global_balance.c:156 -#: vips-7.17.1/libsrc/mosaicing/global_balance.c:156 msgid "too many items" msgstr "" #: libsrc/mosaicing/global_balance.c:452 -#: vips-7.17.1/libsrc/mosaicing/global_balance.c:452 msgid "circularity detected" msgstr "" #: libsrc/mosaicing/global_balance.c:486 libsrc/mosaicing/global_balance.c:542 -#: vips-7.17.1/libsrc/mosaicing/global_balance.c:486 -#: vips-7.17.1/libsrc/mosaicing/global_balance.c:542 #, c-format msgid "image \"%s\" used twice as output" msgstr "" #: libsrc/mosaicing/global_balance.c:591 -#: vips-7.17.1/libsrc/mosaicing/global_balance.c:591 msgid "bad number of args in join line" msgstr "" #: libsrc/mosaicing/global_balance.c:633 -#: vips-7.17.1/libsrc/mosaicing/global_balance.c:633 msgid "bad number of args in join1 line" msgstr "" #: libsrc/mosaicing/global_balance.c:669 -#: vips-7.17.1/libsrc/mosaicing/global_balance.c:669 msgid "bad number of args in copy line" msgstr "" #: libsrc/mosaicing/global_balance.c:727 -#: vips-7.17.1/libsrc/mosaicing/global_balance.c:727 msgid "" "mosaic root not found in desc file\n" "is this really a mosaiced image?" msgstr "" #: libsrc/mosaicing/global_balance.c:738 -#: vips-7.17.1/libsrc/mosaicing/global_balance.c:738 msgid "more than one root" msgstr "" #: libsrc/mosaicing/global_balance.c:1075 -#: vips-7.17.1/libsrc/mosaicing/global_balance.c:1075 msgid "empty overlap!" msgstr "" #: libsrc/mosaicing/im_remosaic.c:108 -#: vips-7.17.1/libsrc/mosaicing/im_remosaic.c:108 #, c-format msgid "substitute image \"%s\" is not the same size as \"%s\"" msgstr "" #: libsrc/mosaicing/im_lrmerge.c:712 -#: vips-7.17.1/libsrc/mosaicing/im_lrmerge.c:712 msgid "mwidth must be -1 or >= 0" msgstr "" #: libsrc/mosaicing/im_lrmerge.c:741 -#: vips-7.17.1/libsrc/mosaicing/im_lrmerge.c:741 msgid "no overlap" msgstr "" #: libsrc/relational/im_ifthenelse.c:170 -#: vips-7.17.1/libsrc/relational/im_ifthenelse.c:170 msgid "then image must be uncoded or labpack" msgstr "" #: libsrc/relational/im_ifthenelse.c:175 -#: vips-7.17.1/libsrc/relational/im_ifthenelse.c:175 msgid "else image must be uncoded or labpack" msgstr "" #: libsrc/relational/im_ifthenelse.c:180 -#: vips-7.17.1/libsrc/relational/im_ifthenelse.c:180 msgid "condition image must be uncoded" msgstr "" #: libsrc/relational/im_ifthenelse.c:186 libsrc/relational/im_blend.c:336 -#: vips-7.17.1/libsrc/relational/im_ifthenelse.c:186 -#: vips-7.17.1/libsrc/relational/im_blend.c:336 msgid "size and format of then and else must match" msgstr "" #: libsrc/relational/im_ifthenelse.c:192 libsrc/relational/im_blend.c:342 -#: vips-7.17.1/libsrc/relational/im_ifthenelse.c:192 -#: vips-7.17.1/libsrc/relational/im_blend.c:342 msgid "conditional image must be uchar" msgstr "" #: libsrc/relational/im_ifthenelse.c:197 libsrc/relational/im_blend.c:347 -#: vips-7.17.1/libsrc/relational/im_ifthenelse.c:197 -#: vips-7.17.1/libsrc/relational/im_blend.c:347 msgid "conditional image must be one band or same as then and else images" msgstr "" #: libsrc/relational/im_blend.c:330 -#: vips-7.17.1/libsrc/relational/im_blend.c:330 msgid "images not uncoded" msgstr "" -#: libsrc/resample/im_affine.c:384 vips-7.17.1/libsrc/resample/im_affine.c:384 +#: libsrc/resample/im_affine.c:384 msgid "output coordinates out of range" msgstr "" #: libsrc/resample/interpolate.c:193 -#: vips-7.17.1/libsrc/resample/interpolate.c:193 msgid "Nearest-neighbour interpolation" msgstr "" #: libsrc/resample/interpolate.c:375 -#: vips-7.17.1/libsrc/resample/interpolate.c:375 msgid "Bilinear interpolation" msgstr "" #: libsrc/video/im_video_v4l1.c:246 -#: vips-7.17.1/libsrc/video/im_video_v4l1.c:246 msgid "no file descriptor" msgstr "" #: libsrc/video/im_video_v4l1.c:251 -#: vips-7.17.1/libsrc/video/im_video_v4l1.c:251 #, c-format msgid "ioctl(0x%x) failed: %s" msgstr "" #: libsrc/video/im_video_v4l1.c:300 -#: vips-7.17.1/libsrc/video/im_video_v4l1.c:300 #, c-format msgid "cannot open video device \"%s\"" msgstr "" #: libsrc/video/im_video_v4l1.c:308 -#: vips-7.17.1/libsrc/video/im_video_v4l1.c:308 msgid "cannot get video capability" msgstr "" #: libsrc/video/im_video_v4l1.c:317 -#: vips-7.17.1/libsrc/video/im_video_v4l1.c:317 msgid "card cannot capture to memory" msgstr "" #: libsrc/video/im_video_v4l1.c:463 -#: vips-7.17.1/libsrc/video/im_video_v4l1.c:463 msgid "unable to map memory" msgstr "" #: libsrc/video/im_video_v4l1.c:475 -#: vips-7.17.1/libsrc/video/im_video_v4l1.c:475 #, c-format msgid "channel not between 0 and %d" msgstr "" #: libsrc/video/im_video_v4l1.c:675 -#: vips-7.17.1/libsrc/video/im_video_v4l1.c:675 msgid "compiled without im_video_v4l1 support" msgstr "" -#: libsrc/video/im_video_test.c:45 vips-7.17.1/libsrc/video/im_video_test.c:45 +#: libsrc/video/im_video_test.c:45 msgid "error requested" msgstr "" -#: src/iofuncs/vips.c:91 vips-7.17.1/src/iofuncs/vips.c:91 +#: src/iofuncs/vips.c:91 msgid "list operations in PACKAGE (or \"all\", \"packages\", \"classes\")" msgstr "" -#: src/iofuncs/vips.c:95 vips-7.17.1/src/iofuncs/vips.c:95 +#: src/iofuncs/vips.c:95 msgid "show usage message for OPERATION" msgstr "" -#: src/iofuncs/vips.c:98 vips-7.17.1/src/iofuncs/vips.c:98 +#: src/iofuncs/vips.c:98 msgid "load PLUGIN" msgstr "" -#: src/iofuncs/vips.c:101 vips-7.17.1/src/iofuncs/vips.c:101 +#: src/iofuncs/vips.c:101 msgid "print link lines for all operations" msgstr "" -#: src/iofuncs/vips.c:103 vips-7.17.1/src/iofuncs/vips.c:103 +#: src/iofuncs/vips.c:103 msgid "print C++ decls for PACKAGE (or \"all\")" msgstr "" -#: src/iofuncs/vips.c:106 vips-7.17.1/src/iofuncs/vips.c:106 +#: src/iofuncs/vips.c:106 msgid "print C++ binding for PACKAGE (or \"all\")" msgstr "" -#: src/iofuncs/vips.c:109 vips-7.17.1/src/iofuncs/vips.c:109 +#: src/iofuncs/vips.c:109 msgid "print im_version_string" msgstr "" -#: src/iofuncs/vips.c:152 vips-7.17.1/src/iofuncs/vips.c:152 +#: src/iofuncs/vips.c:152 #, c-format msgid "no package or function \"%s\"" msgstr "" -#: src/iofuncs/vips.c:884 vips-7.17.1/src/iofuncs/vips.c:884 +#: src/iofuncs/vips.c:884 msgid "- VIPS driver program" msgstr "" -#: src/iofuncs/header.c:77 vips-7.17.1/src/iofuncs/header.c:77 +#: src/iofuncs/header.c:77 msgid "" "print value of FIELD (\"getext\" reads extension block, \"Hist\" reads image " "history)" msgstr "" -#: src/iofuncs/header.c:161 vips-7.17.1/src/iofuncs/header.c:161 +#: src/iofuncs/header.c:161 msgid "- print image header" msgstr "" -#: src/iofuncs/edvips.c:79 vips-7.17.1/src/iofuncs/edvips.c:79 +#: src/iofuncs/edvips.c:79 msgid "set Xsize to N" msgstr "" -#: src/iofuncs/edvips.c:81 vips-7.17.1/src/iofuncs/edvips.c:81 +#: src/iofuncs/edvips.c:81 msgid "set Ysize to N" msgstr "" -#: src/iofuncs/edvips.c:83 vips-7.17.1/src/iofuncs/edvips.c:83 +#: src/iofuncs/edvips.c:83 msgid "set Bands to N" msgstr "" -#: src/iofuncs/edvips.c:85 vips-7.17.1/src/iofuncs/edvips.c:85 +#: src/iofuncs/edvips.c:85 msgid "set BandFmt to F (eg. IM_BANDFMT_UCHAR)" msgstr "" -#: src/iofuncs/edvips.c:87 vips-7.17.1/src/iofuncs/edvips.c:87 +#: src/iofuncs/edvips.c:87 msgid "set Type to T (eg. IM_TYPE_XYZ)" msgstr "" -#: src/iofuncs/edvips.c:89 vips-7.17.1/src/iofuncs/edvips.c:89 +#: src/iofuncs/edvips.c:89 msgid "set Coding to C (eg. IM_CODING_LABQ)" msgstr "" -#: src/iofuncs/edvips.c:91 vips-7.17.1/src/iofuncs/edvips.c:91 +#: src/iofuncs/edvips.c:91 msgid "set Xres to R pixels/mm" msgstr "" -#: src/iofuncs/edvips.c:93 vips-7.17.1/src/iofuncs/edvips.c:93 +#: src/iofuncs/edvips.c:93 msgid "set Yres to R pixels/mm" msgstr "" -#: src/iofuncs/edvips.c:95 vips-7.17.1/src/iofuncs/edvips.c:95 +#: src/iofuncs/edvips.c:95 msgid "set Xoffset to N" msgstr "" -#: src/iofuncs/edvips.c:97 vips-7.17.1/src/iofuncs/edvips.c:97 +#: src/iofuncs/edvips.c:97 msgid "set Yoffset to N" msgstr "" -#: src/iofuncs/edvips.c:99 vips-7.17.1/src/iofuncs/edvips.c:99 +#: src/iofuncs/edvips.c:99 msgid "replace extension block with stdin" msgstr "" -#: src/iofuncs/edvips.c:110 vips-7.17.1/src/iofuncs/edvips.c:110 +#: src/iofuncs/edvips.c:110 #, c-format msgid "'%s' is not a positive integer" msgstr "" -#: src/iofuncs/edvips.c:122 vips-7.17.1/src/iofuncs/edvips.c:122 +#: src/iofuncs/edvips.c:122 msgid "unable to start VIPS" msgstr "" -#: src/iofuncs/edvips.c:125 vips-7.17.1/src/iofuncs/edvips.c:125 +#: src/iofuncs/edvips.c:125 msgid "vipsfile - edit vipsfile header" msgstr "" -#: src/iofuncs/edvips.c:137 vips-7.17.1/src/iofuncs/edvips.c:137 +#: src/iofuncs/edvips.c:137 #, c-format msgid "usage: %s [OPTION...] vipsfile\n" msgstr "" -#: src/iofuncs/edvips.c:144 vips-7.17.1/src/iofuncs/edvips.c:144 +#: src/iofuncs/edvips.c:144 #, c-format msgid "could not open image %s" msgstr "" -#: src/iofuncs/edvips.c:147 vips-7.17.1/src/iofuncs/edvips.c:147 +#: src/iofuncs/edvips.c:147 #, c-format msgid "could not read VIPS header for %s" msgstr "" -#: src/iofuncs/edvips.c:158 vips-7.17.1/src/iofuncs/edvips.c:158 +#: src/iofuncs/edvips.c:158 #, fuzzy, c-format msgid "bad format %s" msgstr "bad colourmap" -#: src/iofuncs/edvips.c:163 vips-7.17.1/src/iofuncs/edvips.c:163 +#: src/iofuncs/edvips.c:163 #, c-format msgid "bad type %s" msgstr "" -#: src/iofuncs/edvips.c:167 vips-7.17.1/src/iofuncs/edvips.c:167 +#: src/iofuncs/edvips.c:167 #, c-format msgid "bad coding %s" msgstr "" -#: src/iofuncs/edvips.c:179 vips-7.17.1/src/iofuncs/edvips.c:179 +#: src/iofuncs/edvips.c:179 #, c-format msgid "could not seek on %s" msgstr "" -#: src/iofuncs/edvips.c:182 vips-7.17.1/src/iofuncs/edvips.c:182 +#: src/iofuncs/edvips.c:182 #, c-format msgid "could not write to %s" msgstr "" -#: src/iofuncs/edvips.c:189 vips-7.17.1/src/iofuncs/edvips.c:189 +#: src/iofuncs/edvips.c:189 msgid "could not get ext data" msgstr "" -#: src/iofuncs/edvips.c:198 vips-7.17.1/src/iofuncs/edvips.c:198 +#: src/iofuncs/edvips.c:198 msgid "could not set extension" msgstr ""