diff --git a/ChangeLog b/ChangeLog index 637b96b9..191c6447 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,38 @@ -24/8/08 fork for stable 7.16 branch +11/10/08 merge 7.16 back into trunk for 7.17.0 + +11/9/08 started 7.16.3 +- oop typo in manpage for im_project() +- doc fixes +- returning non-zero from eval callbacks was not always stopping computation + +11/9/08 started 7.16.2 +- added --without-v4l option +- added -no-undefined to libsrcCC build, so we get a libvipsCC.dll +- removed the swig dependency: we include the generated bindings in the + distribution tarball + +6/9/08 started 7.16.1 +- trigger eval callbacks on tiled tiff write +- added vips as an im_format_t +- added im_format_write()/_read() convenience functions +- more cleanups for the format API, argh +- removed win32/ directory now mingw finally makes DLLs correctly +- removed the windowed spcor for now, it has some edge effects + +24/8/08 branch for 7.16 +- renames and version numbers - load plgs from libdir as well as libdir/vips-x.x for compat - complex -> complex conversion was broken - refstring <-> gstring transforms +- better behaviour with Magick non-presence +- added --enable-links switch to configure ... we no longer make the bin/im_* + links by default +- started a 'format' section in the docs +- configure fails if no gettext found +- revised po/ +- released as 7.16.0! +>>>>>>> .merge-right.r488 25/5/08 fork for loadable image format branch - image load/save in non-vips format code moved to own dir - simple format searching added diff --git a/Makefile.am b/Makefile.am index 2ce6f80d..c3da22fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,6 @@ EXTRA_DIST = \ doc \ benchmark \ bootstrap.sh \ - win32 \ vipsCC-7.${IM_MINOR_VERSION}.pc.in \ vips-7.${IM_MINOR_VERSION}.pc.in \ vips-7.${IM_MINOR_VERSION}.spec.in \ diff --git a/README b/README index 14292f41..3211b68d 100644 --- a/README +++ b/README @@ -35,13 +35,12 @@ If you have problems, read on. Building VIPS on win32 ---------------------- -Probably the easiest route is to use mingw/msys. This provides a GNU-style +The easiest route is to use mingw/msys. This provides a GNU-style build environment for win32. http://www.vips.ecs.soton.ac.uk/index.php?title=Build_on_windows -Alternatively, vips-7.x/win32 contains sample build systems using the -Microsoft toolchain. See the README in there for details. +You can also cross-compile from a unix system to windows. Building VIPS on OS X --------------------- @@ -53,7 +52,7 @@ There are packages in macports. Dependencies ============ -VIPS has to have glib-2.x and libxml-2.0. The build system needs perl, +VIPS has to have gettext, glib-2.x and libxml-2.0. The build system needs pkg-config and gnu make. Optional dependencies @@ -63,13 +62,23 @@ Optional support libraries ... also try ./configure --help to see flags for controlling these libs. By default, if suitable versions are found, VIPS will build support for them automatically. -VIPS looks for stuff in /usr. If you have installed your own versions of -these libraries to /usr/local, vips will not see them. Use switches to VIPS -configure like: +VIPS looks for stuff with pkg-config, so make sure pkg-config can find these +extra libraries. libtiff and libjpeg do not generally use pkg-config, so +VIPS looks for them in the default path and in $prefix. If you have installed +your own versions of these libraries in a different location, vips will not see +them. Use switches to VIPS configure like: - ./configure --prefix=/home/john/vips \ - --with-tiff-includes=/home/john/vips/include \ - --with-tiff-libraries=/home/john/vips/lib + ./configure --prefix=/Users/john/vips \ + --with-tiff-includes=/opt/local/include \ + --with-tiff-libraries=/opt/local/lib \ + --with-jpeg-includes=/opt/local/include \ + --with-jpeg-libraries=/opt/local/lib + +or perhaps: + + CFLAGS="-g -Wall -I/opt/local/include -L/opt/local/lib" \ + CXXFLAGS="-g -Wall -I/opt/local/include -L/opt/local/lib" \ + ./configure --without-python --prefix=/Users/john/vips to get VIPS to see your builds. diff --git a/TODO b/TODO index 25fabe31..fdae92b4 100644 --- a/TODO +++ b/TODO @@ -1,78 +1,32 @@ -- have vips -> gvalue and gvalue -> vips methods in type struct +- update the Portfiles on the mac and on the website from the macports ones - converters need arg flags too, so they know whether it's read or write +WONTFIX for 7.16 +================ - is this enough? maybe +- we shouldn't need to call im_invalidate() in gtkdisp4 :( how can we fix + this? + will im_invalidate() trash the render cache too? +- we should wrap the format API, also im_render*(), see gtkdisp.cc for sample + code -- do we need init functions? maybe for arrays I guess +- have a base VObject class and put the ref stuff in there ... share between + VMask, VDisplay, VImage - should gvalues be inited to a specific type? +- need an im_init_world() for C++ which does cmd-line args too, so C++ progs + can get --vips-progress and stuff automatically - +- examine yafr and add as another interpolation option for im_affine -- we need init functions which are parameterizied for the specific value +- how much slower wouuld we get if we did a function call + switch for + interpolate in im_affine()? it would let us break out the interpolation + stuff from the transformer - im_value_double_init( value, 12.3 ) - - im_value_array_init( value, 4, arrayptr ) - - im_value_image_init( value, im_open( "poop", "r" ) ) - - the problem is that init will generally be done by the app: the app needs to - do the build-vips-value-from-my-data conversion, and since it is doing that - build, it needs to do the free as well - - alternative: init from a GValue? - - then we do GValue -> vips build, so we can free as well - - apps need to do internal -> GValue, then call vips to dispatch - - no point :( and slower - - move all init/free stuff out of type, just have malloc/free with a sizeof - - and perhaps some utility functions to build vips format structures and free - them - - - -- needs docs in vips manual for format stuff I guess - -- operations and jesper's types should all use the new register/unregister - model - - support backwards compat by calling im_operation_register() automatically - if we see a package_table symbol - - have new structs with new fields under new names? eg. jesper wants something - to write to a string - - though we have to pass (almost) the same structs to UIs argh and we can't - change them - - jesper wants to add another field to im_type_desc ... so, keep im_type_desc - as is and define a new struct im_type_t with the extra fields - - when we load a package, call im_type_register with the known fields - - check other use cases eg. nip2, python, c++, vips.c - - reread the plugin section in the vipsmanual and think about compat - - -- junk package system? - - - - plugin init - - const char *g_module_check_init (GModule *) - - null for success, or errormsg +- we need another version of im_affine() with an 'interpolate' option :-( + or maybe have im_interpolate_t as another object which we pass to + im_affine() - more cleanups to the handling of vips format images, esp. we have vips write spread across many files atm @@ -85,12 +39,6 @@ - add new type names, eg. im_region_t, im_image_t etc. and deprecate old names? - - -- when we open with a mmap window and later do im_incheck(), do we remap the - whole file? - - - try libsrc/convolution$ grep -l offsets *.c @@ -98,10 +46,6 @@ could we do the don't calc offsets thing unless bpl; changes thing in more places? -- docs include figures twice! yuk - - fixed? not sure, check again - - unsharp should work on GREY16? should be easy to add GREY16->LABS no, labs is signed short, ranges are all differrent, and the scaling will be @@ -142,6 +86,10 @@ - im_exr2vips can now use c++ api + see TODO notes in openexr read (though they all need more openexr C API) + + consider openexr write + - python startup fails with plugins in vipslib: Fatal Python error: can't initialise module vips @@ -180,10 +128,6 @@ - magick should set some header field for n_frames and frame_height? see also analyze -- see TODO notes in openexr read (though they all need more openexr C API) - - consider openexr write - - im_csv2vips() could use "-" for filename to mean stdin but then we'd have to read to a malloced buffer of some sort rather than an diff --git a/acinclude.m4 b/acinclude.m4 index 04b88674..4a35d012 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -16,7 +16,7 @@ ZIP_INCLUDES="" ZIP_LIBS="" AC_ARG_WITH(zip, -[ --without-zip do not use libz]) + AS_HELP_STRING([--without-zip], [build without libx (default: test)])) # Treat --without-zip like --without-zip-includes --without-zip-libraries. if test "$with_zip" = "no"; then ZIP_INCLUDES=no @@ -24,11 +24,11 @@ if test "$with_zip" = "no"; then fi AC_ARG_WITH(zip-includes, -[ --with-zip-includes=DIR ZIP include files are in DIR], -ZIP_INCLUDES="-I$withval") + AS_HELP_STRING([--with-zip-includes=DIR], [libz includes are in DIR]), + ZIP_INCLUDES="-I$withval") AC_ARG_WITH(zip-libraries, -[ --with-zip-libraries=DIR ZIP libraries are in DIR], -ZIP_LIBS="-L$withval -lz") + AS_HELP_STRING([--with-zip-libraries=DIR], [libz libraries are in DIR]), + ZIP_LIBS="-L$withval -lz") AC_MSG_CHECKING(for ZIP) @@ -134,7 +134,7 @@ TIFF_INCLUDES="" TIFF_LIBS="" AC_ARG_WITH(tiff, -[ --without-tiff do not use libtiff]) + AS_HELP_STRING([--without-tiff], [build without libtiff (default: test)])) # Treat --without-tiff like --without-tiff-includes --without-tiff-libraries. if test "$with_tiff" = "no"; then TIFF_INCLUDES=no @@ -142,11 +142,11 @@ if test "$with_tiff" = "no"; then fi AC_ARG_WITH(tiff-includes, -[ --with-tiff-includes=DIR TIFF include files are in DIR], -TIFF_INCLUDES="-I$withval") + AS_HELP_STRING([--with-tiff-includes=DIR], [libtiff includes are in DIR]), + TIFF_INCLUDES="-I$withval") AC_ARG_WITH(tiff-libraries, -[ --with-tiff-libraries=DIR TIFF libraries are in DIR], -TIFF_LIBS="-L$withval -ltiff") + AS_HELP_STRING([--with-tiff-libraries=DIR], [libtiff libraries are in DIR]), + TIFF_LIBS="-L$withval -ltiff") AC_MSG_CHECKING(for TIFF) @@ -252,7 +252,7 @@ JPEG_INCLUDES="" JPEG_LIBS="" AC_ARG_WITH(jpeg, -[ --without-jpeg do not use libjpeg]) + AS_HELP_STRING([--without-jpeg], [build without libjpeg (default: test)])) # Treat --without-jpeg like --without-jpeg-includes --without-jpeg-libraries. if test "$with_jpeg" = "no"; then JPEG_INCLUDES=no @@ -260,11 +260,11 @@ if test "$with_jpeg" = "no"; then fi AC_ARG_WITH(jpeg-includes, -[ --with-jpeg-includes=DIR JPEG include files are in DIR], -JPEG_INCLUDES="-I$withval") + AS_HELP_STRING([--with-jpeg-includes=DIR], [libjpeg includes are in DIR]), + JPEG_INCLUDES="-I$withval") AC_ARG_WITH(jpeg-libraries, -[ --with-jpeg-libraries=DIR JPEG libraries are in DIR], -JPEG_LIBS="-L$withval -ljpeg") + AS_HELP_STRING([--with-jpeg-libraries=DIR], [libjpeg libraries are in DIR]), + JPEG_LIBS="-L$withval -ljpeg") AC_MSG_CHECKING(for JPEG) @@ -376,7 +376,7 @@ PNG_INCLUDES="" PNG_LIBS="" AC_ARG_WITH(png, -[ --without-png do not use libpng]) + AS_HELP_STRING([--without-png], [build without libpng (default: test)])) # Treat --without-png like --without-png-includes --without-png-libraries. if test "$with_png" = "no"; then PNG_INCLUDES=no @@ -384,13 +384,13 @@ if test "$with_png" = "no"; then fi AC_ARG_WITH(png-includes, -[ --with-png-includes=DIR PNG include files are in DIR], -PNG_INCLUDES="-I$withval") + AS_HELP_STRING([--with-png-includes=DIR], [libpng includes are in DIR]), + PNG_INCLUDES="-I$withval") AC_ARG_WITH(png-libraries, -[ --with-png-libraries=DIR PNG libraries are in DIR], -PNG_LIBS="-L$withval -lpng") + AS_HELP_STRING([--with-png-libraries=DIR], [libpng libraries are in DIR]), + PNG_LIBS="-L$withval -lpng") -AC_MSG_CHECKING(for PNG) +AC_MSG_CHECKING(for libpng) # Look for png.h if test "$PNG_INCLUDES" = ""; then diff --git a/configure.in b/configure.in index 21d18d38..87fcf958 100644 --- a/configure.in +++ b/configure.in @@ -4,8 +4,8 @@ AM_CONFIG_HEADER(config.h) # user-visible library versioning IM_MAJOR_VERSION=7 -IM_MINOR_VERSION=15 -IM_MICRO_VERSION=1 +IM_MINOR_VERSION=17 +IM_MICRO_VERSION=0 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=21 -LIBRARY_REVISION=0 -LIBRARY_AGE=6 +LIBRARY_CURRENT=22 +LIBRARY_REVISION=1 +LIBRARY_AGE=7 AM_INIT_AUTOMAKE($PACKAGE,$VERSION) @@ -130,6 +130,11 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ALL_LINGUAS="en_GB" AM_GLIB_GNU_GETTEXT +# C++ fails to compile mysteriously without gettext ... fail here +if test x"$gt_cv_have_gettext" != x"yes"; then + AC_MSG_ERROR([gettext not found]) +fi + # Checks for libraries. # build list of pkg-config packages we used here @@ -174,6 +179,19 @@ AC_CHECK_LIB(m,hypot,[AC_DEFINE(HAVE_HYPOT,1,[have hypot() in libm.])]) PKG_CHECK_MODULES(REQUIRED, glib-2.0 >= 2.6 gmodule-2.0 >= 2.4 libxml-2.0 gobject-2.0) PACKAGES_USED="$PACKAGES_USED glib-2.0 gmodule-2.0 libxml-2.0 gobject-2.0" +# option to make im_* symlinks +AC_ARG_ENABLE(links, + AS_HELP_STRING([--enable-links], [make links for operations (default: no)])) + +if test x"$enable_links" = x"yes"; then + # tested by src/iofuncs/Makefile.am:install-exec-hook + AM_CONDITIONAL(ENABLE_LINKS, true) + enable_links=yes +else + AM_CONDITIONAL(ENABLE_LINKS, false) + enable_links=no +fi + # option to eval without threads AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], [evaluate with threads (default: yes)])) @@ -216,7 +234,10 @@ if test x"$with_magickpackage" = "x"; then PKG_CHECK_MODULES(MAGICK_WAND, MagickWand, [with_magickpackage=MagickWand], [PKG_CHECK_MODULES(IMAGE_MAGICK, ImageMagick, - [with_magickpackage=ImageMagick],)]) + [with_magickpackage=ImageMagick], + [AC_MSG_WARN([neither MagickWand nor ImageMagick found; disabling Magick support]) + with_magick=no + ])]) fi if test x"$with_magick" != "xno"; then @@ -224,7 +245,7 @@ if test x"$with_magick" != "xno"; then [AC_DEFINE(HAVE_MAGICK,1,[define if you have libMagick installed.]) with_magick=yes PACKAGES_USED="$PACKAGES_USED $with_magickpackage"], - [AC_MSG_WARN([libMagick not found; disabling Magick support]) + [AC_MSG_WARN([$with_magickpackage not found; disabling Magick support]) with_magick=no ]) fi @@ -358,10 +379,19 @@ if test x"$with_libexif" != "xno"; then fi # Look for linux video -# try a compile as well: if we're using icc the header can break -AC_CHECK_HEADER(linux/videodev.h, - AC_TRY_COMPILE([#include ], [struct video_capability vc;], - with_videodev=yes)) +AC_ARG_WITH([v4l], + AS_HELP_STRING([--without-v4l], [build without video4linux (default: test)])) + +if test x"$with_v4l" != "xno"; then + # try a compile as well: if we're using icc the header can break + # even try assigning to vc.type: if this works, surely the header is + # functional + AC_CHECK_HEADER(linux/videodev.h, + [AC_TRY_COMPILE([#include ], + [struct video_capability vc; vc.type = 12], + with_videodev=yes) + ]) +fi if test x"$with_videodev" = x"yes"; then AC_DEFINE(HAVE_VIDEODEV,1,[have video4linux 1]) @@ -388,20 +418,12 @@ if test x"$with_python" != "xno"; then AC_MSG_WARN([Python headers not found])]) fi -# need SWIG too -if test x"$with_python" != "xno"; then - AC_CHECK_PROG(HAVE_SWIG, swig, [yes]) +# we don't check for swig: we include the generated bindings in the +# distribution - if test x"$HAVE_SWIG" != "xyes"; then - with_python=no - AC_MSG_WARN([SWIG not found; disabling Python binding]) - else - with_python=yes - fi -fi - -if test x"$with_python" = "xyes"; then +if test x"$with_python" != x"no"; then AM_CONDITIONAL(HAVE_PYTHON, true) + with_python=yes else AM_CONDITIONAL(HAVE_PYTHON, false) fi @@ -443,9 +465,9 @@ AC_SUBST(VIPS_LIBS) AC_SUBST(PACKAGES_USED) AC_OUTPUT([ - vips-7.15.pc - vipsCC-7.15.pc - vips-7.15.spec + vips-7.16.pc + vipsCC-7.16.pc + vips-7.16.spec Makefile include/vips/version.h include/Makefile @@ -500,6 +522,7 @@ AC_MSG_RESULT([ native win32: $vips_os_win32 open files in binary mode: $vips_binary_open evaluate with threads: $enable_threads +make symlinks for commands in bin: $enable_links * optional packages and modules use fftw3 for FFT: $with_fftw3 diff --git a/doc/src/Makefile b/doc/src/Makefile index 07ca891f..db51c644 100644 --- a/doc/src/Makefile +++ b/doc/src/Makefile @@ -6,6 +6,7 @@ SRC = \ cppintro.tex \ fileformat.tex \ func.tex \ + format.tex \ iosys.tex \ ipio.tex \ mydefs.tex \ @@ -44,6 +45,8 @@ html: mkdir vipsmanual htlatex vipsmanual.tex html.cfg,3 "" -dvipsmanual/ cp -r figs vipsmanual + -rm vipsmanual/figs/*.svg + -rm vipsmanual/*.png .PHONEY: clean clean: diff --git a/doc/src/format.tex b/doc/src/format.tex new file mode 100644 index 00000000..b295b96a --- /dev/null +++ b/doc/src/format.tex @@ -0,0 +1,130 @@ +\section{Image formats} +\label{sec:format} + +VIPS has a simple system for adding support for new image file formats. You +can register a new format and it will automatically be supported by all +the VIPS interfaces. You can ask VIPS to find a format to load a file with, +or to select a image file writer based on a filename. Convenience functions +copy a file to an \verb+IMAGE+, or an \verb+IMAGE+ to a file. + +This is a parallel API to \verb+im_open()+, see \pref{sec:open}. The +format system is useful for images which are large or slow to open, +because you pass a descriptor to write to and so control how and where +the decompressed image is held. \verb+im_open()+ is useful for images in +formats which can be directly read from disc, since you will avoid a copy +operation and can directly control the disc file. The inplace operations +(see \pref{sec:inplace}), for example, will only work directly on disc +images if you use \verb+im_open()+. + +\subsection{How a format is represented} + +See the man page for \verb+im_format+ for full details, but briefly, an image +format consists of the following items: + +\begin{itemize} +\item +A name, a name that can be shows to the user, and a list of possible filename +suffixes (\verb+.tif+, for example) + +\item +A function which tests for a file being in that format, a function which loads +just the header of the file (that is, it reads properties like width and +height and does not read any pixel data) and a function which loads the pixel +data + +\item +A function which will write an IMAGE to a file in the format + +\item +And finally a function which examines a file in the format and returns flags +indicating how VIPS should deal with the file. The only flag in the current +version is one indicating that the file can be opened lazily + +\end{itemize} + +\subsection{The format table} + +VIPS keeps a table of known formats, sorted by insert order and priority. You +register new formats with \verb+im_format_register()+ and, optionally, +unregister with \verb+im_format_unregister()+. You can call these operations +from a plugin's init function. + +Any of the functions may be left NULL and VIPS will try to make do with what +you do supply. Of course a format with all functions as NULL will not be very +useful. + +The priority system is useful if a file can be read by several possible format +loaders. For example, the libMagick loader can read TIFF files, but not as +well as VIPS' native TIFF reader. To make sure the VIPS TIFF reader is tried +first, the libMagick format is given a low priority. Most of the time, you +won't need this. + +A switch to the \verb+vips+ command-line program is handy for listing the +supported formats. Try: + +\begin{verbatim} +vips --list formats +\end{verbatim} + +As an example, \fref{fg:newformat} shows how to register a new format in a +plugin. + +\begin{fig2} +\begin{verbatim} +static const char *my_suffs[] = { ".me", NULL }; + +static int +is_myformat( const char *filename ) +{ + unsigned char buf[2]; + + if( im__get_bytes( filename, buf, 2 ) && + (int) buf[0] == 0xff && + (int) buf[1] == 0xd8 ) + return( 1 ); + + return( 0 ); +} + +char * +g_module_check_init( GModule *self ) +{ + im_format_t *format; + + format = im_format_register( "myformat", + _( "My image format" ), + my_suffs, + is_myformat, + read_myformat_header, + read_myformat_image, + write_myformat, + NULL + }; + im_format_set_priority( format, 100 ); +} +\end{verbatim} +\caption{Registering a format in a plugin} +\label{fg:newformat} +\end{fig2} + +\subsection{Finding a format} + +You can loop over the format table in order with \verb+im_format_map()+. Like +all the map functions in VIPS, this take a function and applies it to every +element in the table until it returns non-zero, or until the table has been +all covered. + +You find an \verb+im_format_t+ to use to open a file with +\verb+im_format_for_file()+. This searches the VIPS format table and returns +the first format whose test function returns true, setting an error message +and returning NULL if no format is found. + +You find a format to write a file with \verb+im_format_for_name()+. This +returns the first format with a save function whose suffix list matches the +suffix of the supplied filename. + +\subsection{Convenience functions} + +A pair of convenience functions, \verb+im_format_write()+ and +\verb+im_format_read()+, will copy an image to and from disc using the +appropriate format. diff --git a/doc/src/func.tex b/doc/src/func.tex index e6cb9fff..6373bfe5 100644 --- a/doc/src/func.tex +++ b/doc/src/func.tex @@ -302,9 +302,11 @@ example% vips -plugin double.plg \ example% \end{verbatim} -If you copy \verb+double.plg+ into your VIPS library area (the directory where -libvips is installed, or \verb+$VIPSHOME/lib+) it will be automatically -loaded by all VIPS programs as they start up. +When VIPS starts up, it looks for a directory in the library directory called +\verb+vips-+, with the vips major and minor versions numbers as extensions, +and loads all files in there with the suffix \verb+.plg+. So for example, on +my machine, the plugin directory is \verb+/usr/lib/vips-7.16+ and any plugins +in that directory are automatically loaded into any VIPS programs on startup. \subsection{A more complicated example} diff --git a/doc/src/iosys.tex b/doc/src/iosys.tex index 42b20171..25ff42d3 100644 --- a/doc/src/iosys.tex +++ b/doc/src/iosys.tex @@ -22,9 +22,10 @@ Before calling any VIPS function, you need to start VIPS up: int im_init_world( const char *argv0 ); \end{verbatim} -The \verb+argv0+ argument is the value of \verb+argv[0]+ your program was passed -by the host operating system. VIPS uses this with \verb+im_guess_prefix()+ -to try to find various VIPS data files. +The \verb+argv0+ argument is the value of \verb+argv[0]+ your +program was passed by the host operating system. VIPS uses this with +\verb+im_guess_prefix()+ and \verb+im_guess_libdir()+ to try to find various +VIPS data files. If you don't call this function, VIPS will call it for you the first time you use a VIPS function. But it won't be able to get the \verb+argv0+ value for @@ -161,9 +162,14 @@ There's also \verb+im_header_map()+ to loop over header fields, and image meta fields as well, see \pref{sec:meta}. \subsection{Opening and closing} +\label{sec:open} -Descriptors are created with \verb+im_open()+. This takes a file name -and a string representing the mode with which the descriptor is to be opened: +Descriptors are created with \verb+im_open()+. You can also read images with +the format system: see \pref{sec:format}. The two APIs are complimentary, +though \verb+im_open()+ is more useful. + +\verb+im_open()+ takes a file name and a string representing the mode with +which the descriptor is to be opened: \begin{verbatim} IMAGE *im_open( const char *filename, diff --git a/doc/src/packages.tex b/doc/src/packages.tex index 72206e63..89921aa1 100644 --- a/doc/src/packages.tex +++ b/doc/src/packages.tex @@ -22,54 +22,54 @@ in the manual pages. \begin{fig2} \begin{verbatim} john% vips --list arithmetic -im_abs - absolute value -im_acostra - acos of image (result in degrees) -im_add - add two images -im_asintra - asin of image (result in degrees) -im_atantra - atan of image (result in degrees) -im_avg - average value of image -im_point_bilinear - interpolate value at single point, linearly -im_bandmean - average image bands -im_ceil - round to smallest integal value not less than -im_cmulnorm - multiply two complex images, normalising output -im_costra - cos of image (angles in degrees) -im_cross_phase - phase of cross power spectrum of two complex images -im_deviate - standard deviation of image -im_divide - divide two images -im_exp10tra - 10^pel of image -im_expntra - x^pel of image -im_expntra_vec - [x,y,z]^pel of image -im_exptra - e^pel of image -im_fav4 - average of 4 images -im_floor - round to largest integal value not greater than -im_gadd - calculate a*in1 + b*in2 + c = outfile -im_invert - photographic negative -im_lintra - calculate a*in + b = outfile -im_linreg - pixelwise linear regression -im_lintra_vec - calculate a*in + b -> out, a and b vectors -im_litecor - calculate max(white)*factor*(in/white), if clip == 1 -im_log10tra - log10 of image -im_logtra - ln of image -im_max - maximum value of image -im_maxpos - position of image max -im_maxpos_avg - position of image max, averagie in case of draw -im_maxpos_vec - position and value of n maxima of image -im_measure - measure averages of a grid of patches -im_min - minimum value of image -im_minpos - position of minimum value of image -im_minpos_vec - position and value of n minima of image -im_multiply - multiply two images -im_powtra - pel^x ofbuildimage -im_powtra_vec - pel^[x,y,z] of image -im_remainder - remainder after integer division -im_remainderconst - remainder after integer division by a constant -im_remainderconst_vec - remainder after integer division by vector -im_rint - round to nearest integal value -im_sign - unit vector in direction of value -im_sintra - sin of image (angles in degrees) -im_stats - many image statistics in one pass -im_subtract - subtract two images -im_tantra - tan of image (angles in degrees) +im_abs - absolute value +im_acostra - acos of image (result in degrees) +im_add - add two images +im_asintra - asin of image (result in degrees) +im_atantra - atan of image (result in degrees) +im_avg - average value of image +im_point_bilinear - interpolate value at single point, linearly +im_bandmean - average image bands +im_ceil - round to smallest integal value not less than +im_cmulnorm - multiply two complex images, normalising output +im_costra - cos of image (angles in degrees) +im_cross_phase - phase of cross power spectrum of two complex images +im_deviate - standard deviation of image +im_divide - divide two images +im_exp10tra - 10^pel of image +im_expntra - x^pel of image +im_expntra_vec - [x,y,z]^pel of image +im_exptra - e^pel of image +im_fav4 - average of 4 images +im_floor - round to largest integal value not greater than +im_gadd - calculate a*in1 + b*in2 + c = outfile +im_invert - photographic negative +im_lintra - calculate a*in + b = outfile +im_linreg - pixelwise linear regression +im_lintra_vec - calculate a*in + b -> out, a and b vectors +im_litecor - calculate max(white)*factor*(in/white), if clip == 1 +im_log10tra - log10 of image +im_logtra - ln of image +im_max - maximum value of image +im_maxpos - position of maximum value of image +im_maxpos_avg - position of maximum value of image, averaging in case of draw +im_maxpos_vec - position and value of n maxima of image +im_measure - measure averages of a grid of patches +im_min - minimum value of image +im_minpos - position of minimum value of image +im_minpos_vec - position and value of n minima of image +im_multiply - multiply two images +im_powtra - pel^x ofbuildimage +im_powtra_vec - pel^[x,y,z] of image +im_remainder - remainder after integer division +im_remainderconst - remainder after integer division by a constant +im_remainderconst_vec - remainder after int division by vector of constants +im_rint - round to nearest integal value +im_sign - unit vector in direction of value +im_sintra - sin of image (angles in degrees) +im_stats - many image statistics in one pass +im_subtract - subtract two images +im_tantra - tan of image (angles in degrees) \end{verbatim} \caption{Arithmetic functions} \label{fg:arithmetic} @@ -93,26 +93,26 @@ condition is true (or false) for a whole image. \begin{fig2} \begin{verbatim} john% vips --list relational -im_blend - use cond image to blend between images in1 and in2 -im_equal - two images equal in value -im_equal_vec - image equals doublevec -im_equalconst - image equals const -im_ifthenelse - use cond image to choose pels from image in1 or in2 -im_less - in1 less than in2 in value -im_less_vec - in less than doublevec -im_lessconst - in less than const -im_lesseq - in1 less than or equal to in2 in value -im_lesseq_vec - in less than or equal to doublevec -im_lesseqconst - in less than or equal to const -im_more - in1 more than in2 in value -im_more_vec - in more than doublevec -im_moreconst - in more than const -im_moreeq - in1 more than or equal to in2 in value -im_moreeq_vec - in more than or equal to doublevec -im_moreeqconst - in more than or equal to const -im_notequal - two images not equal in value -im_notequal_vec - image does not equal doublevec -im_notequalconst - image does not equal const +im_blend - use cond image to blend between images in1 and in2 +im_equal - two images equal in value +im_equal_vec - image equals doublevec +im_equalconst - image equals const +im_ifthenelse - use cond image to choose pels from image in1 or in2 +im_less - in1 less than in2 in value +im_less_vec - in less than doublevec +im_lessconst - in less than const +im_lesseq - in1 less than or equal to in2 in value +im_lesseq_vec - in less than or equal to doublevec +im_lesseqconst - in less than or equal to const +im_more - in1 more than in2 in value +im_more_vec - in more than doublevec +im_moreconst - in more than const +im_moreeq - in1 more than or equal to in2 in value +im_moreeq_vec - in more than or equal to doublevec +im_moreeqconst - in more than or equal to const +im_notequal - two images not equal in value +im_notequal_vec - image does not equal doublevec +im_notequalconst - image does not equal const \end{verbatim} \caption{Relational functions} \label{fg:relational} @@ -130,17 +130,17 @@ the relational and morphological functions. You can use \begin{fig2} \begin{verbatim} john% vips --list boolean -im_andimage - bitwise and of two images -im_andimageconst - bitwise and of an image with a constant -im_andimage_vec - bitwise and of an image with a vector constant -im_orimage - bitwise or of two images -im_orimageconst - bitwise or of an image with a constant -im_orimage_vec - bitwise or of an image with a vector constant -im_eorimage - bitwise eor of two images -im_eorimageconst - bitwise eor of an image with a constant -im_eorimage_vec - bitwise eor of an image with a vector constant -im_shiftleft - shift integer image n bits to left -im_shiftright - shift integer image n bits to right +im_andimage - bitwise and of two images +im_andimageconst - bitwise and of an image with a constant +im_andimage_vec - bitwise and of an image with a vector constant +im_orimage - bitwise or of two images +im_orimageconst - bitwise or of an image with a constant +im_orimage_vec - bitwise or of an image with a vector constant +im_eorimage - bitwise eor of two images +im_eorimageconst - bitwise eor of an image with a constant +im_eorimage_vec - bitwise eor of an image with a vector constant +im_shiftleft - shift integer image n bits to left +im_shiftright - shift integer image n bits to right \end{verbatim} \caption{Boolean functions} \label{fg:boolean} @@ -229,48 +229,48 @@ or \verb+disp+ colour space. \begin{fig2} \begin{verbatim} example% vips --list colour -im_LCh2Lab - convert LCh to Lab -im_LCh2UCS - convert LCh to UCS -im_Lab2LCh - convert Lab to LCh -im_Lab2LabQ - convert Lab to LabQ -im_Lab2LabS - convert Lab to LabS -im_Lab2UCS - convert Lab to UCS -im_Lab2XYZ - convert D65 Lab to XYZ -im_Lab2XYZ_temp - convert Lab to XYZ, with a specified colour temperature -im_Lab2disp - convert Lab to displayable -im_LabQ2LabS - convert LabQ to LabS -im_LabQ2Lab - convert LabQ to Lab -im_LabQ2XYZ - convert LabQ to XYZ -im_LabQ2disp - convert LabQ to displayable -im_LabS2LabQ - convert LabS to LabQ -im_LabS2Lab - convert LabS to Lab -im_UCS2LCh - convert UCS to LCh -im_UCS2Lab - convert UCS to Lab -im_UCS2XYZ - convert UCS to XYZ -im_XYZ2Lab - convert D65 XYZ to Lab -im_XYZ2Lab_temp - convert XYZ to Lab, with a specified colour temperature -im_XYZ2UCS - convert XYZ to UCS -im_XYZ2Yxy - convert XYZ to Yxy -im_XYZ2disp - convert XYZ to displayble -im_XYZ2sRGB - convert XYZ to sRGB -im_Yxy2XYZ - convert Yxy to XYZ -im_dE00_fromLab - calculate delta-E CIE2000 for two Lab images -im_dECMC_fromLab - calculate delta-E CMC(1:1) for two Lab images -im_dECMC_fromdisp - calculate delta-E CMC(1:1) for two displayable images -im_dE_fromLab - calculate delta-E for two Lab images -im_dE_fromXYZ - calculate delta-E for two XYZ images -im_dE_fromdisp - calculate delta-E for two displayable images -im_disp2Lab - convert displayable to Lab -im_disp2XYZ - convert displayable to XYZ -im_icc_ac2rc - convert LAB from AC to RC using a profile -im_icc_export - convert LAB to 8-bit device with a profile -im_icc_export_depth - convert LAB to device with a profile -im_icc_import - convert device to LAB with a profile -im_icc_import_embedded - convert device to LAB using the embedded profile -im_icc_present - test for presence of ICC library -im_icc_transform - convert between two device images with a pair of profiles -im_lab_morph - morph colourspace of a LAB image -im_sRGB2XYZ - convert sRGB to XYZ +im_LCh2Lab - convert LCh to Lab +im_LCh2UCS - convert LCh to UCS +im_Lab2LCh - convert Lab to LCh +im_Lab2LabQ - convert Lab to LabQ +im_Lab2LabS - convert Lab to LabS +im_Lab2UCS - convert Lab to UCS +im_Lab2XYZ - convert D65 Lab to XYZ +im_Lab2XYZ_temp - convert Lab to XYZ, with a specified colour temperature +im_Lab2disp - convert Lab to displayable +im_LabQ2LabS - convert LabQ to LabS +im_LabQ2Lab - convert LabQ to Lab +im_LabQ2XYZ - convert LabQ to XYZ +im_LabQ2disp - convert LabQ to displayable +im_LabS2LabQ - convert LabS to LabQ +im_LabS2Lab - convert LabS to Lab +im_UCS2LCh - convert UCS to LCh +im_UCS2Lab - convert UCS to Lab +im_UCS2XYZ - convert UCS to XYZ +im_XYZ2Lab - convert D65 XYZ to Lab +im_XYZ2Lab_temp - convert XYZ to Lab, with a specified colour temperature +im_XYZ2UCS - convert XYZ to UCS +im_XYZ2Yxy - convert XYZ to Yxy +im_XYZ2disp - convert XYZ to displayble +im_XYZ2sRGB - convert XYZ to sRGB +im_Yxy2XYZ - convert Yxy to XYZ +im_dE00_fromLab - calculate delta-E CIE2000 for two Lab images +im_dECMC_fromLab - calculate delta-E CMC(1:1) for two Lab images +im_dECMC_fromdisp - calculate delta-E CMC(1:1) for two displayable images +im_dE_fromLab - calculate delta-E for two Lab images +im_dE_fromXYZ - calculate delta-E for two XYZ images +im_dE_fromdisp - calculate delta-E for two displayable images +im_disp2Lab - convert displayable to Lab +im_disp2XYZ - convert displayable to XYZ +im_icc_ac2rc - convert LAB from AC to RC using an ICC profile +im_icc_export - convert a float LAB to an 8-bit device image with an ICC profile +im_icc_export_depth - convert a float LAB to device space with an ICC profile +im_icc_import - convert a device image to float LAB with an ICC profile +im_icc_import_embedded - convert a device image to float LAB using the embedded profile +im_icc_present - test for presence of ICC library +im_icc_transform - convert between two device images with a pair of ICC profiles +im_lab_morph - morph colourspace of a LAB image +im_sRGB2XYZ - convert sRGB to XYZ \end{verbatim} \caption{Colour functions} \label{fg:colour} @@ -294,59 +294,50 @@ join of many images at the same time. See the manual pages. \begin{fig2} \begin{verbatim} example% vips --list conversion -im_bandjoin - bandwise join of two images -im_bernd - extract from pyramid as jpeg -im_black - generate black image -im_c2amph - convert real and imaginary to phase and amplitude -im_c2imag - extract imaginary part of complex image -im_c2ps - find power spectrum of complex image -im_c2real - extract real part of complex image -im_c2rect - convert phase and amplitude to real and imaginary -im_clip2c - convert to signed 8-bit integer -im_clip2cm - convert to complex -im_clip2d - convert to double-precision float -im_clip2dcm - convert to double complex -im_clip2f - convert to single-precision float -im_clip2fmt - convert image format to ofmt -im_clip2i - convert to signed 32-bit integer -im_clip2s - convert to signed 16-bit integer -im_clip2ui - convert to unsigned 32-bit integer -im_clip2us - convert to unsigned 16-bit integer -im_clip - convert to unsigned 8-bit integer -im_copy - copy image -im_copy_morph - copy image, setting pixel layout -im_copy_swap - copy image, swapping byte order -im_copy_set - copy image, setting informational fields -im_copy_set_meta - copy image, setting a meta field -im_csv2vips - read a file in csv format -im_extract_area - extract area +im_bandjoin - bandwise join of two images +im_bernd - extract from pyramid as jpeg +im_black - generate black image +im_c2amph - convert real and imaginary to phase and amplitude +im_c2imag - extract imaginary part of complex image +im_c2ps - find power spectrum of complex image +im_c2real - extract real part of complex image +im_c2rect - convert phase and amplitude to real and imaginary +im_clip2c - convert to signed 8-bit integer +im_clip2cm - convert to complex +im_clip2d - convert to double-precision float +im_clip2dcm - convert to double complex +im_clip2f - convert to single-precision float +im_clip2fmt - convert image format to ofmt +im_clip2i - convert to signed 32-bit integer +im_clip2s - convert to signed 16-bit integer +im_clip2ui - convert to unsigned 32-bit integer +im_clip2us - convert to unsigned 16-bit integer +im_clip - convert to unsigned 8-bit integer +im_copy - copy image +im_copy_morph - copy image, setting pixel layout +im_copy_swap - copy image, swapping byte order +im_copy_set - copy image, setting informational fields +im_copy_set_meta - copy image, setting a meta field +im_extract_area - extract area im_extract_areabands - extract area and bands -im_extract_band - extract band -im_extract_bands - extract several bands -im_extract - extract area/band -im_falsecolour - turn luminance changes into chrominance changes -im_fliphor - flip image left-right -im_flipver - flip image top-bottom -im_gbandjoin - bandwise join of many images -im_grid - chop a tall thin image into a grid of images -im_insert - insert sub-image into main image at position -im_insert_noexpand - insert sub-image into main image at position, no -expansion -im_jpeg2vips - convert from jpeg -im_lrjoin - join two images left-right -im_magick2vips - load file with libMagick -im_mask2vips - convert DOUBLEMASK to VIPS image -im_msb - convert to uchar by discarding bits -im_msb_band - convert to single band uchar by discarding bits -im_png2vips - convert PNG file to VIPS image -im_exr2vips - convert an OpenEXR file to VIPS -im_ppm2vips - read a file in pbm/pgm/ppm format -im_analyze2vips - read a file in analyze format -im_print - print string to stdout -im_recomb - linear recombination with mask -im_replicate - replicate an image horizontally and vertically -im_ri2c - join two non-complex images to form complex -im_rot180 - rotate image 180 degrees +im_extract_band - extract band +im_extract_bands - extract several bands +im_extract - extract area/band +im_falsecolour - turn luminance changes into chrominance changes +im_fliphor - flip image left-right +im_flipver - flip image top-bottom +im_gbandjoin - bandwise join of many images +im_grid - chop a tall thin image into a grid of images +im_insert - insert sub-image into main image at position +im_insert_noexpand - insert sub-image into main image at position, no expansion +im_lrjoin - join two images left-right +im_mask2vips - convert DOUBLEMASK to VIPS image +im_msb - convert to uchar by discarding bits +im_msb_band - convert to single band uchar by discarding bits +im_print - print string to stdout +im_recomb - linear recombination with mask +im_replicate - replicate an image horizontally and vertically +im_ri2c - join two non-complex images to form complex \end{verbatim} \caption{Conversion functions} \label{fg:conversion} @@ -354,27 +345,21 @@ im_rot180 - rotate image 180 degrees \begin{fig2} \begin{verbatim} -im_rot270 - rotate image 270 degrees clockwise -im_rot90 - rotate image 90 degrees clockwise -im_scale - scale image linearly to fit range 0-255 -im_scaleps - logarithmic scale of image to fit range 0-255 -im_rightshift_size - decrease size by a power-of-two factor -im_slice - slice an image using two thresholds -im_subsample - subsample image by integer factors -im_system - run command on image -im_tbjoin - join two images top-bottom -im_text - generate text image -im_thresh - slice an image at a threshold -im_tiff2vips - convert TIFF file to VIPS image -im_vips2csv - write an image in csv format -im_vips2jpeg - convert to jpeg -im_vips2mask - convert VIPS image to DOUBLEMASK -im_vips2mimejpeg - convert to jpeg as mime type on stdout -im_vips2png - convert VIPS image to PNG file -im_vips2ppm - write a file in pbm/pgm/ppm format -im_vips2tiff - convert VIPS image to TIFF file -im_wrap - shift image origin, wrapping at sides -im_zoom - simple zoom of an image by integer factors +im_rot180 - rotate image 180 degrees +im_rot270 - rotate image 270 degrees clockwise +im_rot90 - rotate image 90 degrees clockwise +im_scale - scale image linearly to fit range 0-255 +im_scaleps - logarithmic scale of image to fit range 0-255 +im_rightshift_size - decrease size by a power-of-two factor +im_slice - slice an image using two thresholds +im_subsample - subsample image by integer factors +im_system - run command on image +im_tbjoin - join two images top-bottom +im_text - generate text image +im_thresh - slice an image at a threshold +im_vips2mask - convert VIPS image to DOUBLEMASK +im_wrap - shift image origin, wrapping at sides +im_zoom - simple zoom of an image by integer factors \end{verbatim} \caption{Conversion functions (cont.)} \end{fig2} @@ -483,55 +468,55 @@ expect. \begin{fig2} \begin{verbatim} example% vips --list convolution -im_addgnoise - add gaussian noise with mean 0 and std. dev. sigma -im_compass - convolve with 8-way rotating integer mask -im_contrast_surface - find high-contrast points in an image +im_addgnoise - add gaussian noise with mean 0 and std. dev. sigma +im_compass - convolve with 8-way rotating integer mask +im_contrast_surface - find high-contrast points in an image im_contrast_surface_raw - find high-contrast points in an image -im_conv - convolve -im_conv_raw - convolve, no border -im_convf - convolve, with DOUBLEMASK -im_convf_raw - convolve, with DOUBLEMASK, no border -im_convsep - seperable convolution -im_convsep_raw - seperable convolution, no border -im_convsepf - seperable convolution, with DOUBLEMASK -im_convsepf_raw - seperable convolution, with DOUBLEMASK, no border -im_convsub - convolve uchar to uchar, sub-sampling by xskip, yskip -im_dmask_xsize - horizontal size of a doublemask -im_dmask_ysize - vertical size of a doublemask -im_embed - embed in within a set of borders -im_fastcor - fast correlate in2 within in1 -im_fastcor_raw - fast correlate in2 within in1, no border -im_gauss_dmask - generate gaussian DOUBLEMASK -im_gauss_imask - generate gaussian INTMASK -im_gaussnoise - generate gaussian noise with specified statistics -im_grad_x - horizontal difference image -im_grad_y - vertical difference image -im_gradcor - unnormalised correlation of gradient -im_gradcor_raw - unnormalised correlation of gradient, no padding -im_gradient - convolve with 2-way rotating mask -im_imask_xsize - horizontal size of an intmask -im_imask_ysize - vertical size of an intmask -im_rank_image - point-wise pixel rank -im_lindetect - convolve with 4-way rotating mask -im_log_dmask - generate laplacian of gaussian DOUBLEMASK -im_log_imask - generate laplacian of gaussian INTMASK -im_maxvalue - point-wise maximum value -im_mpercent - find threshold above which there are percent values -im_phasecor_fft - non-normalised correlation of gradient of in2 within in1 -im_rank - rank filter nth element of xsize/ysize window -im_rank_raw - rank filter nth element of xsize/ysize window, no border -im_read_dmask - read matrix of double from file -im_resize_linear - resize to X by Y pixels with linear interpolation -im_rotate_dmask45 - rotate DOUBLEMASK clockwise by 45 degrees -im_rotate_dmask90 - rotate DOUBLEMASK clockwise by 90 degrees -im_rotate_imask45 - rotate INTMASK clockwise by 45 degrees -im_rotate_imask90 - rotate INTMASK clockwise by 90 degrees -im_sharpen - sharpen high frequencies of L channel of LabQ -im_shrink - shrink image by xfac, yfac times -im_spcor - normalised correlation of in2 within in1 -im_spcor_raw - normalised correlation of in2 within in1, no padding -im_stretch3 - stretch 3%, sub-pixel displace by xdisp/ydisp -im_zerox - find +ve or -ve zero crossings in image +im_conv - convolve +im_conv_raw - convolve, no border +im_convf - convolve, with DOUBLEMASK +im_convf_raw - convolve, with DOUBLEMASK, no border +im_convsep - seperable convolution +im_convsep_raw - seperable convolution, no border +im_convsepf - seperable convolution, with DOUBLEMASK +im_convsepf_raw - seperable convolution, with DOUBLEMASK, no border +im_convsub - convolve uchar to uchar, sub-sampling by xskip, yskip +im_dmask_xsize - horizontal size of a doublemask +im_dmask_ysize - vertical size of a doublemask +im_embed - embed in within a set of borders +im_fastcor - fast correlate in2 within in1 +im_fastcor_raw - fast correlate in2 within in1, no border +im_gauss_dmask - generate gaussian DOUBLEMASK +im_gauss_imask - generate gaussian INTMASK +im_gaussnoise - generate image of gaussian noise with specified statistics +im_grad_x - horizontal difference image +im_grad_y - vertical difference image +im_gradcor - non-normalised correlation of gradient of in2 within in1 +im_gradcor_raw - non-normalised correlation of gradient of in2 within in1, no padding +im_gradient - convolve with 2-way rotating mask +im_imask_xsize - horizontal size of an intmask +im_imask_ysize - vertical size of an intmask +im_rank_image - point-wise pixel rank +im_lindetect - convolve with 4-way rotating mask +im_log_dmask - generate laplacian of gaussian DOUBLEMASK +im_log_imask - generate laplacian of gaussian INTMASK +im_maxvalue - point-wise maximum value +im_mpercent - find threshold above which there are percent values +im_phasecor_fft - non-normalised correlation of gradient of in2 within in1 +im_rank - rank filter nth element of xsize/ysize window +im_rank_raw - rank filter nth element of xsize/ysize window, no border +im_read_dmask - read matrix of double from file +im_resize_linear - resize to X by Y pixels with linear interpolation +im_rotate_dmask45 - rotate DOUBLEMASK clockwise by 45 degrees +im_rotate_dmask90 - rotate DOUBLEMASK clockwise by 90 degrees +im_rotate_imask45 - rotate INTMASK clockwise by 45 degrees +im_rotate_imask90 - rotate INTMASK clockwise by 90 degrees +im_sharpen - sharpen high frequencies of L channel of LabQ +im_shrink - shrink image by xfac, yfac times +im_spcor - normalised correlation of in2 within in1 +im_spcor_raw - normalised correlation of in2 within in1, no black padding +im_stretch3 - stretch 3%, sub-pixel displace by xdisp/ydisp +im_zerox - find +ve or -ve zero crossings in image \end{verbatim} \caption{Convolution functions} \label{fg:convolution} @@ -627,32 +612,32 @@ functions are useful combinations of these basic operations. \begin{fig2} \begin{verbatim} example% vips --list histograms_lut -im_gammacorrect - gamma-correct image -im_heq - histogram-equalise image -im_hist - find and graph histogram of image -im_histcum - turn histogram to cumulative histogram -im_histeq - form histogram equalistion LUT -im_histgr - find histogram of image -im_histnD - find 1D, 2D or 3D histogram of image -im_histnorm - form normalised histogram -im_histplot - plot graph of histogram -im_histspec - find histogram which will make pdf of in match ref -im_hsp - match stats of in to stats of ref -im_identity - generate identity histogram -im_identity_ushort - generate ushort identity histogram -im_ismonotonic - test LUT for monotonicity -im_lhisteq - local histogram equalisation -im_lhisteq_raw - local histogram equalisation, no border -im_invertlut - generate correction table from set of measures -im_buildlut - generate LUT table from set of x/y positions -im_maplut - map image through LUT -im_project - find horizontal and vertical projections of an image -im_stdif - statistical differencing -im_stdif_raw - statistical differencing, no border -im_tone_analyse - analyse in and create LUT for tone adjustment -im_tone_build - create LUT for tone adjustment of LabS images -im_tone_build_range - create LUT for tone adjustment -im_tone_map - map L channel of LabS or LabQ image through LUT +im_gammacorrect - gamma-correct image +im_heq - histogram-equalise image +im_hist - find and graph histogram of image +im_histcum - turn histogram to cumulative histogram +im_histeq - form histogram equalistion LUT +im_histgr - find histogram of image +im_histnD - find 1D, 2D or 3D histogram of image +im_histnorm - form normalised histogram +im_histplot - plot graph of histogram +im_histspec - find histogram which will make pdf of in match ref +im_hsp - match stats of in to stats of ref +im_identity - generate identity histogram +im_identity_ushort - generate ushort identity histogram +im_ismonotonic - test LUT for monotonicity +im_lhisteq - local histogram equalisation +im_lhisteq_raw - local histogram equalisation, no border +im_invertlut - generate correction table from set of measures +im_buildlut - generate LUT table from set of x/y positions +im_maplut - map image through LUT +im_project - find horizontal and vertical projections of an image +im_stdif - statistical differencing +im_stdif_raw - statistical differencing, no border +im_tone_analyse - analyse in and create LUT for tone adjustment +im_tone_build - create LUT for tone adjustment of LabS images +im_tone_build_range - create LUT for tone adjustment +im_tone_map - map L channel of LabS or LabQ image through LUT \end{verbatim} \caption{Histogram/LUT functions} \label{fg:hist} @@ -760,26 +745,27 @@ images. \begin{fig2} \begin{verbatim} example% vips --list mosaicing -im_affine - affine transform -im_align_bands - align the bands of an image -im_correl - search area around sec for match for area around ref -im__find_lroverlap - search for left-right overlap of ref and sec -im__find_tboverlap - search for top-bottom overlap of ref and sec -im_global_balance - automatically rebuild mosaic with balancing -im_global_balancef - automatically rebuild mosaic with balancing, float output -im_lrmerge - left-right merge of in1 and in2 -im_lrmerge1 - first-order left-right merge of ref and sec -im_lrmosaic - left-right mosaic of ref and sec -im_lrmosaic1 - first-order left-right mosaic of ref and sec -im_match_linear - resample ref so that tie-points match +im_affine - affine transform +im_align_bands - align the bands of an image +im_correl - search area around sec for match for area around ref +im__find_lroverlap - search for left-right overlap of ref and sec +im__find_tboverlap - search for top-bottom overlap of ref and sec +im_global_balance - automatically rebuild mosaic with balancing +im_global_balancef - automatically rebuild mosaic with balancing, float output +im_lrmerge - left-right merge of in1 and in2 +im_lrmerge1 - first-order left-right merge of ref and sec +im_lrmosaic - left-right mosaic of ref and sec +im_lrmosaic1 - first-order left-right mosaic of ref and sec +im_match_linear - resample ref so that tie-points match im_match_linear_search - search sec, then resample so that tie-points match -im_remosaic - automatically rebuild mosaic with new files -im_similarity_area - output area xywh of similarity transformation -im_similarity - similarity transformation -im_tbmerge - top-bottom merge of in1 and in2 -im_tbmerge1 - first-order top-bottom merge of in1 and in2 -im_tbmosaic - top-bottom mosaic of in1 and in2 -im_tbmosaic1 - first-order top-bottom mosaic of ref and sec +im_maxpos_subpel - subpixel position of maximum of (phase correlation) image +im_remosaic - automatically rebuild mosaic with new files +im_similarity_area - output area xywh of similarity transformation +im_similarity - similarity transformation +im_tbmerge - top-bottom merge of in1 and in2 +im_tbmerge1 - first-order top-bottom merge of in1 and in2 +im_tbmosaic - top-bottom mosaic of in1 and in2 +im_tbmosaic1 - first-order top-bottom mosaic of ref and sec \end{verbatim} \caption{Mosaic functions} \label{fg:mosaicing} @@ -852,3 +838,32 @@ im_version_string - VIPS version string \caption{IO functions} \label{fg:io} \end{fig2} + +\subsection{Format functions} + +See \fref{fg:format}. + +These functions convert to and from various image formats. See +\pref{sec:format} for a nice API over these functions. + +\begin{fig2} +\begin{verbatim} +example% vips --list format +im_csv2vips - read a file in csv format +im_jpeg2vips - convert from jpeg +im_magick2vips - load file with libMagick +im_png2vips - convert PNG file to VIPS image +im_exr2vips - convert an OpenEXR file to VIPS +im_ppm2vips - read a file in pbm/pgm/ppm format +im_analyze2vips - read a file in analyze format +im_tiff2vips - convert TIFF file to VIPS image +im_vips2csv - write an image in csv format +im_vips2jpeg - convert to jpeg +im_vips2mimejpeg - convert to jpeg as mime type on stdout +im_vips2png - convert VIPS image to PNG file +im_vips2ppm - write a file in pbm/pgm/ppm format +im_vips2tiff - convert VIPS image to TIFF file +\end{verbatim} +\caption{Format functions} +\label{fg:format} +\end{fig2} diff --git a/doc/src/vimage.tex b/doc/src/vimage.tex index edc55257..b1438ca6 100644 --- a/doc/src/vimage.tex +++ b/doc/src/vimage.tex @@ -121,33 +121,14 @@ example: VImage out( "jen.tif:deflate", "w" ); \end{verbatim} -\noindent - \noindent Writing to the descriptor \verb+out+ will cause a TIFF image to be written to disc with deflate compression. See the manual page for \verb+im_open(3)+ for details of all the file formats -and conversions available. - -\subsection{Large files} - -Opening large files in formats like JPEG which do not support random access -can use large amounts of memory, since the file has to be decompressed before -it can be used. - -The \verb+convert2disc()+ member lets you decompress to a disc file rather -than to memory. For example: - -\begin{verbatim} -VImage fred = VImage::convert2disc( "im_jpeg2vips", - "file.jpg", "temp.v" ); -\end{verbatim} - -\noindent -Will decompress to the file \verb+temp.v+, then open that and return a -reference to it. You will need to delete the file once you are finished with -it. +and conversions available. See the man page for \verb+im_format(3)+ for a +lower-level API which lets you control more of the detail of reading and +writing data and is more suitable for large files. \subsection{Projection functions} @@ -313,6 +294,18 @@ The \verb+VImage+ object to which you apply the member function is the first input image, the member function returns the first output. If there is no image input, the member is declared \verb+static+. +For example, \verb+im_project(3)+ returns two images. You can call it from +Python like this: + +\begin{verbatim} +hout = VImage.VImage () +vout = im.project (hout) +\end{verbatim} + +\noindent +In other words, \verb+.project()+ writes the second result to the +\verb+VImage+ you pass as an argument. + \item \verb+INTMASK+ and \verb+DOUBLEMASK+ types become \verb+VMask+ objects, \verb+im_col_display+ types become \verb+VDisplay+ objects. diff --git a/doc/src/vipsmanual.tex b/doc/src/vipsmanual.tex index 852914d5..30750e1c 100644 --- a/doc/src/vipsmanual.tex +++ b/doc/src/vipsmanual.tex @@ -72,6 +72,7 @@ This manual formatted \today \input{applintro} \input{iosys} \input{func} +\input{format} \chapter{Writing VIPS operations} diff --git a/include/vips/Makefile.am b/include/vips/Makefile.am index ae001997..eef7dfab 100644 --- a/include/vips/Makefile.am +++ b/include/vips/Makefile.am @@ -8,7 +8,6 @@ pkginclude_HEADERS = \ debug.h \ dispatch.h \ format.h \ - type.h \ fmask.h \ mosaic.h \ proto.h \ diff --git a/include/vips/VImage.h b/include/vips/VImage.h index 21e61b24..060eb392 100644 --- a/include/vips/VImage.h +++ b/include/vips/VImage.h @@ -201,7 +201,8 @@ public: // "file.jpg", "temp.v" ); // Runs im_jpeg2vips to the temp file, then opens that and returns // it. Useful for opening very large files without using a lot of RAM. - // FIXME ... what a hack, replace this with something better + // Now superceeded by the format API, though that's not yet wrapped in + // C++ static VImage convert2disc( const char* convert, const char* in, const char* disc ) throw( VError ); diff --git a/include/vips/format.h b/include/vips/format.h index 324c2fea..42423c79 100644 --- a/include/vips/format.h +++ b/include/vips/format.h @@ -80,6 +80,11 @@ void *im_format_map( VSListMap2Fn fn, void *a, void *b ); im_format_t *im_format_for_file( const char *filename ); im_format_t *im_format_for_name( const char *filename ); +/* Write an image convenience function. + */ +int im_format_read( const char *name, IMAGE *out ); +int im_format_write( IMAGE *im, const char *name ); + #ifdef __cplusplus } #endif /*__cplusplus*/ diff --git a/include/vips/vips.h b/include/vips/vips.h index bd37a83e..2c962dbc 100644 --- a/include/vips/vips.h +++ b/include/vips/vips.h @@ -495,7 +495,6 @@ typedef struct { /* #include */ #include #include -#include #include #include #include diff --git a/libsrc/Makefile.am b/libsrc/Makefile.am index 45f62199..8c35ae58 100644 --- a/libsrc/Makefile.am +++ b/libsrc/Makefile.am @@ -56,20 +56,9 @@ libvips_la_LIBADD = \ video/libvideo.la \ @VIPS_LIBS@ -# use "-no-undefined" because we need to be able to generate dlls as well - -# commented out -# -no-undefined -# because I can't get libtool DLL builds working :-( - libvips_la_LDFLAGS = \ -no-undefined \ -version-info @LIBRARY_CURRENT@:@LIBRARY_REVISION@:@LIBRARY_AGE@ -vips.def: - ./makedef.pl $(prefix) > vips.def - EXTRA_DIST = \ - vips.def \ - makedef.pl \ $(C_DIST_DIR) diff --git a/libsrc/arithmetic/im_maxpos.c b/libsrc/arithmetic/im_maxpos.c index 32cd8284..1c2ce831 100644 --- a/libsrc/arithmetic/im_maxpos.c +++ b/libsrc/arithmetic/im_maxpos.c @@ -146,5 +146,6 @@ im_maxpos( IMAGE *in, int *xpos, int *ypos, double *out ) *out = m; *xpos = xp / in->Bands; *ypos = yp; + return( 0 ); } diff --git a/libsrc/convolution/im_spcor.c b/libsrc/convolution/im_spcor.c index 77d16029..9de590c9 100644 --- a/libsrc/convolution/im_spcor.c +++ b/libsrc/convolution/im_spcor.c @@ -31,7 +31,7 @@ * - partialed * - speed-ups * - new correlation coefficient (see above), from Niblack "An - * Introduction to Digital Image Processing,", Prentice/Hall, pp 138. + * Introduction to Digital Image Processing", Prentice/Hall, pp 138. * 4/9/97 JC * - now does short/ushort as well * 13/2/03 JC @@ -45,7 +45,9 @@ * - add im_spcor2 * * 2007-11-12 tcv - * - make im_spcor a wrapper selecting either im__spcor1 or im__spcor2 + * - make im_spcor a wrapper selecting either im__spcor or im__spcor2 + * 2008-09-09 JC + * - roll back the windowed version for now, it has some tile edge effects */ /* @@ -90,43 +92,15 @@ #include #endif /*WITH_DMALLOC*/ -/* Hold global stuff here. +/* Hold per-call state here. */ typedef struct { IMAGE *ref; /* Image we are searching for */ double rmean; /* Mean of search window */ double c1; /* sqrt(sumij (ref(i,j)-mean(ref))^2) */ -} SpcorInfo; +} Spcor; -typedef struct { - - REGION *f; - int *f_cols; - size_t max_cols; - -} spcor2_seq; - -typedef struct { - - IMAGE *w; - gint64 area; - double recip_area; - double mean; - double n_var; - -} spcor2_w_inf; - -static void *spcor2_start( IMAGE *r, void *a, void *b ); -static int spcor2_gen( REGION *r, void *seq, void *a, void *b ); -static int spcor2_stop( void *seq, void *a, void *b ); - -/* spcor1 generate function. - */ -static int -spcor1_gen( REGION *or, void *seq, void *a, void *b ) -{ -#define LOOP(IN) \ -{ \ +#define LOOP(IN) { \ IN *a = (IN *) p; \ IN *b = (IN *) ref->data; \ int in_lsk = lsk / sizeof( IN ); \ @@ -142,7 +116,7 @@ spcor1_gen( REGION *or, void *seq, void *a, void *b ) \ /* Loop over ir again, this time calculating \ * sum-of-squares-of-differences for this window on \ - * ir, and also sum-of-products-of-differences. \ + * ir, and also sum-of-products-of-differences from mean. \ */ \ for( a1 = a, b1 = b, sum2 = 0.0, sum3 = 0.0, j = 0; \ j < ref->Ysize; j++, a1 += in_lsk, b1 += ref->Xsize ) { \ @@ -158,15 +132,21 @@ spcor1_gen( REGION *or, void *seq, void *a, void *b ) double t = ip - imean; \ sum2 += t * t; \ \ - /* Accumulate product-of-differences. \ + /* Accumulate product-of-difference from mean. \ */ \ - sum3 += (rp - inf->rmean) * (ip - imean); \ + sum3 += (rp - spcor->rmean) * (ip - imean); \ } \ } \ } - REGION *ir = (REGION *) seq; - SpcorInfo *inf = (SpcorInfo *) b; - IMAGE *ref = inf->ref; + +/* spcor generate function. + */ +static int +spcor_gen( REGION *or, void *vseq, void *a, void *b ) +{ + REGION *ir = (REGION *) vseq; + Spcor *spcor = (Spcor *) b; + IMAGE *ref = spcor->ref; Rect irect; Rect *r = &or->valid; int le = r->left; @@ -208,7 +188,7 @@ spcor1_gen( REGION *or, void *seq, void *a, void *b ) case IM_BANDFMT_USHORT: LOOP(unsigned short); break; case IM_BANDFMT_SHORT: LOOP(signed short); break; default: - error_exit( "im_spcor1: internal error #7934" ); + error_exit( "im_spcor: internal error #7934" ); /* Keep gcc -Wall happy. */ @@ -218,76 +198,80 @@ spcor1_gen( REGION *or, void *seq, void *a, void *b ) /* Now: calculate correlation coefficient! */ c2 = sqrt( sum2 ); - cc = sum3 / (inf->c1 * c2); + cc = sum3 / (spcor->c1 * c2); *q++ = cc; } } return( 0 ); -#undef LOOP } /* Pre-calculate stuff for our reference image. */ -static SpcorInfo * -make_inf( IMAGE *out, IMAGE *ref ) +static Spcor * +spcor_new( IMAGE *out, IMAGE *ref ) { - SpcorInfo *inf = IM_NEW( out, SpcorInfo ); + Spcor *spcor; int sz = ref->Xsize * ref->Ysize; PEL *p = (PEL *) ref->data; double s; int i; - if( !inf ) + if( !(spcor = IM_NEW( out, Spcor )) ) return( NULL ); /* Pre-calculate stuff on our reference image. */ - inf->ref = ref; - if( im_avg( inf->ref, &inf->rmean ) ) + spcor->ref = ref; + if( im_avg( spcor->ref, &spcor->rmean ) ) return( NULL ); - + /* Find sqrt-of-sum-of-squares-of-differences. */ for( s = 0.0, i = 0; i < sz; i++ ) { - double t = (int) p[i] - inf->rmean; + double t = (int) p[i] - spcor->rmean; s += t * t; } - inf->c1 = sqrt( s ); + spcor->c1 = sqrt( s ); - return( inf ); + return( spcor ); } -static int -im__spcor1_raw( IMAGE *in, IMAGE *ref, IMAGE *out ) +int +im_spcor_raw( IMAGE *in, IMAGE *ref, IMAGE *out ) { - SpcorInfo *inf; + Spcor *spcor; - /* PIO between in and out; WIO from ref. + /* PIO between in and out; WIO from ref, since it's probably tiny. */ - if( im_piocheck( in, out ) || im_incheck( ref ) ) + if( im_piocheck( in, out ) || + im_incheck( ref ) ) return( -1 ); /* Check sizes. */ - if( in->Xsize < ref->Xsize || in->Ysize < ref->Ysize ) { - im_errormsg( "im_spcor1_raw: ref not smaller than in" ); + if( in->Xsize < ref->Xsize || + in->Ysize < ref->Ysize ) { + im_error( "im_spcor_raw", _( "ref not smaller than in" ) ); return( -1 ); } /* Check types. */ - if( in->Coding != IM_CODING_NONE || in->Bands != 1 || - ref->Coding != IM_CODING_NONE || ref->Bands != 1 || + if( in->Coding != IM_CODING_NONE || + in->Bands != 1 || + ref->Coding != IM_CODING_NONE || + ref->Bands != 1 || in->BandFmt != ref->BandFmt ) { - im_errormsg( "im_spcor1_raw: input not uncoded 1 band" ); + im_error( "im_spcor_raw", _( "input not uncoded 1 band" ) ); return( -1 ); } if( in->BandFmt != IM_BANDFMT_UCHAR && + in->BandFmt != IM_BANDFMT_CHAR && in->BandFmt != IM_BANDFMT_SHORT && in->BandFmt != IM_BANDFMT_USHORT ) { - im_errormsg( "im_spcor1_raw: input not char/short/ushort" ); + im_error( "im_spcor_raw", _( "input not char/uchar/short/ushort" ) ); return( -1 ); } @@ -302,7 +286,7 @@ im__spcor1_raw( IMAGE *in, IMAGE *ref, IMAGE *out ) /* Pre-calculate some stuff. */ - if( !(inf = make_inf( out, ref )) ) + if( !(spcor = spcor_new( out, ref )) ) return( -1 ); /* Set demand hints. FATSTRIP is good for us, as THINSTRIP will cause @@ -314,7 +298,7 @@ im__spcor1_raw( IMAGE *in, IMAGE *ref, IMAGE *out ) /* Write the correlation. */ if( im_generate( out, - im_start_one, spcor1_gen, im_stop_one, in, inf ) ) + im_start_one, spcor_gen, im_stop_one, in, spcor ) ) return( -1 ); out->Xoffset = -ref->Xsize / 2; @@ -325,17 +309,17 @@ im__spcor1_raw( IMAGE *in, IMAGE *ref, IMAGE *out ) /* The above, with the input expanded to make out the same size as in. */ -static int -im__spcor1( IMAGE *in, IMAGE *ref, IMAGE *out ) +int +im_spcor( IMAGE *in, IMAGE *ref, IMAGE *out ) { - IMAGE *t1 = im_open_local( out, "im_spcor1 intermediate", "p" ); + IMAGE *t1 = im_open_local( out, "im_spcor intermediate", "p" ); if( !t1 || im_embed( in, t1, 1, ref->Xsize / 2, ref->Ysize / 2, in->Xsize + ref->Xsize - 1, in->Ysize + ref->Ysize - 1 ) || - im__spcor1_raw( t1, ref, out ) ) + im_spcor_raw( t1, ref, out ) ) return( -1 ); out->Xoffset = 0; @@ -344,249 +328,3 @@ im__spcor1( IMAGE *in, IMAGE *ref, IMAGE *out ) return( 0 ); } -static int -im__spcor2_raw( - IMAGE *f, - IMAGE *w, - IMAGE *r -){ -#define FUNCTION_NAME "im_spcor2_raw" - - DOUBLEMASK *w_stats; - spcor2_w_inf *w_inf; - - if( im_piocheck( f, r ) || im_incheck( w ) ) - return -1; - - if( f-> Xsize < w-> Xsize || f-> Ysize < w-> Ysize ){ - im_error( FUNCTION_NAME, "window must be smaller than search area" ); - return -1; - } - if( f-> Coding || w-> Coding ){ - im_error( FUNCTION_NAME, "uncoded images only" ); - return -1; - } - if( 1 != f-> Bands || 1 != w-> Bands ){ - im_error( FUNCTION_NAME, "single band images only" ); - return -1; - } - if( !( IM_BANDFMT_UCHAR == f-> BandFmt - || IM_BANDFMT_CHAR == f-> BandFmt - || IM_BANDFMT_USHORT == f-> BandFmt - || IM_BANDFMT_SHORT == f-> BandFmt ) ){ - im_error( FUNCTION_NAME, "short or char images only" ); - return -1; - } - if( f-> BandFmt != w-> BandFmt ){ - im_error( FUNCTION_NAME, "band formats must match" ); - return -1; - } - if( im_cp_descv( r, f, w, NULL ) ) - return -1; - - r-> Xsize-= ( w-> Xsize - 1 ); - r-> Ysize-= ( w-> Ysize - 1 ); - r-> BandFmt= IM_BANDFMT_FLOAT; - r-> Bbits= IM_BBITS_FLOAT; - r-> Xoffset= - w-> Xsize / 2; - r-> Yoffset= - w-> Ysize / 2; - - if( im_demand_hint( r, IM_FATSTRIP, f, NULL ) ) - return -1; - - w_inf= IM_NEW( r, spcor2_w_inf ); - w_stats= im_stats( w ); - - if( ! w_inf || ! w_stats ) - return -1; - - w_inf-> w= w; - w_inf-> area= w-> Xsize * w-> Ysize; - w_inf-> recip_area= 1.0 / (double) w_inf-> area; - w_inf-> mean= w_stats-> coeff[ 4 ]; - w_inf-> n_var= w_stats-> coeff[ 3 ] - w_stats-> coeff[ 2 ] * w_stats-> coeff[ 2 ] * w_inf-> recip_area; - - im_free_dmask( w_stats ); - - return im_generate( r, spcor2_start, spcor2_gen, spcor2_stop, f, w_inf ); - -#undef FUNCTION_NAME -} - -static void * -spcor2_start( IMAGE *r, void *a, void *b ){ - - IMAGE *f= (IMAGE *) a; - spcor2_seq *seq; - - seq= IM_NEW( r, spcor2_seq ); - if( ! seq ) - return NULL; - - seq-> f= im_region_create( f ); - seq-> f_cols= NULL; - seq-> max_cols= 0; - - if( ! seq-> f ) - return NULL; - - return seq; -} - -static int -spcor2_gen( - REGION *r, - void *vseq, void *a, void *b -){ - - spcor2_seq *seq= (spcor2_seq *) vseq; - spcor2_w_inf *w_inf= (spcor2_w_inf *) b; - Rect need= { - r-> valid. left, - r-> valid. top, - r-> valid. width + w_inf-> w-> Xsize - 1, - r-> valid. height + w_inf-> w-> Ysize - 1 - }; - int j; - float *r_data= (float*) IM_REGION_ADDR( r, r-> valid. left, r-> valid. top ); - size_t r_skip= IM_REGION_LSKIP( r ) / sizeof( float ); - float *r_end= r_data + r-> valid. height * r_skip; - - r_skip-= r-> valid. width; - - if( im_prepare( seq-> f, & need ) ) - return -1; - - if( need. width > seq-> max_cols ){ - im_free( seq-> f_cols ); - - seq-> f_cols= IM_ARRAY( NULL, need. width + 1, int ); /* one spare for the last right move */ - if( ! seq-> f_cols ) - return -1; - - seq-> max_cols= need. width; - } - memset( seq-> f_cols, 0, seq-> max_cols * sizeof( int ) ); - -#define LOOPS(TYPE) { \ - TYPE *f_start= (TYPE*) IM_REGION_ADDR( seq-> f, need. left, need. top ); \ - size_t f_skip= IM_REGION_LSKIP( seq-> f ) / sizeof( TYPE ); \ - size_t f_row_skip= f_skip - r-> valid. width; \ - size_t f_win_skip= f_skip - w_inf-> w-> Xsize; \ - \ - TYPE *f_win_end= f_start; \ - TYPE *f_stop= f_win_end + f_skip * w_inf-> w-> Ysize; \ - \ - for( ; f_win_end < f_stop; f_win_end+= f_skip ) \ - for( j= 0; j < need. width; ++j ) \ - seq-> f_cols[ j ]+= f_win_end[ j ]; \ - \ - for( ; r_data < r_end; r_data+= r_skip, f_start+= f_row_skip, f_win_end+= f_skip ){ \ - double f_mean= 0.0; \ - \ - for( j= 0; j < w_inf-> w-> Xsize; ++j ) \ - f_mean+= seq-> f_cols[ j ]; \ - \ - f_mean*= w_inf-> recip_area; \ - \ - for( j= 0; j < r-> valid. width; ++f_start, ++r_data, \ - f_mean+= ( seq-> f_cols[ w_inf-> w-> Xsize + j ] - seq-> f_cols[ j ] ) * w_inf-> recip_area, \ - ++j ){ \ - \ - double num_sum= 0.0; \ - double den_sum= 0.0; \ - TYPE *w_data= (TYPE*) w_inf-> w-> data; \ - TYPE *w_end= w_data + w_inf-> area; \ - TYPE *w_stop; \ - TYPE *f_data= f_start; \ - \ - for( ; w_data < w_end; f_data+= f_win_skip ) \ - for( w_stop= w_data + w_inf-> w-> Xsize; w_data < w_stop; ++w_data, ++f_data ){ \ - \ - double f_term= *f_data - f_mean; \ - \ - num_sum+= f_term * ( *w_data - w_inf-> mean ); \ - den_sum+= f_term * f_term; \ - } \ - \ - *r_data= num_sum * pow( den_sum * w_inf-> n_var, -0.5 ); \ - } \ - \ - if( r_data + r_skip < r_end ) \ - for( j= 0; j < need. width; ++j ) \ - seq-> f_cols[ j ]+= f_win_end[ j ] - f_start[ j ]; \ - } \ - } - - switch( w_inf-> w-> BandFmt ){ - case IM_BANDFMT_UCHAR: LOOPS( guint8 ) break; - case IM_BANDFMT_CHAR: LOOPS( gint8 ) break; - case IM_BANDFMT_USHORT: LOOPS( guint16 ) break; - case IM_BANDFMT_SHORT: LOOPS( gint16 ) break; - } - -#undef LOOPS - return 0; -} - -static int -spcor2_stop( void *vseq, void *a, void *b ){ - - spcor2_seq *seq= (spcor2_seq *) vseq; - - IM_FREEF( im_region_free, seq-> f ); - IM_FREE( seq-> f_cols ); - - return 0; -} - -static int -im__spcor2( IMAGE *in, IMAGE *ref, IMAGE *out ) -{ - IMAGE *t1 = im_open_local( out, "im_spcor2 intermediate", "p" ); - - if( !t1 || - im_embed( in, t1, 1, - ref->Xsize / 2, ref->Ysize / 2, - in->Xsize + ref->Xsize - 1, - in->Ysize + ref->Ysize - 1 ) || - im__spcor2_raw( t1, ref, out ) ) - return( -1 ); - - out->Xoffset = 0; - out->Yoffset = 0; - - return( 0 ); -} - -int -im_spcor_raw( - IMAGE *f, - IMAGE *w, - IMAGE *r -){ - if( im_incheck( w )) - return -1; - - if( 3 <= w-> Xsize || 3 <= w-> Ysize ) - return im__spcor2( f, w, r ); - - else - return im__spcor1( f, w, r ); -} - -int -im_spcor( - IMAGE *f, - IMAGE *w, - IMAGE *r -){ - if( im_incheck( w )) - return -1; - - if( 3 <= w-> Xsize || 3 <= w-> Ysize ) - return im__spcor2( f, w, r ); - - else - return im__spcor1( f, w, r ); -} diff --git a/libsrc/format/format.c b/libsrc/format/format.c index 52cfb72a..bba63500 100644 --- a/libsrc/format/format.c +++ b/libsrc/format/format.c @@ -107,11 +107,54 @@ im_format_unregister( im_format_t *format ) IM_FREE( format ); } +static const char *vips_suffs[] = { ".v", NULL }; + +static int +file2vips( const char *filename, IMAGE *out ) +{ + IMAGE *im; + + if( !(im = im_open_local( out, filename, "r" )) || + im_copy( im, out ) ) + return( -1 ); + + return( 0 ); +} + +static int +vips2file( IMAGE *im, const char *filename ) +{ + IMAGE *out; + + if( !(out = im_open_local( im, filename, "w" )) || + im_copy( im, out ) ) + return( -1 ); + + return( 0 ); +} + +static im_format_flags +vips_flags( const char *filename ) +{ + return( IM_FORMAT_FLAG_PARTIAL ); +} + /* Called on startup: register the base vips formats. */ void im__format_init( void ) { + im_format_register( + "vips", /* internal name */ + _( "VIPS" ), /* i18n'd visible name */ + vips_suffs, /* Allowed suffixes */ + im_isvips, /* is_a */ + file2vips, /* Load header only */ + file2vips, /* Load */ + vips2file, /* Save */ + vips_flags /* Flags */ + ); + #ifdef HAVE_JPEG im__jpeg_register(); #endif /*HAVE_JPEG*/ @@ -144,43 +187,41 @@ im_format_map( VSListMap2Fn fn, void *a, void *b ) */ static void * format_for_file_sub( im_format_t *format, - const char *filename, const char *name ) + const char *name, const char *filename ) { if( format->is_a ) { - if( format->is_a( name ) ) + if( format->is_a( filename ) ) return( format ); } - else if( im_filename_suffix_match( name, format->suffs ) ) + else if( im_filename_suffix_match( filename, format->suffs ) ) return( format ); return( NULL ); } im_format_t * -im_format_for_file( const char *filename ) +im_format_for_file( const char *name ) { - char name[FILENAME_MAX]; + char filename[FILENAME_MAX]; char options[FILENAME_MAX]; im_format_t *format; /* Break any options off the name ... eg. "fred.tif:jpeg,tile" * etc. */ - im_filename_split( filename, name, options ); + im_filename_split( name, filename, options ); - if( !im_existsf( "%s", name ) ) { + if( !im_existsf( "%s", filename ) ) { im_error( "im_format_for_file", - _( "\"%s\" is not readable" ), name ); + _( "\"%s\" is not readable" ), filename ); return( NULL ); } - format = (im_format_t *) im_format_map( + if( !(format = (im_format_t *) im_format_map( (VSListMap2Fn) format_for_file_sub, - (void *) filename, (void *) name ); - - if( !format ) { + (void *) name, (void *) filename )) ) { im_error( "im_format_for_file", - _( "\"%s\" is not in a supported format" ), name ); + _( "\"%s\" is not in a supported format" ), filename ); return( NULL ); } @@ -191,8 +232,7 @@ im_format_for_file( const char *filename ) * method. */ static void * -format_for_name_sub( im_format_t *format, - const char *filename, const char *name ) +format_for_name_sub( im_format_t *format, const char *name ) { if( format->save && im_filename_suffix_match( name, format->suffs ) ) @@ -202,18 +242,45 @@ format_for_name_sub( im_format_t *format, } im_format_t * -im_format_for_name( const char *filename ) +im_format_for_name( const char *name ) { - char name[FILENAME_MAX]; - char options[FILENAME_MAX]; + im_format_t *format; - /* Break any options off the name ... eg. "fred.tif:jpeg,tile" - * etc. - */ - im_filename_split( filename, name, options ); + if( !(format = (im_format_t *) im_format_map( + (VSListMap2Fn) format_for_name_sub, (void *) name, NULL )) ) { + char suffix[FILENAME_MAX]; - return( (im_format_t *) im_format_map( - (VSListMap2Fn) format_for_name_sub, - (void *) filename, (void *) name ) ); + im_filename_suffix( name, suffix ); + im_error( "im_format_for_name", + _( "\"%s\" is not a supported image format." ), + suffix ); + + return( NULL ); + } + + return( format ); } +int +im_format_read( const char *name, IMAGE *out ) +{ + im_format_t *format; + + if( !(format = im_format_for_file( name )) || + format->load( name, out ) ) + return( -1 ); + + return( 0 ); +} + +int +im_format_write( IMAGE *im, const char *name ) +{ + im_format_t *format; + + if( !(format = im_format_for_name( name )) || + format->save( im, name ) ) + return( -1 ); + + return( 0 ); +} diff --git a/libsrc/format/im_magick2vips.c b/libsrc/format/im_magick2vips.c index 49c704c7..5c267d33 100644 --- a/libsrc/format/im_magick2vips.c +++ b/libsrc/format/im_magick2vips.c @@ -649,7 +649,7 @@ ismagick( const char *filename ) if( !(im = im_open( "dummy", "p" )) ) return( -1 ); result = magick2vips_header( filename, im ); - im_clear_error_string(); + im_error_clear(); im_close( im ); return( result == 0 ); diff --git a/libsrc/format/im_tiff2vips.c b/libsrc/format/im_tiff2vips.c index 1edaae1f..4561bf46 100644 --- a/libsrc/format/im_tiff2vips.c +++ b/libsrc/format/im_tiff2vips.c @@ -1524,7 +1524,7 @@ istifftiled( const char *filename ) #endif /*BINARY_OPEN*/ /* Not a TIFF file ... return False. */ - im_clear_error_string(); + im_error_clear(); return( 0 ); } tiled = TIFFIsTiled( tif ); diff --git a/libsrc/format/im_vips2tiff.c b/libsrc/format/im_vips2tiff.c index d13ae714..209b8acb 100644 --- a/libsrc/format/im_vips2tiff.c +++ b/libsrc/format/im_vips2tiff.c @@ -104,6 +104,8 @@ * - use IM_META_RESOLUTION_UNIT to set default resunit * 17/4/08 * - allow CMYKA (thanks Doron) + * 5/9/08 + * - trigger eval callbacks during tile write */ /* @@ -164,6 +166,7 @@ im_vips2tiff( IMAGE *im, const char *filename ) #include #include +#include #include @@ -1056,6 +1059,15 @@ write_tif_tile( TiffWrite *tw ) */ if( tw->layer && new_tile( tw->layer, tw->reg, &area ) ) return( -1 ); + + /* Trigger any eval callbacks on our source image. + */ + im__handle_eval( im, area.width, area.height ); + + /* Check for errors. + */ + if( im_threadgroup_iserror( tw->tg ) ) + return( -1 ); } return( 0 ); @@ -1619,8 +1631,19 @@ im_vips2tiff( IMAGE *im, const char *filename ) return( -1 ); } - if( tw->tile ) + + if( tw->tile ) { + /* The strip writer uses wbuffer and does start/end for us, we + * have our own loop for tile writing and so we need to call + * ourselves. + */ + if( im__start_eval( im ) ) { + free_tiff_write( tw ); + return( -1 ); + } res = write_tif_tile( tw ); + im__end_eval( im ); + } else res = write_tif_strip( tw ); if( res ) { diff --git a/libsrc/iofuncs/Makefile.am b/libsrc/iofuncs/Makefile.am index 934a11d4..bf1cc644 100644 --- a/libsrc/iofuncs/Makefile.am +++ b/libsrc/iofuncs/Makefile.am @@ -1,7 +1,6 @@ noinst_LTLIBRARIES = libiofuncs.la libiofuncs_la_SOURCES = \ - type.c \ meta.c \ base64.h \ base64.c \ diff --git a/libsrc/iofuncs/im_iocheck.c b/libsrc/iofuncs/im_iocheck.c index 6b75bba5..1407e4dc 100644 --- a/libsrc/iofuncs/im_iocheck.c +++ b/libsrc/iofuncs/im_iocheck.c @@ -159,7 +159,7 @@ im_incheck( IMAGE *im ) /* Should have been written to. */ if( !im->data ) { - im_errormsg( "im_incheck: no image data" ); + im_error( "im_incheck", _( "no image data" ) ); return( -1 ); } @@ -202,7 +202,8 @@ im_incheck( IMAGE *im ) printf( "im_incheck: auto-rewind of %s\n", im->filename ); #endif/*DEBUG_IO*/ if( im__close( im ) || im_openin( im ) ) { - im_errormsg( "im_incheck: auto-rewind for %s failed", + im_error( "im_incheck", + _( "auto-rewind for %s failed" ), im->filename ); return( -1 ); } @@ -210,7 +211,7 @@ im_incheck( IMAGE *im ) break; default: - im_errormsg( "im_incheck: image not readable" ); + im_error( "im_incheck", _( "image not readable" ) ); return( -1 ); } @@ -231,7 +232,7 @@ im_outcheck( IMAGE *im ) /* Make sure nothing is attached. */ if( im->generate ) { - im_errormsg( "im_outcheck: image already written" ); + im_error( "im_outcheck", _( "image already written" ) ); return( -1 ); } @@ -246,7 +247,7 @@ im_outcheck( IMAGE *im ) /* Check that it has not been im_setupout(). */ if( im->data ) { - im_errormsg( "im_outcheck: image already written" ); + im_error( "im_outcheck", _( "image already written" ) ); return( -1 ); } @@ -259,7 +260,7 @@ im_outcheck( IMAGE *im ) break; default: - im_errormsg( "im_outcheck: image not writeable" ); + im_error( "im_outcheck", _( "image not writeable" ) ); return( -1 ); } @@ -281,7 +282,7 @@ im_rwcheck( IMAGE *im ) * generate im_partial() files. */ if( im_incheck( im ) ) { - im_errormsg( "im_rwcheck: unable to rewind file" ); + im_error( "im_rwcheck", _( "unable to rewind file" ) ); return( -1 ); } @@ -304,7 +305,7 @@ im_rwcheck( IMAGE *im ) break; default: - im_errormsg( "im_rwcheck: bad file type" ); + im_error( "im_rwcheck", _( "bad file type" ) ); return( -1 ); } diff --git a/libsrc/iofuncs/im_iterate.c b/libsrc/iofuncs/im_iterate.c index 86bd82f6..a3506b75 100644 --- a/libsrc/iofuncs/im_iterate.c +++ b/libsrc/iofuncs/im_iterate.c @@ -115,13 +115,11 @@ eval_to_image( im_threadgroup_t *tg, IMAGE *im ) */ im_threadgroup_trigger( thr ); - /* Trigger any eval callbacks on our source image. + /* Trigger any eval callbacks on our source image, + * check for errors. */ - im__handle_eval( im, tg->pw, tg->ph ); - - /* Check for errors. - */ - if( im_threadgroup_iserror( tg ) ) { + if( im__handle_eval( im, tg->pw, tg->ph ) || + im_threadgroup_iserror( tg ) ) { /* Don't kill threads yet ... we may want to * get some error stuff out of them. */ diff --git a/libsrc/iofuncs/im_open.c b/libsrc/iofuncs/im_open.c index f9a04a71..de43ebc1 100644 --- a/libsrc/iofuncs/im_open.c +++ b/libsrc/iofuncs/im_open.c @@ -316,10 +316,9 @@ eval_cb( Progress *progress ) IMAGE *im = progress->im; if( im->time->percent != progress->last_percent ) { - /* \r at end returns to the start of this line. - */ - printf( _( "%s %s: %d%% complete\r" ), + printf( _( "%s %s: %d%% complete" ), g_get_prgname(), im->filename, im->time->percent ); + printf( "\r" ); fflush( stdout ); progress->last_percent = im->time->percent; @@ -346,8 +345,6 @@ im_open( const char *filename, const char *mode ) { IMAGE *im; im_format_t *format; - char name[FILENAME_MAX]; - char mode2[FILENAME_MAX]; /* Pass in a nonsense name for argv0 ... this init world is only here * for old programs which are missing an im_init_world() call. We must @@ -363,41 +360,56 @@ im_open( const char *filename, const char *mode ) /* - FIXME ... we have to split the filename here because - im_isvips() needs a filename without a mode extension + we can't use the vips handler in the format system, since we + want to be able to open the image directly rather than + copying to an existing descriptor - can we fold the vips open code into the format system somehow? - we need to consider large file and pipeline support carefully + if we don't do this, things like paintbox apps won't work */ - im_filename_split( filename, name, mode2 ); switch( mode[0] ) { case 'r': - if( im_isvips( name ) ) { - if( !(im = im_open_vips( filename )) ) - return( NULL ); - } - else if( (format = im_format_for_file( filename )) ) { - if( !(im = open_sub( + if( (format = im_format_for_file( filename )) ) { + if( strcmp( format->name, "vips" ) == 0 ) { + if( !(im = im_open_vips( filename )) ) + return( NULL ); + } + else if( !(im = open_sub( format->header, format->load, filename )) ) return( NULL ); } - else + else { + im_error( "im_open", + _( "\"%s\" is not in a recognised format" ), + filename ); return( NULL ); + } break; case 'w': if( (format = im_format_for_name( filename )) ) { - if( !(im = im_open( "im_open:lazy_write:1", "p" )) ) - return( NULL ); - if( attach_sb( im, format->save, filename ) ) { - im_close( im ); - return( NULL ); + if( strcmp( format->name, "vips" ) == 0 ) + im = im_openout( filename ); + else { + if( !(im = im_open( "im_open:lw:1", "p" )) ) + return( NULL ); + if( attach_sb( im, format->save, filename ) ) { + im_close( im ); + return( NULL ); + } } } - else - im = im_openout( filename ); + else { + char suffix[FILENAME_MAX]; + + im_filename_suffix( filename, suffix ); + im_error( "im_open", + _( "unsupported filetype \"%s\"" ), + suffix ); + + return( NULL ); + } break; case 't': diff --git a/libsrc/iofuncs/im_wbuffer.c b/libsrc/iofuncs/im_wbuffer.c index b4bc51c0..9b3a33c9 100644 --- a/libsrc/iofuncs/im_wbuffer.c +++ b/libsrc/iofuncs/im_wbuffer.c @@ -285,13 +285,11 @@ wbuffer_fill( WriteBuffer *wbuffer ) im_semaphore_upn( &wbuffer->nwrite, -1 ); im_threadgroup_trigger( thr ); - /* Trigger any eval callbacks on our source image. + /* Trigger any eval callbacks on our source image and + * check for errors. */ - im__handle_eval( tg->im, tg->pw, tg->ph ); - - /* Check for errors. - */ - if( im_threadgroup_iserror( tg ) ) { + if( im__handle_eval( tg->im, tg->pw, tg->ph ) || + im_threadgroup_iserror( tg ) ) { /* Don't kill threads yet ... we may want to * get some error stuff out of them. */ diff --git a/libsrc/makedef.pl b/libsrc/makedef.pl deleted file mode 100755 index d84039ef..00000000 --- a/libsrc/makedef.pl +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/perl - -# update vips.def from "nm" output of the installed library -# -# not very portable :-( eg mac os x and win32 will fail horribly -# -# pass in the install prefix ... or type "make vips.def" - -open DATA, "nm -B @ARGV[0]/lib/libvips.so |"; - -while( ) { - next if ! /^[a-f0-9]+ T (im_[a-zA-Z].*)$/ && - ! /^[a-f0-9]+ T (error_exit)$/; - push @names, $1; -} - -print "EXPORTS\n"; -foreach $i (sort @names) { - print "\t$i\n"; -} diff --git a/libsrc/mosaicing/global_balance.c b/libsrc/mosaicing/global_balance.c index 25915f04..df14ab84 100644 --- a/libsrc/mosaicing/global_balance.c +++ b/libsrc/mosaicing/global_balance.c @@ -237,7 +237,7 @@ build_node( SymbolTable *st, char *name ) else { /* Clear the error buffer to lessen confusion. */ - im_clear_error_string(); + im_error_clear(); } st->table[n] = g_slist_prepend( st->table[n], node ); diff --git a/libsrc/vips.def b/libsrc/vips.def deleted file mode 100644 index f6c9450a..00000000 --- a/libsrc/vips.def +++ /dev/null @@ -1,535 +0,0 @@ -EXPORTS - error_exit - im_BandFmt2char - im_Coding2char - im_Compression2char - im_LCh2Lab - im_LCh2UCS - im_Lab2LCh - im_Lab2LabQ - im_Lab2LabS - im_Lab2UCS - im_Lab2XYZ - im_Lab2XYZ_temp - im_Lab2disp - im_LabQ2Lab - im_LabQ2LabS - im_LabQ2XYZ - im_LabQ2disp - im_LabQ2disp_build_table - im_LabQ2disp_table - im_LabS2Lab - im_LabS2LabQ - im_Type2char - im_UCS2LCh - im_UCS2Lab - im_UCS2XYZ - im_XYZ2Lab - im_XYZ2Lab_temp - im_XYZ2UCS - im_XYZ2Yxy - im_XYZ2disp - im_XYZ2sRGB - im_Yxy2XYZ - im_abs - im_acostra - im_add - im_add_close_callback - im_add_eval_callback - im_add_evalend_callback - im_addgnoise - im_affine - im_allocate_input_array - im_allocate_vargv - im_amiMSBfirst - im_and_vec - im_andconst - im_andimage - im_append_Hist - im_asintra - im_atantra - im_avg - im_bandjoin - im_bernd - im_binfile - im_black - im_blend - im_c2amph - im_c2imag - im_c2ps - im_c2real - im_c2rect - im_ceil - im_char2BandFmt - im_char2Coding - im_char2Compression - im_char2Type - im_circle - im_clamp - im_clear_error_string - im_clip - im_clip2c - im_clip2cm - im_clip2d - im_clip2dcm - im_clip2f - im_clip2fmt - im_clip2i - im_clip2s - im_clip2ui - im_clip2us - im_close - im_close_plugins - im_cmulnorm - im_cntlines - im_col_C2Cucs - im_col_Ch2ab - im_col_Ch2hucs - im_col_Chucs2h - im_col_Cucs2C - im_col_L2Lucs - im_col_Lab2XYZ - im_col_Lucs2L - im_col_XYZ2Lab - im_col_XYZ2rgb - im_col_ab2Ch - im_col_ab2h - im_col_dE00 - im_col_dECMC - im_col_display_name - im_col_displays - im_col_make_tables_RGB - im_col_make_tables_UCS - im_col_pythagoras - im_col_rgb2XYZ - im_compass - im_conv - im_conv_raw - im_convf - im_convf_raw - im_convsep - im_convsep_raw - im_convsepf - im_convsepf_raw - im_convsub - im_cooc_asm - im_cooc_contrast - im_cooc_correlation - im_cooc_entropy - im_cooc_matrix - im_copy - im_copy_dmask_matrix - im_copy_imask_matrix - im_copy_matrix_dmask - im_copy_matrix_imask - im_copy_set - im_correl - im_costra - im_cp_Hist - im_cp_desc - im_create_dmask - im_create_dmaskv - im_create_fmask - im_create_imask - im_create_imaskv - im_crwrhd - im_dE00_fromLab - im_dECMC_fromLab - im_dECMC_fromdisp - im_dE_fromLab - im_dE_fromXYZ - im_dE_fromdisp - im_debugim - im_demand_hint - im_demand_hint_array - im_desc_hd - im_deviate - im_dhint2char - im_diagnostics - im_dif_std - im_dilate - im_dilate_raw - im_disp2Lab - im_disp2XYZ - im_disp_ps - im_divide - im_dmat_alloc - im_dtype2char - im_dup_dmask - im_dup_imask - im_dvector - im_embed - im_eor_vec - im_eorconst - im_eorimage - im_equal - im_equal_vec - im_equalconst - im_erode - im_erode_raw - im_errormsg - im_errormsg_system - im_errorstring - im_existsf - im_exp10tra - im_expntra - im_expntra_vec - im_exptra - im_extract - im_extract_area - im_extract_band - im_eye - im_falsecolour - im_fastcor - im_fastcor_raw - im_fastline - im_fastlineuser - im_fav4 - im_feye - im_fgrey - im_find_function - im_find_package - im_fliphor - im_flipver - im_flood - im_flood_blob - im_floor - im_flt_image_freq - im_fmat_alloc - im_fractsurf - im_free - im_free_dmask - im_free_dmat - im_free_dvector - im_free_fmat - im_free_fvector - im_free_imask - im_free_imat - im_free_ivector - im_free_vargv - im_freqflt - im_fvector - im_fwfft - im_fzone - im_gadd - im_gaddim - im_gammacorrect - im_gauss_dmask - im_gauss_imask - im_gaussnoise - im_gbandjoin - im_generate - im_gfadd - im_glds_asm - im_glds_contrast - im_glds_entropy - im_glds_matrix - im_glds_mean - im_global_balance - im_global_balancef - im_gradient - im_gradient_old - im_grey - im_guess_prefix - im_header_double - im_header_int - im_header_string - im_heq - im_hist - im_histcum - im_histeq - im_histgr - im_histlin - im_histnD - im_histnorm - im_histplot - im_histspec - im_histspec_old - im_hsp - im_icc_ac2rc - im_icc_export - im_icc_export_depth - im_icc_import - im_icc_present - im_icc_transform - im_identity - im_identity_ushort - im_ifthenelse - im_image - im_image_sanity - im_imat_alloc - im_incheck - im_init - im_initdesc - im_inithd - im_insert - im_insert_noexpand - im_insertplace - im_invert - im_invertlut - im_invfft - im_invfftr - im_invmat - im_iocheck - im_isMSBfirst - im_iscomplex - im_isfile - im_isfloat - im_isint - im_isjpeg - im_ismagick - im_ismonotonic - im_ispartial - im_ispng - im_ispoweroftwo - im_isppm - im_istiff - im_istiffpyramid - im_istifftiled - im_isuint - im_isscalar - im_isvips - im_iterate - im_ivector - im_jpeg2vips - im_jpeg2vips_header - im_lab_morph - im_less - im_less_vec - im_lessconst - im_lesseq - im_lesseq_vec - im_lesseqconst - im_lhisteq - im_lhisteq_raw - im_lindetect - im_lindetect_old - im_line - im_lintra - im_lintra_vec - im_list_add - im_list_append - im_list_eq - im_list_fix - im_list_fold - im_list_free - im_list_index - im_list_insert - im_list_len - im_list_map - im_list_map_rev - im_list_member - im_list_pos - im_list_remove - im_litecor - im_load_plugin - im_load_plugins - im_local - im_local_array - im_lock - im_lock_destroy - im_lock_init - im_log10tra - im_log_dmask - im_log_imask - im_logtra - im_lrjoin - im_lrmerge - im_lrmerge1 - im_lrmosaic - im_lrmosaic1 - im_magick2vips - im_magick2vips_header - im_makerw - im_malloc - im_map_packages - im_mapfile - im_mapfilerw - im_maplut - im_mask2vips - im_matcat - im_match_linear - im_match_linear_search - im_matinv - im_matmul - im_mattrn - im_max - im_maxpos - im_maxvalue - im_measure - im_min - im_minpos - im_more - im_more_vec - im_moreconst - im_moreeq - im_moreeq_vec - im_moreeqconst - im_mpercent - im_multiply - im_notequal - im_notequal_vec - im_notequalconst - im_offsets45 - im_offsets90 - im_open - im_open_header - im_openin - im_openinrw - im_openout - im_or_vec - im_orconst - im_orimage - im_outcheck - im_package_of_function - im_paintrect - im_partial - im_path_is_absolute - im_pincheck - im_piocheck - im_plotmask - im_plotpoint - im_png2vips - im_png2vips_header - im_poutcheck - im_powtra - im_powtra_vec - im_ppm2vips - im_ppm2vips_header - im_prepare - im_prepare_thread - im_prepare_to - im_print - im_print_dmask - im_print_imask - im_printdesc - im_printhd - im_printlines - im_profile - im_rank - im_rank_raw - im_read_dmask - im_read_imask - im_readhist - im_readpoint - im_recomb - im_rect_dup - im_rect_equalsrect - im_rect_includespoint - im_rect_includesrect - im_rect_intersectrect - im_rect_isempty - im_rect_marginadjust - im_rect_normalise - im_rect_unionrect - im_region_create - im_region_equalsregion - im_region_free - im_region_image - im_region_local - im_region_mmap_window - im_region_position - im_region_region - im_remainder - im_remainderconst - im_remainderconst_vec - im_remapfilerw - im_remosaic - im_resize_linear - im_ri2c - im_rot180 - im_rot270 - im_rot90 - im_rotate_dmask45 - im_rotate_dmask90 - im_rotate_imask45 - im_rotate_imask90 - im_rotquad - im_run_command - im_rwcheck - im_sRGB2XYZ - im_scale - im_scale_dmask - im_scaleps - im_semaphore_destroy - im_semaphore_down - im_semaphore_downn - im_semaphore_init - im_semaphore_up - im_semaphore_upn - im_setbox - im_setbuf - im_setupout - im_sharpen - im_shiftleft - im_shiftright - im_shrink - im_sign - im_simcontr - im_similarity - im_similarity_area - im_sines - im_sintra - im_slice - im_smear - im_smudge - im_snprintf - im_spatres - im_spcor - im_spcor_raw - im_start_many - im_start_one - im_stats - im_stdif - im_stdif_raw - im_stop_many - im_stop_one - im_strdup - im_stretch3 - im_strncpy - im_strrstr - im_subsample - im_subtract - im_system - im_tantra - im_tbjoin - im_tbmerge - im_tbmerge1 - im_tbmosaic - im_tbmosaic1 - im_thread_create - im_thread_join - im_threadgroup_create - im_threadgroup_free - im_thresh - im_tiff2vips - im_tiff2vips_header - im_tone_analyse - im_tone_build - im_tone_map - im_unlock - im_unmapfile - im_updatehist - im_verrormsg - im_version - im_version_string - im_video_v4l1 - im_vips2bufjpeg - im_vips2jpeg - im_vips2mask - im_vips2mimejpeg - im_vips2png - im_vips2ppm - im_vips2tiff - im_vsnprintf - im_warning - im_wrapmany - im_wrapone - im_write_dmask - im_write_dmask_name - im_write_imask - im_write_imask_name - im_writeline - im_zerox - im_zone - im_zoom diff --git a/libsrcCC/Makefile.am b/libsrcCC/Makefile.am index c1e4bc24..2b72adc5 100644 --- a/libsrcCC/Makefile.am +++ b/libsrcCC/Makefile.am @@ -9,6 +9,7 @@ libvipsCC_la_SOURCES = \ VMask.cc libvipsCC_la_LDFLAGS = \ + -no-undefined \ -version-info @LIBRARY_CURRENT@:@LIBRARY_REVISION@:@LIBRARY_AGE@ libvipsCC_la_LIBADD = \ diff --git a/man/Makefile.am b/man/Makefile.am index a039db81..f2dae0b3 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -188,6 +188,8 @@ man_MANS = \ im_format_register.3 \ im_format_set_priority.3 \ im_format_unregister.3 \ + im_format_read.3 \ + im_format_write.3 \ im_fractsurf.3 \ im_free.3 \ im_free_dmask.3 \ diff --git a/man/im_format.3 b/man/im_format.3 index 0ae9f7b2..43d1f3b7 100644 --- a/man/im_format.3 +++ b/man/im_format.3 @@ -1,7 +1,7 @@ .TH IM_FORMAT 3 "16 August 2008" .SH NAME im_format_register, im_format_set_priority, im_format_unregister, -im_format_map, im_format_for_file, im_format_for_name \- +im_format_map, im_format_for_file, im_format_for_name, im_format_write \- load and search image formats .SH SYNOPSIS #include @@ -66,24 +66,39 @@ im_format_t *im_format_for_file( const char *filename ); .br im_format_t *im_format_for_name( const char *filename ); +int im_format_write( IMAGE *im, const char *filename ); + +int im_format_read( const char *filename, IMAGE *out ); + .SH DESCRIPTION These functions register and unregister image formats, and search the table of available image formats to find one suitable for loading or saving a file. +.B im_open(3) +will do something similar, but that returns a descriptor to the file rather +than copying to a descriptor you supply. + +The two APIs are useful in different circumstances: +.B im_open(3) +is good if you want to directly manipulate a file on disc, for example with +the paintbox functions. The format API is useful for controlling how a image +is unpacked, since you can specify a destination for the copy. + .B im_format_register(3) registers an image format with vips. This might typically be called during module load, see the documentation for GModule. -An image format has a number of -components: +An image format has a number of components: .B name The internal name by which the format should be known. For example, the -OpenEXR image format is known within vips as "exr". +OpenEXR image format is known within vips as "exr". You can identify formats +by testing this field with +.B strcmp(3). .B name_user The name as it should be displayed to the user. It can be internationalised. -For example, in English, the OpenEXR format is shown as "OpenEXR". +For example, in English, the "analyze" format is shown as "Analyze 6.0". .B suffs A NULL-terminated array of possible file-name suffixes for this format. This @@ -141,16 +156,26 @@ maps a function over the list of loaded formats. See .B im_slist_map(3). .B im_format_for_file(3) -looks at a file on disc and selects the 'best' formmat to use to load that -file. +looks at a file on disc and selects the 'best' format to use to load that +file. If no suitable format is found, it returns NULL and sets an error +message. .B im_format_for_name(3) looks at a filename and picks a format to use to save that file based on the -file extension. +file extension. If no suitable format is found, it returns NULL and sets an +error message. + +.B im_format_read(3) +is a convenience function which copies the image from the file into the IMAGE. +error, it returns non-zero and sets an error message. + +.B im_format_write(3) +is a convenience function which copies the image to the file in the +appropriate format. On error, it returns non-zero and sets an error message. .SH RETURN VALUE The functions return 0 success and -1 on error. .SH SEE ALSO -im_tiff2vips(3). +im_tiff2vips(3), im_open(3). .SH AUTHOR Jesper Friis and John Cupitt diff --git a/man/im_format_read.3 b/man/im_format_read.3 new file mode 100644 index 00000000..05da05cc --- /dev/null +++ b/man/im_format_read.3 @@ -0,0 +1 @@ +.so man3/im_format.3 diff --git a/man/im_format_write.3 b/man/im_format_write.3 new file mode 100644 index 00000000..05da05cc --- /dev/null +++ b/man/im_format_write.3 @@ -0,0 +1 @@ +.so man3/im_format.3 diff --git a/man/im_project.3 b/man/im_project.3 index 9dd16f4c..c51b3326 100644 --- a/man/im_project.3 +++ b/man/im_project.3 @@ -4,7 +4,7 @@ im_project \- find horizontal and vertical projections .SH SYNOPSIS #include -int im_histplot(IMAGE *in, IMAGE *hout, IMAGE *vout) +int im_project(IMAGE *in, IMAGE *hout, IMAGE *vout) .SH DESCRIPTION .B im_project(3) diff --git a/po/POTFILES.in b/po/POTFILES.in index fb60b2d1..224be66c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,653 +1,363 @@ contrib/mitsub/mitsub.c contrib/vdump/vdump.c -contrib/vips2dj/vips2dj.c contrib/vips2dj/vips2ah.c +contrib/vips2dj/vips2dj.c libsrc/acquire/im_clamp.c -libsrc/arithmetic/im_cross_phase.c -libsrc/arithmetic/im_ceil.c -libsrc/arithmetic/im_avg.c -libsrc/arithmetic/im_linreg.c -libsrc/arithmetic/im_expntra.c -libsrc/arithmetic/im_floor.c -libsrc/arithmetic/im_gaddim.c -libsrc/arithmetic/im_subtract.c -libsrc/arithmetic/im_logtra.c libsrc/arithmetic/im_cmulnorm.c -libsrc/arithmetic/im_gadd.c -libsrc/arithmetic/im_fav4.c -libsrc/arithmetic/im_sign.c -libsrc/arithmetic/im_sintra.c libsrc/arithmetic/im_litecor.c -libsrc/arithmetic/im_divide.c -libsrc/arithmetic/im_maxpos_vec.c -libsrc/arithmetic/im_bandmean.c +libsrc/arithmetic/im_logtra.c +libsrc/arithmetic/im_gadd.c +libsrc/arithmetic/im_sign.c +libsrc/arithmetic/im_minpos.c +libsrc/arithmetic/im_maxpos_avg.c +libsrc/arithmetic/im_subtract.c +libsrc/arithmetic/im_max.c libsrc/arithmetic/im_remainder.c +libsrc/arithmetic/im_gfadd.c +libsrc/arithmetic/im_multiply.c +libsrc/arithmetic/im_linreg.c +libsrc/arithmetic/im_gaddim.c +libsrc/arithmetic/im_abs.c +libsrc/arithmetic/im_ceil.c +libsrc/arithmetic/im_cross_phase.c +libsrc/arithmetic/im_avg.c +libsrc/arithmetic/im_bandmean.c +libsrc/arithmetic/im_add.c +libsrc/arithmetic/im_min.c +libsrc/arithmetic/im_deviate.c +libsrc/arithmetic/im_stats.c +libsrc/arithmetic/im_maxpos_vec.c +libsrc/arithmetic/im_lintra.c +libsrc/arithmetic/im_measure.c +libsrc/arithmetic/im_log10tra.c +libsrc/arithmetic/im_powtra.c +libsrc/arithmetic/im_costra.c +libsrc/arithmetic/im_maxpos.c libsrc/arithmetic/im_invert.c libsrc/arithmetic/im_rint.c -libsrc/arithmetic/im_powtra.c -libsrc/arithmetic/im_multiply.c -libsrc/arithmetic/im_deviate.c -libsrc/arithmetic/im_min.c -libsrc/arithmetic/im_max.c -libsrc/arithmetic/im_add.c -libsrc/arithmetic/im_tantra.c -libsrc/arithmetic/im_lintra.c -libsrc/arithmetic/im_log10tra.c -libsrc/arithmetic/im_costra.c -libsrc/arithmetic/im_point_bilinear.c -libsrc/arithmetic/im_stats.c -libsrc/arithmetic/im_measure.c +libsrc/arithmetic/im_sintra.c libsrc/arithmetic/arith_dispatch.c -libsrc/arithmetic/im_maxpos_avg.c -libsrc/arithmetic/im_minpos.c -libsrc/arithmetic/im_gfadd.c -libsrc/arithmetic/im_abs.c -libsrc/arithmetic/im_maxpos.c +libsrc/arithmetic/im_point_bilinear.c +libsrc/arithmetic/im_expntra.c +libsrc/arithmetic/im_tantra.c +libsrc/arithmetic/im_divide.c +libsrc/arithmetic/im_fav4.c +libsrc/arithmetic/im_floor.c libsrc/boolean/boolean.c libsrc/boolean/bool_dispatch.c libsrc/cimg/cimg_dispatch.c -libsrc/colour/im_dECMC_fromLab.c -libsrc/colour/colour.c -libsrc/colour/im_Lab2LabQ.c -libsrc/colour/im_LabQ2Lab.c -libsrc/colour/im_LabQ2disp.c -libsrc/colour/im_Lab2LabS.c -libsrc/colour/im_LabS2Lab.c -libsrc/colour/im_Yxy2XYZ.c -libsrc/colour/im_XYZ2Yxy.c -libsrc/colour/im_icc_transform.c libsrc/colour/im_dE_fromLab.c -libsrc/colour/im_dE00_fromLab.c -libsrc/colour/im_XYZ2Lab.c -libsrc/colour/im_Lab2XYZ.c -libsrc/colour/im_disp2XYZ.c -libsrc/colour/im_XYZ2disp.c +libsrc/colour/im_Lab2LCh.c +libsrc/colour/im_dECMC_fromLab.c +libsrc/colour/im_XYZ2Yxy.c libsrc/colour/derived.c +libsrc/colour/im_disp2XYZ.c +libsrc/colour/im_LabQ2Lab.c +libsrc/colour/im_Lab2LabQ.c +libsrc/colour/im_XYZ2disp.c +libsrc/colour/im_lab_morph.c +libsrc/colour/im_dE00_fromLab.c +libsrc/colour/im_Lab2XYZ.c libsrc/colour/colour_dispatch.c -libsrc/colour/im_UCS2LCh.c +libsrc/colour/colour.c +libsrc/colour/im_LabQ2disp.c +libsrc/colour/im_Yxy2XYZ.c +libsrc/colour/im_XYZ2Lab.c +libsrc/colour/im_LCh2Lab.c libsrc/colour/im_LabS2LabQ.c libsrc/colour/im_LabQ2LabS.c +libsrc/colour/im_UCS2LCh.c +libsrc/colour/im_Lab2LabS.c +libsrc/colour/im_icc_transform.c libsrc/colour/im_LCh2UCS.c -libsrc/colour/im_lab_morph.c -libsrc/colour/im_Lab2LCh.c -libsrc/colour/im_LCh2Lab.c -libsrc/conversion/im_copy.c -libsrc/conversion/im_rot90.c -libsrc/conversion/im_bandjoin.c -libsrc/conversion/im_zoom.c -libsrc/conversion/im_grid.c -libsrc/conversion/im_tbjoin.c -libsrc/conversion/conver_dispatch.c -libsrc/conversion/im_clip.c -libsrc/conversion/im_scaleps.c -libsrc/conversion/im_gbandjoin.c -libsrc/conversion/im_thresh.c -libsrc/conversion/im_rot180.c -libsrc/conversion/im_lrjoin.c -libsrc/conversion/im_ri2c.c -libsrc/conversion/im_fliphor.c -libsrc/conversion/im_rightshift_size.c +libsrc/colour/im_LabS2Lab.c libsrc/conversion/im_recomb.c +libsrc/conversion/im_tbjoin.c libsrc/conversion/im_flipver.c -libsrc/conversion/im_c2real.c -libsrc/conversion/im_wrap.c -libsrc/conversion/im_extract.c -libsrc/conversion/im_c2amph.c -libsrc/conversion/im_black.c -libsrc/conversion/im_falsecolour.c -libsrc/conversion/im_mask2vips.c -libsrc/conversion/im_vips2mask.c -libsrc/conversion/im_msb.c libsrc/conversion/im_c2rect.c -libsrc/conversion/im_system.c -libsrc/conversion/im_text.c -libsrc/conversion/im_scale.c -libsrc/conversion/im_bernd.c -libsrc/conversion/im_subsample.c -libsrc/conversion/im_print.c -libsrc/conversion/im_rot270.c -libsrc/conversion/im_slice.c -libsrc/conversion/im_c2imag.c -libsrc/conversion/im_insert.c +libsrc/conversion/im_rot90.c libsrc/conversion/im_c2ps.c +libsrc/conversion/im_rightshift_size.c +libsrc/conversion/im_insert.c +libsrc/conversion/im_c2imag.c +libsrc/conversion/im_falsecolour.c +libsrc/conversion/im_text.c +libsrc/conversion/conver_dispatch.c +libsrc/conversion/im_bandjoin.c +libsrc/conversion/im_slice.c +libsrc/conversion/im_wrap.c +libsrc/conversion/im_rot180.c +libsrc/conversion/im_scale.c +libsrc/conversion/im_black.c +libsrc/conversion/im_c2real.c +libsrc/conversion/im_scaleps.c +libsrc/conversion/im_msb.c +libsrc/conversion/im_ri2c.c +libsrc/conversion/im_print.c +libsrc/conversion/im_system.c +libsrc/conversion/im_c2amph.c +libsrc/conversion/im_bernd.c +libsrc/conversion/im_lrjoin.c +libsrc/conversion/im_copy.c +libsrc/conversion/im_extract.c +libsrc/conversion/im_thresh.c +libsrc/conversion/im_zoom.c +libsrc/conversion/im_clip.c +libsrc/conversion/im_vips2mask.c libsrc/conversion/im_replicate.c -libsrc/convolution/im_convf.c -libsrc/convolution/im_embed.c -libsrc/convolution/im_mpercent.c -libsrc/convolution/im_convsep.c -libsrc/convolution/rw_mask.c -libsrc/convolution/im_convsub.c -libsrc/convolution/im_gaussnoise.c -libsrc/convolution/im_logmasks.c -libsrc/convolution/im_gaussmasks.c -libsrc/convolution/im_gradcor.c -libsrc/convolution/im_convsepf.c -libsrc/convolution/im_spcor.c -libsrc/convolution/convol_dispatch.c -libsrc/convolution/rotmask.c -libsrc/convolution/im_resize_linear.c -libsrc/convolution/im_rank.c -libsrc/convolution/im_addgnoise.c -libsrc/convolution/im_rank_image.c -libsrc/convolution/im_shrink.c -libsrc/convolution/im_stretch3.c -libsrc/convolution/im_sharpen.c -libsrc/convolution/im_fastcor.c -libsrc/convolution/im_phasecor_fft.c -libsrc/convolution/im_conv.c +libsrc/conversion/im_rot270.c +libsrc/conversion/im_grid.c +libsrc/conversion/im_fliphor.c +libsrc/conversion/im_gbandjoin.c +libsrc/conversion/im_subsample.c +libsrc/conversion/im_mask2vips.c libsrc/convolution/im_contrast_surface.c -libsrc/convolution/im_compass.c libsrc/convolution/im_zerox.c +libsrc/convolution/im_rank_image.c +libsrc/convolution/im_phasecor_fft.c +libsrc/convolution/im_compass.c +libsrc/convolution/rw_mask.c +libsrc/convolution/im_resize_linear.c +libsrc/convolution/im_sharpen.c +libsrc/convolution/im_spcor.c +libsrc/convolution/im_shrink.c +libsrc/convolution/im_gaussnoise.c +libsrc/convolution/rotmask.c +libsrc/convolution/im_gradcor.c +libsrc/convolution/im_rank.c +libsrc/convolution/im_mpercent.c +libsrc/convolution/im_convsepf.c +libsrc/convolution/convol_dispatch.c +libsrc/convolution/im_embed.c +libsrc/convolution/im_stretch3.c +libsrc/convolution/im_convsub.c +libsrc/convolution/im_convsep.c +libsrc/convolution/im_convf.c +libsrc/convolution/im_gaussmasks.c +libsrc/convolution/im_fastcor.c +libsrc/convolution/im_conv.c +libsrc/convolution/im_logmasks.c +libsrc/convolution/im_addgnoise.c libsrc/dummy.c -libsrc/format/im_jpeg2vips.c -libsrc/format/im_vips2jpeg.c -libsrc/format/im_vips2tiff.c -libsrc/format/im_tiff2vips.c -libsrc/format/im_raw2vips.c -libsrc/format/im_csv2vips.c libsrc/format/im_magick2vips.c libsrc/format/im_vips2csv.c -libsrc/format/im_vips2ppm.c -libsrc/format/im_ppm2vips.c -libsrc/format/im_tile_cache.c -libsrc/format/format_dispatch.c -libsrc/format/im_exr2vips.c +libsrc/format/im_csv2vips.c +libsrc/format/format.c libsrc/format/im_analyze2vips.c -libsrc/format/im_file2vips.c +libsrc/format/im_vips2tiff.c +libsrc/format/im_ppm2vips.c +libsrc/format/format_dispatch.c +libsrc/format/im_tile_cache.c +libsrc/format/im_jpeg2vips.c libsrc/format/im_png2vips.c +libsrc/format/im_vips2ppm.c libsrc/format/im_vips2png.c libsrc/format/im_vips2raw.c -libsrc/format/format.c -libsrc/freq_filt/fmaskcir.c -libsrc/freq_filt/fft_sp.c -libsrc/freq_filt/fmask4th.c -libsrc/freq_filt/im_fwfft.c -libsrc/freq_filt/im_invfft.c -libsrc/freq_filt/im_invfftr.c -libsrc/freq_filt/im_fractsurf.c -libsrc/freq_filt/im_rotquad.c -libsrc/freq_filt/im_disp_ps.c -libsrc/freq_filt/im_freqflt.c -libsrc/freq_filt/freq_dispatch.c +libsrc/format/im_vips2jpeg.c +libsrc/format/im_tiff2vips.c +libsrc/format/im_exr2vips.c +libsrc/format/im_raw2vips.c +libsrc/format/im_file2vips.c libsrc/freq_filt/im_freq_mask.c -libsrc/histograms_lut/im_stdif.c -libsrc/histograms_lut/im_lhisteq.c -libsrc/histograms_lut/im_heq.c -libsrc/histograms_lut/tone.c -libsrc/histograms_lut/im_histspec.c -libsrc/histograms_lut/im_buildlut.c -libsrc/histograms_lut/im_histnD.c -libsrc/histograms_lut/im_identity.c -libsrc/histograms_lut/im_hsp.c +libsrc/freq_filt/im_invfft.c +libsrc/freq_filt/freq_dispatch.c +libsrc/freq_filt/im_disp_ps.c +libsrc/freq_filt/fft_sp.c +libsrc/freq_filt/fmaskcir.c +libsrc/freq_filt/im_fwfft.c +libsrc/freq_filt/im_fractsurf.c +libsrc/freq_filt/im_freqflt.c +libsrc/freq_filt/im_invfftr.c +libsrc/freq_filt/im_rotquad.c +libsrc/freq_filt/fmask4th.c libsrc/histograms_lut/im_invertlut.c -libsrc/histograms_lut/im_histeq.c -libsrc/histograms_lut/im_histgr.c libsrc/histograms_lut/hist_dispatch.c -libsrc/histograms_lut/im_maplut.c -libsrc/histograms_lut/im_gammacorrect.c -libsrc/histograms_lut/im_histplot.c libsrc/histograms_lut/im_project.c libsrc/histograms_lut/im_hist.c -libsrc/inplace/im_insertplace.c -libsrc/inplace/im_paintrect.c -libsrc/inplace/im_plotmask.c -libsrc/inplace/line_draw.c -libsrc/inplace/im_circle.c -libsrc/inplace/plot_point.c +libsrc/histograms_lut/im_histspec.c +libsrc/histograms_lut/im_stdif.c +libsrc/histograms_lut/im_maplut.c +libsrc/histograms_lut/im_histgr.c +libsrc/histograms_lut/im_identity.c +libsrc/histograms_lut/im_histnD.c +libsrc/histograms_lut/tone.c +libsrc/histograms_lut/im_histplot.c +libsrc/histograms_lut/im_gammacorrect.c +libsrc/histograms_lut/im_heq.c +libsrc/histograms_lut/im_histeq.c +libsrc/histograms_lut/im_lhisteq.c +libsrc/histograms_lut/im_buildlut.c +libsrc/histograms_lut/im_hsp.c libsrc/inplace/im_flood.c libsrc/inplace/inplace_dispatch.c -libsrc/inplace/im_line.c +libsrc/inplace/im_paintrect.c libsrc/inplace/smudge_area.c -libsrc/iofuncs/im_histlin.c -libsrc/iofuncs/im_demand_hint.c -libsrc/iofuncs/im_debugim.c -libsrc/iofuncs/im_mapfile.c -libsrc/iofuncs/im_render.c -libsrc/iofuncs/im_image.c -libsrc/iofuncs/im_printlines.c -libsrc/iofuncs/im_header.c -libsrc/iofuncs/util.c -libsrc/iofuncs/im_open.c -libsrc/iofuncs/im_generate.c -libsrc/iofuncs/region.c -libsrc/iofuncs/semaphore.c -libsrc/iofuncs/im_wbuffer.c -libsrc/iofuncs/meta.c -libsrc/iofuncs/debug.c -libsrc/iofuncs/im_writeline.c -libsrc/iofuncs/im_initdesc.c -libsrc/iofuncs/im_guess_prefix.c -libsrc/iofuncs/im_init.c -libsrc/iofuncs/error.c -libsrc/iofuncs/im_iocheck.c +libsrc/inplace/im_insertplace.c +libsrc/inplace/im_plotmask.c +libsrc/inplace/plot_point.c +libsrc/inplace/im_circle.c +libsrc/inplace/line_draw.c +libsrc/inplace/im_line.c +libsrc/iofuncs/im_setbox.c libsrc/iofuncs/rect.c -libsrc/iofuncs/time.c -libsrc/iofuncs/im_updatehist.c -libsrc/iofuncs/im_init_world.c -libsrc/iofuncs/predicate.c -libsrc/iofuncs/vbuf.c -libsrc/iofuncs/im_unmapfile.c +libsrc/iofuncs/im_open.c +libsrc/iofuncs/im_writeline.c +libsrc/iofuncs/util.c +libsrc/iofuncs/im_iocheck.c +libsrc/iofuncs/im_mapfile.c +libsrc/iofuncs/package.c libsrc/iofuncs/window.c +libsrc/iofuncs/im_wrapmany.c +libsrc/iofuncs/im_setbuf.c +libsrc/iofuncs/im_open_vips.c +libsrc/iofuncs/meta.c +libsrc/iofuncs/buf.c +libsrc/iofuncs/im_prepare.c +libsrc/iofuncs/im_init_world.c +libsrc/iofuncs/debug.c +libsrc/iofuncs/callback.c +libsrc/iofuncs/im_iterate.c +libsrc/iofuncs/im_cp_desc.c +libsrc/iofuncs/im_unmapfile.c +libsrc/iofuncs/im_close.c +libsrc/iofuncs/im_image.c +libsrc/iofuncs/im_init.c libsrc/iofuncs/memory.c libsrc/iofuncs/buffer.c -libsrc/iofuncs/im_piocheck.c -libsrc/iofuncs/im_makerw.c -libsrc/iofuncs/im_setbuf.c -libsrc/iofuncs/im_setupout.c -libsrc/iofuncs/im_bits_of_fmt.c -libsrc/iofuncs/im_printdesc.c -libsrc/iofuncs/im_partial.c -libsrc/iofuncs/im_iterate.c -libsrc/iofuncs/error_exit.c -libsrc/iofuncs/dispatch_types.c -libsrc/iofuncs/im_prepare.c -libsrc/iofuncs/im_wrapmany.c -libsrc/iofuncs/base64.c +libsrc/iofuncs/im_render.c +libsrc/iofuncs/time.c +libsrc/iofuncs/im_generate.c +libsrc/iofuncs/im_histlin.c +libsrc/iofuncs/im_header.c libsrc/iofuncs/threadgroup.c -libsrc/iofuncs/im_cp_desc.c -libsrc/iofuncs/im_open_vips.c -libsrc/iofuncs/im_wraptwo.c -libsrc/iofuncs/im_setbox.c -libsrc/iofuncs/im_close.c -libsrc/iofuncs/package.c -libsrc/iofuncs/callback.c +libsrc/iofuncs/im_guess_prefix.c +libsrc/iofuncs/im_demand_hint.c +libsrc/iofuncs/error.c +libsrc/iofuncs/im_makerw.c +libsrc/iofuncs/im_printdesc.c +libsrc/iofuncs/im_piocheck.c +libsrc/iofuncs/base64.c +libsrc/iofuncs/predicate.c +libsrc/iofuncs/semaphore.c libsrc/iofuncs/im_binfile.c -libsrc/matrix/im_matcat.c -libsrc/matrix/im_matinv.c -libsrc/matrix/matrix_dispatch.c -libsrc/matrix/im_matmul.c +libsrc/iofuncs/im_debugim.c +libsrc/iofuncs/im_printlines.c +libsrc/iofuncs/im_partial.c +libsrc/iofuncs/im_wbuffer.c +libsrc/iofuncs/im_setupout.c +libsrc/iofuncs/im_updatehist.c +libsrc/iofuncs/im_bits_of_fmt.c +libsrc/iofuncs/im_initdesc.c +libsrc/iofuncs/error_exit.c +libsrc/iofuncs/im_wraptwo.c +libsrc/iofuncs/dispatch_types.c +libsrc/iofuncs/region.c libsrc/matrix/im_mattrn.c +libsrc/matrix/im_matcat.c libsrc/matrix/matalloc.c -libsrc/morphology/im_erode.c -libsrc/morphology/im_cntlines.c -libsrc/morphology/morph_dispatch.c +libsrc/matrix/matrix_dispatch.c +libsrc/matrix/im_matinv.c +libsrc/matrix/im_matmul.c libsrc/morphology/im_profile.c +libsrc/morphology/morph_dispatch.c libsrc/morphology/im_dilate.c -libsrc/mosaicing/im_lrmosaic.c -libsrc/mosaicing/im_clinear.c -libsrc/mosaicing/global_balance.c -libsrc/mosaicing/im_chkpair.c -libsrc/mosaicing/im_improve.c -libsrc/mosaicing/im_maxpos_subpel.c +libsrc/morphology/im_cntlines.c +libsrc/morphology/im_erode.c libsrc/mosaicing/im_tbmerge.c -libsrc/mosaicing/im_tbcalcon.c libsrc/mosaicing/im_affine.c -libsrc/mosaicing/im_lrcalcon.c -libsrc/mosaicing/im_lrmerge.c -libsrc/mosaicing/im_align_bands.c -libsrc/mosaicing/im_initialize.c +libsrc/mosaicing/im_lrmosaic.c +libsrc/mosaicing/im_chkpair.c +libsrc/mosaicing/global_balance.c libsrc/mosaicing/im_tbmosaic.c -libsrc/mosaicing/similarity.c +libsrc/mosaicing/im_improve.c +libsrc/mosaicing/im_avgdxdy.c +libsrc/mosaicing/mosaic1.c libsrc/mosaicing/im_remosaic.c libsrc/mosaicing/mosaicing_dispatch.c -libsrc/mosaicing/im_avgdxdy.c +libsrc/mosaicing/im_maxpos_subpel.c +libsrc/mosaicing/im_lrcalcon.c +libsrc/mosaicing/im_lrmerge.c +libsrc/mosaicing/im_initialize.c +libsrc/mosaicing/similarity.c +libsrc/mosaicing/im_tbcalcon.c +libsrc/mosaicing/im_align_bands.c libsrc/mosaicing/match.c -libsrc/mosaicing/mosaic1.c -libsrc/other/im_benchmark.c -libsrc/other/im_meanstd.c +libsrc/mosaicing/im_clinear.c +libsrc/other/im_simcontr.c libsrc/other/im_zone.c -libsrc/other/other_dispatch.c +libsrc/other/im_spatres.c libsrc/other/cooc_funcs.c +libsrc/other/im_benchmark.c +libsrc/other/other_dispatch.c +libsrc/other/glds_funcs.c +libsrc/other/im_meanstd.c libsrc/other/im_dif_std.c libsrc/other/im_make_xy.c -libsrc/other/im_simcontr.c -libsrc/other/im_sines.c -libsrc/other/im_spatres.c -libsrc/other/glds_funcs.c libsrc/other/im_eye.c +libsrc/other/im_sines.c libsrc/other/im_grey.c -libsrc/relational/im_blend.c +libsrc/relational/im_ifthenelse.c libsrc/relational/relational_dispatch.c libsrc/relational/relational.c -libsrc/relational/im_ifthenelse.c -libsrc/video/im_video_v4l1.c +libsrc/relational/im_blend.c libsrc/video/video_dispatch.c +libsrc/video/im_video_v4l1.c libsrc/video/im_video_test.c -src/iofuncs/vips.c -src/iofuncs/printlines.c src/iofuncs/binfile.c +src/iofuncs/vips.c +src/iofuncs/debugim.c src/iofuncs/header.c src/iofuncs/edvips.c -src/iofuncs/debugim.c -src/mosaicing/mergeup.c +src/iofuncs/printlines.c src/mosaicing/find_mosaic.c -src/other/simcontr.c -src/other/cooc_features.c -src/other/sines.c +src/mosaicing/mergeup.c src/other/spatres.c -src/other/cooc.c src/other/squares.c +src/other/simcontr.c src/other/glds_features.c src/other/glds.c -vips-7.15.1/contrib/vips2dj/vips2ah.c -vips-7.15.1/contrib/vips2dj/vips2dj.c -vips-7.15.1/contrib/mitsub/mitsub.c -vips-7.15.1/contrib/vdump/vdump.c -vips-7.15.1/libsrc/dummy.c -vips-7.15.1/libsrc/acquire/im_clamp.c -vips-7.15.1/libsrc/arithmetic/arith_dispatch.c -vips-7.15.1/libsrc/arithmetic/im_abs.c -vips-7.15.1/libsrc/arithmetic/im_add.c -vips-7.15.1/libsrc/arithmetic/im_avg.c -vips-7.15.1/libsrc/arithmetic/im_point_bilinear.c -vips-7.15.1/libsrc/arithmetic/im_bandmean.c -vips-7.15.1/libsrc/arithmetic/im_cmulnorm.c -vips-7.15.1/libsrc/arithmetic/im_costra.c -vips-7.15.1/libsrc/arithmetic/im_cross_phase.c -vips-7.15.1/libsrc/arithmetic/im_deviate.c -vips-7.15.1/libsrc/arithmetic/im_divide.c -vips-7.15.1/libsrc/arithmetic/im_ceil.c -vips-7.15.1/libsrc/arithmetic/im_floor.c -vips-7.15.1/libsrc/arithmetic/im_expntra.c -vips-7.15.1/libsrc/arithmetic/im_fav4.c -vips-7.15.1/libsrc/arithmetic/im_gadd.c -vips-7.15.1/libsrc/arithmetic/im_gaddim.c -vips-7.15.1/libsrc/arithmetic/im_gfadd.c -vips-7.15.1/libsrc/arithmetic/im_invert.c -vips-7.15.1/libsrc/arithmetic/im_linreg.c -vips-7.15.1/libsrc/arithmetic/im_lintra.c -vips-7.15.1/libsrc/arithmetic/im_litecor.c -vips-7.15.1/libsrc/arithmetic/im_log10tra.c -vips-7.15.1/libsrc/arithmetic/im_logtra.c -vips-7.15.1/libsrc/arithmetic/im_max.c -vips-7.15.1/libsrc/arithmetic/im_maxpos.c -vips-7.15.1/libsrc/arithmetic/im_maxpos_avg.c -vips-7.15.1/libsrc/arithmetic/im_maxpos_vec.c -vips-7.15.1/libsrc/arithmetic/im_measure.c -vips-7.15.1/libsrc/arithmetic/im_min.c -vips-7.15.1/libsrc/arithmetic/im_minpos.c -vips-7.15.1/libsrc/arithmetic/im_multiply.c -vips-7.15.1/libsrc/arithmetic/im_powtra.c -vips-7.15.1/libsrc/arithmetic/im_remainder.c -vips-7.15.1/libsrc/arithmetic/im_rint.c -vips-7.15.1/libsrc/arithmetic/im_sign.c -vips-7.15.1/libsrc/arithmetic/im_sintra.c -vips-7.15.1/libsrc/arithmetic/im_stats.c -vips-7.15.1/libsrc/arithmetic/im_subtract.c -vips-7.15.1/libsrc/arithmetic/im_tantra.c -vips-7.15.1/libsrc/boolean/bool_dispatch.c -vips-7.15.1/libsrc/boolean/boolean.c -vips-7.15.1/libsrc/colour/colour.c -vips-7.15.1/libsrc/colour/colour_dispatch.c -vips-7.15.1/libsrc/colour/derived.c -vips-7.15.1/libsrc/colour/im_icc_transform.c -vips-7.15.1/libsrc/colour/im_LCh2Lab.c -vips-7.15.1/libsrc/colour/im_LCh2UCS.c -vips-7.15.1/libsrc/colour/im_Lab2LCh.c -vips-7.15.1/libsrc/colour/im_Lab2LabQ.c -vips-7.15.1/libsrc/colour/im_Lab2LabS.c -vips-7.15.1/libsrc/colour/im_Lab2XYZ.c -vips-7.15.1/libsrc/colour/im_LabQ2Lab.c -vips-7.15.1/libsrc/colour/im_LabQ2LabS.c -vips-7.15.1/libsrc/colour/im_LabQ2disp.c -vips-7.15.1/libsrc/colour/im_LabS2LabQ.c -vips-7.15.1/libsrc/colour/im_LabS2Lab.c -vips-7.15.1/libsrc/colour/im_lab_morph.c -vips-7.15.1/libsrc/colour/im_UCS2LCh.c -vips-7.15.1/libsrc/colour/im_XYZ2Lab.c -vips-7.15.1/libsrc/colour/im_XYZ2Yxy.c -vips-7.15.1/libsrc/colour/im_Yxy2XYZ.c -vips-7.15.1/libsrc/colour/im_XYZ2disp.c -vips-7.15.1/libsrc/colour/im_dE00_fromLab.c -vips-7.15.1/libsrc/colour/im_dECMC_fromLab.c -vips-7.15.1/libsrc/colour/im_dE_fromLab.c -vips-7.15.1/libsrc/colour/im_disp2XYZ.c -vips-7.15.1/libsrc/conversion/im_bernd.c -vips-7.15.1/libsrc/conversion/conver_dispatch.c -vips-7.15.1/libsrc/conversion/im_bandjoin.c -vips-7.15.1/libsrc/conversion/im_black.c -vips-7.15.1/libsrc/conversion/im_c2amph.c -vips-7.15.1/libsrc/conversion/im_c2rect.c -vips-7.15.1/libsrc/conversion/im_c2imag.c -vips-7.15.1/libsrc/conversion/im_c2ps.c -vips-7.15.1/libsrc/conversion/im_c2real.c -vips-7.15.1/libsrc/conversion/im_clip.c -vips-7.15.1/libsrc/conversion/im_copy.c -vips-7.15.1/libsrc/conversion/im_extract.c -vips-7.15.1/libsrc/conversion/im_falsecolour.c -vips-7.15.1/libsrc/conversion/im_fliphor.c -vips-7.15.1/libsrc/conversion/im_flipver.c -vips-7.15.1/libsrc/conversion/im_gbandjoin.c -vips-7.15.1/libsrc/conversion/im_insert.c -vips-7.15.1/libsrc/conversion/im_lrjoin.c -vips-7.15.1/libsrc/conversion/im_mask2vips.c -vips-7.15.1/libsrc/conversion/im_msb.c -vips-7.15.1/libsrc/conversion/im_recomb.c -vips-7.15.1/libsrc/conversion/im_replicate.c -vips-7.15.1/libsrc/conversion/im_grid.c -vips-7.15.1/libsrc/conversion/im_ri2c.c -vips-7.15.1/libsrc/conversion/im_rightshift_size.c -vips-7.15.1/libsrc/conversion/im_rot180.c -vips-7.15.1/libsrc/conversion/im_rot270.c -vips-7.15.1/libsrc/conversion/im_rot90.c -vips-7.15.1/libsrc/conversion/im_scale.c -vips-7.15.1/libsrc/conversion/im_scaleps.c -vips-7.15.1/libsrc/conversion/im_slice.c -vips-7.15.1/libsrc/conversion/im_subsample.c -vips-7.15.1/libsrc/conversion/im_system.c -vips-7.15.1/libsrc/conversion/im_print.c -vips-7.15.1/libsrc/conversion/im_tbjoin.c -vips-7.15.1/libsrc/conversion/im_text.c -vips-7.15.1/libsrc/conversion/im_thresh.c -vips-7.15.1/libsrc/conversion/im_vips2mask.c -vips-7.15.1/libsrc/conversion/im_wrap.c -vips-7.15.1/libsrc/conversion/im_zoom.c -vips-7.15.1/libsrc/convolution/rotmask.c -vips-7.15.1/libsrc/convolution/rw_mask.c -vips-7.15.1/libsrc/convolution/convol_dispatch.c -vips-7.15.1/libsrc/convolution/im_addgnoise.c -vips-7.15.1/libsrc/convolution/im_compass.c -vips-7.15.1/libsrc/convolution/im_conv.c -vips-7.15.1/libsrc/convolution/im_convf.c -vips-7.15.1/libsrc/convolution/im_convsep.c -vips-7.15.1/libsrc/convolution/im_convsepf.c -vips-7.15.1/libsrc/convolution/im_convsub.c -vips-7.15.1/libsrc/convolution/im_contrast_surface.c -vips-7.15.1/libsrc/convolution/im_embed.c -vips-7.15.1/libsrc/convolution/im_fastcor.c -vips-7.15.1/libsrc/convolution/im_gaussmasks.c -vips-7.15.1/libsrc/convolution/im_gaussnoise.c -vips-7.15.1/libsrc/convolution/im_gradcor.c -vips-7.15.1/libsrc/convolution/im_logmasks.c -vips-7.15.1/libsrc/convolution/im_rank_image.c -vips-7.15.1/libsrc/convolution/im_mpercent.c -vips-7.15.1/libsrc/convolution/im_phasecor_fft.c -vips-7.15.1/libsrc/convolution/im_rank.c -vips-7.15.1/libsrc/convolution/im_resize_linear.c -vips-7.15.1/libsrc/convolution/im_sharpen.c -vips-7.15.1/libsrc/convolution/im_shrink.c -vips-7.15.1/libsrc/convolution/im_spcor.c -vips-7.15.1/libsrc/convolution/im_stretch3.c -vips-7.15.1/libsrc/convolution/im_zerox.c -vips-7.15.1/libsrc/cimg/cimg_dispatch.c -vips-7.15.1/libsrc/format/format.c -vips-7.15.1/libsrc/format/format_dispatch.c -vips-7.15.1/libsrc/format/im_analyze2vips.c -vips-7.15.1/libsrc/format/im_csv2vips.c -vips-7.15.1/libsrc/format/im_exr2vips.c -vips-7.15.1/libsrc/format/im_jpeg2vips.c -vips-7.15.1/libsrc/format/im_magick2vips.c -vips-7.15.1/libsrc/format/im_png2vips.c -vips-7.15.1/libsrc/format/im_ppm2vips.c -vips-7.15.1/libsrc/format/im_raw2vips.c -vips-7.15.1/libsrc/format/im_tiff2vips.c -vips-7.15.1/libsrc/format/im_tile_cache.c -vips-7.15.1/libsrc/format/im_vips2csv.c -vips-7.15.1/libsrc/format/im_vips2jpeg.c -vips-7.15.1/libsrc/format/im_vips2png.c -vips-7.15.1/libsrc/format/im_vips2ppm.c -vips-7.15.1/libsrc/format/im_vips2tiff.c -vips-7.15.1/libsrc/format/im_vips2raw.c -vips-7.15.1/libsrc/freq_filt/fft_sp.c -vips-7.15.1/libsrc/freq_filt/fmask4th.c -vips-7.15.1/libsrc/freq_filt/fmaskcir.c -vips-7.15.1/libsrc/freq_filt/freq_dispatch.c -vips-7.15.1/libsrc/freq_filt/im_disp_ps.c -vips-7.15.1/libsrc/freq_filt/im_fractsurf.c -vips-7.15.1/libsrc/freq_filt/im_freq_mask.c -vips-7.15.1/libsrc/freq_filt/im_freqflt.c -vips-7.15.1/libsrc/freq_filt/im_fwfft.c -vips-7.15.1/libsrc/freq_filt/im_invfft.c -vips-7.15.1/libsrc/freq_filt/im_invfftr.c -vips-7.15.1/libsrc/freq_filt/im_rotquad.c -vips-7.15.1/libsrc/histograms_lut/hist_dispatch.c -vips-7.15.1/libsrc/histograms_lut/im_gammacorrect.c -vips-7.15.1/libsrc/histograms_lut/im_heq.c -vips-7.15.1/libsrc/histograms_lut/im_hist.c -vips-7.15.1/libsrc/histograms_lut/im_histeq.c -vips-7.15.1/libsrc/histograms_lut/im_histgr.c -vips-7.15.1/libsrc/histograms_lut/im_histnD.c -vips-7.15.1/libsrc/histograms_lut/im_histplot.c -vips-7.15.1/libsrc/histograms_lut/im_histspec.c -vips-7.15.1/libsrc/histograms_lut/im_hsp.c -vips-7.15.1/libsrc/histograms_lut/im_identity.c -vips-7.15.1/libsrc/histograms_lut/im_invertlut.c -vips-7.15.1/libsrc/histograms_lut/im_lhisteq.c -vips-7.15.1/libsrc/histograms_lut/im_maplut.c -vips-7.15.1/libsrc/histograms_lut/im_buildlut.c -vips-7.15.1/libsrc/histograms_lut/im_project.c -vips-7.15.1/libsrc/histograms_lut/im_stdif.c -vips-7.15.1/libsrc/histograms_lut/tone.c -vips-7.15.1/libsrc/inplace/im_circle.c -vips-7.15.1/libsrc/inplace/im_flood.c -vips-7.15.1/libsrc/inplace/im_insertplace.c -vips-7.15.1/libsrc/inplace/im_line.c -vips-7.15.1/libsrc/inplace/im_paintrect.c -vips-7.15.1/libsrc/inplace/im_plotmask.c -vips-7.15.1/libsrc/inplace/inplace_dispatch.c -vips-7.15.1/libsrc/inplace/line_draw.c -vips-7.15.1/libsrc/inplace/plot_point.c -vips-7.15.1/libsrc/inplace/smudge_area.c -vips-7.15.1/libsrc/iofuncs/meta.c -vips-7.15.1/libsrc/iofuncs/base64.c -vips-7.15.1/libsrc/iofuncs/callback.c -vips-7.15.1/libsrc/iofuncs/debug.c -vips-7.15.1/libsrc/iofuncs/dispatch_types.c -vips-7.15.1/libsrc/iofuncs/error.c -vips-7.15.1/libsrc/iofuncs/error_exit.c -vips-7.15.1/libsrc/iofuncs/im_binfile.c -vips-7.15.1/libsrc/iofuncs/im_bits_of_fmt.c -vips-7.15.1/libsrc/iofuncs/im_close.c -vips-7.15.1/libsrc/iofuncs/im_cp_desc.c -vips-7.15.1/libsrc/iofuncs/im_debugim.c -vips-7.15.1/libsrc/iofuncs/im_demand_hint.c -vips-7.15.1/libsrc/iofuncs/im_generate.c -vips-7.15.1/libsrc/iofuncs/im_header.c -vips-7.15.1/libsrc/iofuncs/im_histlin.c -vips-7.15.1/libsrc/iofuncs/im_image.c -vips-7.15.1/libsrc/iofuncs/im_init.c -vips-7.15.1/libsrc/iofuncs/im_initdesc.c -vips-7.15.1/libsrc/iofuncs/im_iocheck.c -vips-7.15.1/libsrc/iofuncs/im_iterate.c -vips-7.15.1/libsrc/iofuncs/im_makerw.c -vips-7.15.1/libsrc/iofuncs/im_mapfile.c -vips-7.15.1/libsrc/iofuncs/im_open.c -vips-7.15.1/libsrc/iofuncs/im_open_vips.c -vips-7.15.1/libsrc/iofuncs/im_partial.c -vips-7.15.1/libsrc/iofuncs/im_piocheck.c -vips-7.15.1/libsrc/iofuncs/im_prepare.c -vips-7.15.1/libsrc/iofuncs/im_printdesc.c -vips-7.15.1/libsrc/iofuncs/im_printlines.c -vips-7.15.1/libsrc/iofuncs/im_render.c -vips-7.15.1/libsrc/iofuncs/im_setbox.c -vips-7.15.1/libsrc/iofuncs/im_setbuf.c -vips-7.15.1/libsrc/iofuncs/im_setupout.c -vips-7.15.1/libsrc/iofuncs/im_unmapfile.c -vips-7.15.1/libsrc/iofuncs/im_updatehist.c -vips-7.15.1/libsrc/iofuncs/im_guess_prefix.c -vips-7.15.1/libsrc/iofuncs/im_wbuffer.c -vips-7.15.1/libsrc/iofuncs/im_wrapmany.c -vips-7.15.1/libsrc/iofuncs/im_wraptwo.c -vips-7.15.1/libsrc/iofuncs/im_writeline.c -vips-7.15.1/libsrc/iofuncs/memory.c -vips-7.15.1/libsrc/iofuncs/package.c -vips-7.15.1/libsrc/iofuncs/predicate.c -vips-7.15.1/libsrc/iofuncs/region.c -vips-7.15.1/libsrc/iofuncs/rect.c -vips-7.15.1/libsrc/iofuncs/semaphore.c -vips-7.15.1/libsrc/iofuncs/threadgroup.c -vips-7.15.1/libsrc/iofuncs/util.c -vips-7.15.1/libsrc/iofuncs/im_init_world.c -vips-7.15.1/libsrc/iofuncs/vbuf.c -vips-7.15.1/libsrc/iofuncs/window.c -vips-7.15.1/libsrc/iofuncs/buffer.c -vips-7.15.1/libsrc/iofuncs/time.c -vips-7.15.1/libsrc/matrix/im_matcat.c -vips-7.15.1/libsrc/matrix/im_matinv.c -vips-7.15.1/libsrc/matrix/im_matmul.c -vips-7.15.1/libsrc/matrix/im_mattrn.c -vips-7.15.1/libsrc/matrix/matalloc.c -vips-7.15.1/libsrc/matrix/matrix_dispatch.c -vips-7.15.1/libsrc/morphology/im_cntlines.c -vips-7.15.1/libsrc/morphology/im_dilate.c -vips-7.15.1/libsrc/morphology/im_erode.c -vips-7.15.1/libsrc/morphology/morph_dispatch.c -vips-7.15.1/libsrc/morphology/im_profile.c -vips-7.15.1/libsrc/mosaicing/im_affine.c -vips-7.15.1/libsrc/mosaicing/im_align_bands.c -vips-7.15.1/libsrc/mosaicing/match.c -vips-7.15.1/libsrc/mosaicing/mosaic1.c -vips-7.15.1/libsrc/mosaicing/mosaicing_dispatch.c -vips-7.15.1/libsrc/mosaicing/similarity.c -vips-7.15.1/libsrc/mosaicing/global_balance.c -vips-7.15.1/libsrc/mosaicing/im_avgdxdy.c -vips-7.15.1/libsrc/mosaicing/im_chkpair.c -vips-7.15.1/libsrc/mosaicing/im_clinear.c -vips-7.15.1/libsrc/mosaicing/im_improve.c -vips-7.15.1/libsrc/mosaicing/im_initialize.c -vips-7.15.1/libsrc/mosaicing/im_lrcalcon.c -vips-7.15.1/libsrc/mosaicing/im_lrmerge.c -vips-7.15.1/libsrc/mosaicing/im_lrmosaic.c -vips-7.15.1/libsrc/mosaicing/im_maxpos_subpel.c -vips-7.15.1/libsrc/mosaicing/im_tbcalcon.c -vips-7.15.1/libsrc/mosaicing/im_tbmerge.c -vips-7.15.1/libsrc/mosaicing/im_remosaic.c -vips-7.15.1/libsrc/mosaicing/im_tbmosaic.c -vips-7.15.1/libsrc/other/cooc_funcs.c -vips-7.15.1/libsrc/other/glds_funcs.c -vips-7.15.1/libsrc/other/im_benchmark.c -vips-7.15.1/libsrc/other/im_dif_std.c -vips-7.15.1/libsrc/other/im_eye.c -vips-7.15.1/libsrc/other/im_grey.c -vips-7.15.1/libsrc/other/im_make_xy.c -vips-7.15.1/libsrc/other/im_meanstd.c -vips-7.15.1/libsrc/other/im_simcontr.c -vips-7.15.1/libsrc/other/im_sines.c -vips-7.15.1/libsrc/other/im_spatres.c -vips-7.15.1/libsrc/other/im_zone.c -vips-7.15.1/libsrc/other/other_dispatch.c -vips-7.15.1/libsrc/relational/im_ifthenelse.c -vips-7.15.1/libsrc/relational/im_blend.c -vips-7.15.1/libsrc/relational/relational.c -vips-7.15.1/libsrc/relational/relational_dispatch.c -vips-7.15.1/libsrc/video/video_dispatch.c -vips-7.15.1/libsrc/video/im_video_v4l1.c -vips-7.15.1/libsrc/video/im_video_test.c -vips-7.15.1/src/iofuncs/binfile.c -vips-7.15.1/src/iofuncs/debugim.c -vips-7.15.1/src/iofuncs/edvips.c -vips-7.15.1/src/iofuncs/header.c -vips-7.15.1/src/iofuncs/printlines.c -vips-7.15.1/src/iofuncs/vips.c -vips-7.15.1/src/mosaicing/find_mosaic.c -vips-7.15.1/src/mosaicing/mergeup.c -vips-7.15.1/src/other/cooc.c -vips-7.15.1/src/other/cooc_features.c -vips-7.15.1/src/other/glds.c -vips-7.15.1/src/other/glds_features.c -vips-7.15.1/src/other/simcontr.c -vips-7.15.1/src/other/sines.c -vips-7.15.1/src/other/spatres.c -vips-7.15.1/src/other/squares.c +src/other/sines.c +src/other/cooc.c +src/other/cooc_features.c libsrcCC/VDisplay.cc libsrcCC/VError.cc libsrcCC/VImage.cc libsrcCC/vipsc++.cc libsrcCC/VMask.cc libsrc/dummy2.cc -vips-7.15.1/libsrc/dummy2.cc -vips-7.15.1/libsrcCC/VImage.cc -vips-7.15.1/libsrcCC/VError.cc -vips-7.15.1/libsrcCC/VDisplay.cc -vips-7.15.1/libsrcCC/VMask.cc -vips-7.15.1/libsrcCC/vipsc++.cc +contrib/vips2dj/vips2dj.h +include/vips/mosaic.h +include/vips/proto.h +include/vips/VDisplay.h +include/vips/debug.h +include/vips/colour.h +include/vips/region.h +include/vips/meta.h +include/vips/vips.h +include/vips/format.h +include/vips/VError.h +include/vips/util.h +include/vips/thread.h +include/vips/vipscpp.h +include/vips/r_access.h +include/vips/threadgroup.h +include/vips/version.h +include/vips/VMask.h +include/vips/struct.h +include/vips/internal.h +include/vips/intl.h +include/vips/VImage.h +include/vips/rect.h +include/vips/inlines.h +include/vips/fmask.h +include/vips/vipsc++.h +include/vips/buf.h +include/vips/semaphore.h +include/vips/dispatch.h +libsrc/cimg/CImg.h +libsrc/format/dbh.h +libsrc/iofuncs/base64.h +libsrc/mosaicing/merge.h +libsrc/mosaicing/mosaic.h +libsrc/mosaicing/global_balance.h +libsrc/video/im_video_v4l1.h diff --git a/po/README b/po/README index 1ebdcb47..3b44e594 100644 --- a/po/README +++ b/po/README @@ -20,8 +20,9 @@ and it would display as "Sevy imago os ...", with the "m" underlined. tips ---- -cd vips-7.14.x ; find */* -name "*.c" > po/POTFILES.in -cd vips-7.14.x ; find */* -name "*.cc" >> po/POTFILES.in +cd vips-7.x.x ; find */* -name "*.c" > po/POTFILES.in +cd vips-7.x.x ; find */* -name "*.cc" >> po/POTFILES.in +cd vips-7.x.x ; find */* -name "*.h" >> po/POTFILES.in regenerate the list of files to search for strings @@ -37,14 +38,15 @@ intltool-update --pot add header # test translation file -# +# msgid "" msgstr "" -"Project-Id-Version: vips 7.9.3\n" -"POT-Creation-Date: 2003-11-04 12:18+0000\n" -"PO-Revision-Date: 2003-11-04 12:30+0000\n" -"Last-Translator: john \n" -"Language-Team: dk \n" +"Project-Id-Version: vips 7.16.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: Fri Sep 5 10:27:43 BST 2008\n" +"PO-Revision-Date: Fri Sep 5 10:27:43 BST 2008\n" +"Last-Translator: john \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/en_GB.gmo b/po/en_GB.gmo index cfcb44d5..2e3ed37e 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 31361b6c..8d6ffff7 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,578 +1,438 @@ -# UK english translation ... just swap color for colour +# test translation file # msgid "" msgstr "" -"Project-Id-Version: vips 7.14.2\n" +"Project-Id-Version: vips 7.16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-15 23:00+0100\n" -"PO-Revision-Date: 2008-04-09 15:57+0100\n" -"Last-Translator: john \n" -"Language-Team: en_GB \n" +"POT-Creation-Date: 2008-09-15 17:52+0100\n" +"PO-Revision-Date: Fri Sep 5 10:27:43 BST 2008\n" +"Last-Translator: john \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libsrc/acquire/im_clamp.c:70 vips-7.15.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.15.1/libsrc/acquire/im_clamp.c:75 +#: libsrc/acquire/im_clamp.c:75 #, fuzzy msgid "bad black format" msgstr "bad colourmap" -#: libsrc/arithmetic/im_ceil.c:92 libsrc/arithmetic/im_avg.c:191 -#: libsrc/arithmetic/im_expntra.c:184 libsrc/arithmetic/im_floor.c:106 -#: libsrc/arithmetic/im_subtract.c:186 libsrc/arithmetic/im_logtra.c:124 -#: libsrc/arithmetic/im_sign.c:146 libsrc/arithmetic/im_sintra.c:117 -#: libsrc/arithmetic/im_sintra.c:202 libsrc/arithmetic/im_divide.c:186 +#: libsrc/arithmetic/im_logtra.c:124 libsrc/arithmetic/im_sign.c:146 +#: libsrc/arithmetic/im_subtract.c:186 libsrc/arithmetic/im_max.c:239 #: libsrc/arithmetic/im_remainder.c:107 libsrc/arithmetic/im_remainder.c:213 -#: libsrc/arithmetic/im_invert.c:119 libsrc/arithmetic/im_rint.c:92 -#: libsrc/arithmetic/im_powtra.c:184 libsrc/arithmetic/im_multiply.c:202 -#: libsrc/arithmetic/im_deviate.c:199 libsrc/arithmetic/im_min.c:236 -#: libsrc/arithmetic/im_max.c:239 libsrc/arithmetic/im_add.c:255 -#: libsrc/arithmetic/im_tantra.c:117 libsrc/arithmetic/im_tantra.c:203 -#: libsrc/arithmetic/im_lintra.c:320 libsrc/arithmetic/im_log10tra.c:124 +#: libsrc/arithmetic/im_multiply.c:202 libsrc/arithmetic/im_abs.c:221 +#: libsrc/arithmetic/im_ceil.c:92 libsrc/arithmetic/im_avg.c:191 +#: libsrc/arithmetic/im_add.c:255 libsrc/arithmetic/im_min.c:236 +#: libsrc/arithmetic/im_deviate.c:199 libsrc/arithmetic/im_stats.c:241 +#: libsrc/arithmetic/im_lintra.c:320 libsrc/arithmetic/im_measure.c:189 +#: libsrc/arithmetic/im_log10tra.c:124 libsrc/arithmetic/im_powtra.c:184 #: libsrc/arithmetic/im_costra.c:117 libsrc/arithmetic/im_costra.c:202 -#: libsrc/arithmetic/im_stats.c:241 libsrc/arithmetic/im_measure.c:189 -#: libsrc/arithmetic/im_abs.c:221 libsrc/arithmetic/im_maxpos.c:94 -#: vips-7.15.1/libsrc/arithmetic/im_abs.c:221 -#: vips-7.15.1/libsrc/arithmetic/im_add.c:255 -#: vips-7.15.1/libsrc/arithmetic/im_avg.c:191 -#: vips-7.15.1/libsrc/arithmetic/im_costra.c:117 -#: vips-7.15.1/libsrc/arithmetic/im_costra.c:202 -#: vips-7.15.1/libsrc/arithmetic/im_deviate.c:199 -#: vips-7.15.1/libsrc/arithmetic/im_divide.c:186 -#: vips-7.15.1/libsrc/arithmetic/im_ceil.c:92 -#: vips-7.15.1/libsrc/arithmetic/im_floor.c:106 -#: vips-7.15.1/libsrc/arithmetic/im_expntra.c:184 -#: vips-7.15.1/libsrc/arithmetic/im_invert.c:119 -#: vips-7.15.1/libsrc/arithmetic/im_lintra.c:320 -#: vips-7.15.1/libsrc/arithmetic/im_log10tra.c:124 -#: vips-7.15.1/libsrc/arithmetic/im_logtra.c:124 -#: vips-7.15.1/libsrc/arithmetic/im_max.c:239 -#: vips-7.15.1/libsrc/arithmetic/im_maxpos.c:94 -#: vips-7.15.1/libsrc/arithmetic/im_measure.c:189 -#: vips-7.15.1/libsrc/arithmetic/im_min.c:236 -#: vips-7.15.1/libsrc/arithmetic/im_multiply.c:202 -#: vips-7.15.1/libsrc/arithmetic/im_powtra.c:184 -#: vips-7.15.1/libsrc/arithmetic/im_remainder.c:107 -#: vips-7.15.1/libsrc/arithmetic/im_remainder.c:213 -#: vips-7.15.1/libsrc/arithmetic/im_rint.c:92 -#: vips-7.15.1/libsrc/arithmetic/im_sign.c:146 -#: vips-7.15.1/libsrc/arithmetic/im_sintra.c:117 -#: vips-7.15.1/libsrc/arithmetic/im_sintra.c:202 -#: vips-7.15.1/libsrc/arithmetic/im_stats.c:241 -#: vips-7.15.1/libsrc/arithmetic/im_subtract.c:186 -#: vips-7.15.1/libsrc/arithmetic/im_tantra.c:117 -#: vips-7.15.1/libsrc/arithmetic/im_tantra.c:203 +#: libsrc/arithmetic/im_maxpos.c:94 libsrc/arithmetic/im_invert.c:119 +#: libsrc/arithmetic/im_rint.c:92 libsrc/arithmetic/im_sintra.c:117 +#: 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 msgid "not uncoded" msgstr "" -#: libsrc/arithmetic/im_avg.c:187 libsrc/arithmetic/im_deviate.c:203 -#: libsrc/arithmetic/im_costra.c:121 libsrc/arithmetic/im_costra.c:206 -#: libsrc/arithmetic/im_stats.c:237 libsrc/arithmetic/im_measure.c:193 -#: vips-7.15.1/libsrc/arithmetic/im_avg.c:187 -#: vips-7.15.1/libsrc/arithmetic/im_costra.c:121 -#: vips-7.15.1/libsrc/arithmetic/im_costra.c:206 -#: vips-7.15.1/libsrc/arithmetic/im_deviate.c:203 -#: vips-7.15.1/libsrc/arithmetic/im_measure.c:193 -#: vips-7.15.1/libsrc/arithmetic/im_stats.c:237 -msgid "bad input type" -msgstr "" - -#: libsrc/arithmetic/im_expntra.c:188 libsrc/arithmetic/im_logtra.c:128 -#: libsrc/arithmetic/im_sintra.c:121 libsrc/arithmetic/im_sintra.c:206 -#: libsrc/arithmetic/im_powtra.c:188 libsrc/arithmetic/im_tantra.c:121 -#: libsrc/arithmetic/im_tantra.c:207 libsrc/arithmetic/im_log10tra.c:128 -#: vips-7.15.1/libsrc/arithmetic/im_expntra.c:188 -#: vips-7.15.1/libsrc/arithmetic/im_log10tra.c:128 -#: vips-7.15.1/libsrc/arithmetic/im_logtra.c:128 -#: vips-7.15.1/libsrc/arithmetic/im_powtra.c:188 -#: vips-7.15.1/libsrc/arithmetic/im_sintra.c:121 -#: vips-7.15.1/libsrc/arithmetic/im_sintra.c:206 -#: vips-7.15.1/libsrc/arithmetic/im_tantra.c:121 -#: vips-7.15.1/libsrc/arithmetic/im_tantra.c:207 +#: libsrc/arithmetic/im_logtra.c:128 libsrc/arithmetic/im_log10tra.c:128 +#: 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 msgid "not non-complex" msgstr "" -#: libsrc/arithmetic/im_expntra.c:193 libsrc/arithmetic/im_remainder.c:218 -#: libsrc/arithmetic/im_powtra.c:193 libsrc/arithmetic/im_lintra.c:329 -#: vips-7.15.1/libsrc/arithmetic/im_expntra.c:193 -#: vips-7.15.1/libsrc/arithmetic/im_lintra.c:329 -#: vips-7.15.1/libsrc/arithmetic/im_powtra.c:193 -#: vips-7.15.1/libsrc/arithmetic/im_remainder.c:218 +#: libsrc/arithmetic/im_gadd.c:91 libsrc/arithmetic/im_gadd.c:107 +msgid "Unable to accept image1" +msgstr "" + +#: libsrc/arithmetic/im_minpos.c:80 libsrc/format/im_vips2csv.c:128 +msgid "input must be uncoded" +msgstr "" + +#: libsrc/arithmetic/im_maxpos_avg.c:95 libsrc/arithmetic/im_maxpos_vec.c:132 +#: libsrc/arithmetic/im_maxpos_vec.c:178 +#: libsrc/arithmetic/im_point_bilinear.c:75 +#: 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:313 +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 +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 +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 +msgid "invalid argument" +msgstr "" + +#: libsrc/arithmetic/im_subtract.c:182 libsrc/arithmetic/im_remainder.c:103 +#: libsrc/arithmetic/im_multiply.c:198 libsrc/arithmetic/im_add.c:251 +#: 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 +msgid "not same size" +msgstr "" + +#: libsrc/arithmetic/im_remainder.c:218 libsrc/arithmetic/im_lintra.c:329 +#: libsrc/arithmetic/im_powtra.c:193 libsrc/arithmetic/im_expntra.c:193 #, c-format msgid "not 1 or %d elements in vector" msgstr "" -#: libsrc/arithmetic/im_subtract.c:182 libsrc/arithmetic/im_divide.c:182 -#: libsrc/arithmetic/im_remainder.c:103 libsrc/arithmetic/im_multiply.c:198 -#: libsrc/arithmetic/im_add.c:251 vips-7.15.1/libsrc/arithmetic/im_add.c:251 -#: vips-7.15.1/libsrc/arithmetic/im_divide.c:182 -#: vips-7.15.1/libsrc/arithmetic/im_multiply.c:198 -#: vips-7.15.1/libsrc/arithmetic/im_remainder.c:103 -#: vips-7.15.1/libsrc/arithmetic/im_subtract.c:182 -msgid "not same number of bands" -msgstr "" - -#: libsrc/arithmetic/im_gadd.c:91 libsrc/arithmetic/im_gadd.c:107 -#: vips-7.15.1/libsrc/arithmetic/im_gadd.c:91 -#: vips-7.15.1/libsrc/arithmetic/im_gadd.c:107 -msgid "Unable to accept image1" -msgstr "" - -#: libsrc/arithmetic/im_maxpos_vec.c:122 libsrc/arithmetic/im_maxpos_vec.c:168 -#: libsrc/arithmetic/im_point_bilinear.c:79 -#: libsrc/arithmetic/im_maxpos_avg.c:99 -#: vips-7.15.1/libsrc/arithmetic/im_point_bilinear.c:79 -#: vips-7.15.1/libsrc/arithmetic/im_maxpos_avg.c:99 -#: vips-7.15.1/libsrc/arithmetic/im_maxpos_vec.c:122 -#: vips-7.15.1/libsrc/arithmetic/im_maxpos_vec.c:168 -msgid "scalar images only" -msgstr "" - -#: libsrc/arithmetic/im_maxpos_vec.c:127 libsrc/arithmetic/im_maxpos_vec.c:173 -#: libsrc/arithmetic/im_maxpos_avg.c:103 -#: vips-7.15.1/libsrc/arithmetic/im_maxpos_avg.c:103 -#: vips-7.15.1/libsrc/arithmetic/im_maxpos_vec.c:127 -#: vips-7.15.1/libsrc/arithmetic/im_maxpos_vec.c:173 -msgid "single band images only" -msgstr "" - -#: libsrc/arithmetic/im_maxpos_vec.c:132 libsrc/arithmetic/im_maxpos_vec.c:178 -#: libsrc/arithmetic/im_point_bilinear.c:75 -#: libsrc/arithmetic/im_maxpos_avg.c:95 -#: libsrc/conversion/im_rightshift_size.c:130 -#: libsrc/conversion/im_vips2mask.c:86 libsrc/histograms_lut/im_histgr.c:313 -#: libsrc/histograms_lut/im_project.c:258 -#: vips-7.15.1/libsrc/arithmetic/im_point_bilinear.c:75 -#: vips-7.15.1/libsrc/arithmetic/im_maxpos_avg.c:95 -#: vips-7.15.1/libsrc/arithmetic/im_maxpos_vec.c:132 -#: vips-7.15.1/libsrc/arithmetic/im_maxpos_vec.c:178 -#: vips-7.15.1/libsrc/conversion/im_rightshift_size.c:130 -#: vips-7.15.1/libsrc/conversion/im_vips2mask.c:86 -#: vips-7.15.1/libsrc/histograms_lut/im_histgr.c:313 -#: vips-7.15.1/libsrc/histograms_lut/im_project.c:258 -msgid "uncoded images only" -msgstr "" - -#: libsrc/arithmetic/im_maxpos_vec.c:137 libsrc/arithmetic/im_maxpos_vec.c:183 -#: libsrc/arithmetic/im_maxpos_avg.c:107 -#: vips-7.15.1/libsrc/arithmetic/im_maxpos_avg.c:107 -#: vips-7.15.1/libsrc/arithmetic/im_maxpos_vec.c:137 -#: vips-7.15.1/libsrc/arithmetic/im_maxpos_vec.c:183 -msgid "invalid argument" -msgstr "" - -#: libsrc/arithmetic/im_bandmean.c:142 -#: vips-7.15.1/libsrc/arithmetic/im_bandmean.c:142 -msgid "uncoded multiband only" -msgstr "" - -#: libsrc/arithmetic/im_remainder.c:98 libsrc/arithmetic/im_multiply.c:193 -#: vips-7.15.1/libsrc/arithmetic/im_multiply.c:193 -#: vips-7.15.1/libsrc/arithmetic/im_remainder.c:98 -msgid "not same size" -msgstr "" - #: libsrc/arithmetic/im_remainder.c:240 -#: vips-7.15.1/libsrc/arithmetic/im_remainder.c:240 msgid "division by zero" msgstr "" -#: libsrc/arithmetic/im_invert.c:123 -#: vips-7.15.1/libsrc/arithmetic/im_invert.c:123 -msgid "not UCHAR" +#: libsrc/arithmetic/im_abs.c:257 +msgid "unknown input type" msgstr "" -#: libsrc/arithmetic/im_add.c:191 vips-7.15.1/libsrc/arithmetic/im_add.c:191 +#: 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 +msgid "bad input type" +msgstr "" + +#: libsrc/arithmetic/im_bandmean.c:142 +msgid "uncoded multiband only" +msgstr "" + +#: libsrc/arithmetic/im_add.c:191 #, c-format msgid "not one band or %d bands" msgstr "" -#: libsrc/arithmetic/im_add.c:195 vips-7.15.1/libsrc/arithmetic/im_add.c:195 +#: libsrc/arithmetic/im_add.c:195 msgid "bad bands" msgstr "" -#: libsrc/arithmetic/im_point_bilinear.c:83 -#: libsrc/arithmetic/im_point_bilinear.c:97 -#: vips-7.15.1/libsrc/arithmetic/im_point_bilinear.c:83 -#: vips-7.15.1/libsrc/arithmetic/im_point_bilinear.c:97 -msgid "coords outside image" -msgstr "" - -#: libsrc/arithmetic/im_point_bilinear.c:87 -#: vips-7.15.1/libsrc/arithmetic/im_point_bilinear.c:87 -msgid "invalid arguments" -msgstr "" - #: libsrc/arithmetic/im_measure.c:106 -#: vips-7.15.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.15.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 +msgid "not UCHAR" +msgstr "" + #. Name #: libsrc/arithmetic/arith_dispatch.c:79 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:79 msgid "absolute value" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:98 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:98 msgid "add two images" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:123 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:123 msgid "average value of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:171 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:171 msgid "multiply two complex images, normalising output" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:196 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:196 msgid "standard deviation of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:215 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:215 msgid "10^pel of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:234 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:234 msgid "e^pel of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:263 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:263 msgid "x^pel of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:292 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:292 msgid "[x,y,z]^pel of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:328 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:328 msgid "average of 4 images" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:347 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:347 msgid "divide two images" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:381 -#: vips-7.15.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.15.1/libsrc/arithmetic/arith_dispatch.c:400 msgid "photographic negative" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:431 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:431 msgid "calculate a*in + b = outfile" msgstr "" #: libsrc/arithmetic/arith_dispatch.c:456 #: libsrc/inplace/inplace_dispatch.c:170 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:456 -#: vips-7.15.1/libsrc/inplace/inplace_dispatch.c:170 msgid "vectors not same length" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:467 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:467 msgid "calculate a*in + b -> out, a and b vectors" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:499 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:499 msgid "calculate max(white)*factor*(in/white), if clip == 1" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:518 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:518 msgid "log10 of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:537 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:537 msgid "ln of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:556 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:556 msgid "tan of image (angles in degrees)" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:575 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:575 msgid "atan of image (result in degrees)" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:594 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:594 msgid "cos of image (angles in degrees)" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:613 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:613 msgid "acos of image (result in degrees)" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:632 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:632 msgid "round to smallest integal value not less than" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:651 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:651 msgid "round to largest integal value not greater than" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:670 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:670 msgid "round to nearest integal value" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:689 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:689 msgid "sin of image (angles in degrees)" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:708 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:708 msgid "average image bands" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:727 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:727 msgid "unit vector in direction of value" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:746 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:746 msgid "asin of image (result in degrees)" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:771 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:771 msgid "maximum value of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:806 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:806 msgid "position of maximum value of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:972 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:972 msgid "measure averages of a grid of patches" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:997 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:997 msgid "minimum value of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1025 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:1025 msgid "position of minimum value of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1044 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:1044 msgid "remainder after integer division" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1073 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:1073 msgid "remainder after integer division by a constant" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1102 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:1102 msgid "remainder after integer division by a vector of constants" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1122 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:1122 msgid "multiply two images" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1143 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:1143 msgid "pel^x ofbuildimage" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1164 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:1164 msgid "pel^[x,y,z] of image" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1195 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:1195 msgid "many image statistics in one pass" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1214 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:1214 msgid "subtract two images" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1262 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:1262 msgid "pixelwise linear regression" msgstr "" #. Name #: libsrc/arithmetic/arith_dispatch.c:1281 -#: vips-7.15.1/libsrc/arithmetic/arith_dispatch.c:1281 msgid "phase of cross power spectrum of two complex images" msgstr "" -#: libsrc/arithmetic/im_minpos.c:80 libsrc/format/im_vips2csv.c:128 -#: vips-7.15.1/libsrc/arithmetic/im_minpos.c:80 -#: vips-7.15.1/libsrc/format/im_vips2csv.c:128 -msgid "input must be uncoded" +#: libsrc/arithmetic/im_point_bilinear.c:83 +#: libsrc/arithmetic/im_point_bilinear.c:97 +msgid "coords outside image" msgstr "" -#: libsrc/arithmetic/im_abs.c:257 vips-7.15.1/libsrc/arithmetic/im_abs.c:257 -msgid "unknown input type" +#: libsrc/arithmetic/im_point_bilinear.c:87 +msgid "invalid arguments" +msgstr "" + +#: libsrc/colour/im_disp2XYZ.c:92 +msgid "input not 3-band uncoded char" +msgstr "" + +#: libsrc/colour/im_XYZ2disp.c:142 +msgid "3-band uncoded float only" +msgstr "" + +#: libsrc/colour/im_Lab2XYZ.c:121 libsrc/colour/im_XYZ2Lab.c:163 +msgid "not 3-band uncoded float" msgstr "" #: libsrc/colour/im_icc_transform.c:63 -#: vips-7.15.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.15.1/libsrc/colour/im_icc_transform.c:73 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:82 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:92 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:102 -#: vips-7.15.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.15.1/libsrc/colour/im_icc_transform.c:233 -#: vips-7.15.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.15.1/libsrc/colour/im_icc_transform.c:254 msgid "unable to create profiles" msgstr "" #: libsrc/colour/im_icc_transform.c:272 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:272 msgid "unable to read profile" msgstr "" #: libsrc/colour/im_icc_transform.c:385 libsrc/colour/im_icc_transform.c:520 #: libsrc/conversion/im_gbandjoin.c:190 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:385 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:520 -#: vips-7.15.1/libsrc/conversion/im_gbandjoin.c:190 msgid "uncoded input only" msgstr "" #: libsrc/colour/im_icc_transform.c:412 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:412 msgid "CMYK input profile needs a 4 band input image" msgstr "" #: libsrc/colour/im_icc_transform.c:421 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:421 msgid "RGB input profile needs a 3 band input image" msgstr "" #: libsrc/colour/im_icc_transform.c:429 libsrc/colour/im_icc_transform.c:560 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:429 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:560 #, fuzzy, c-format msgid "unimplemented input colour space 0x%x" msgstr "unsupported colourspace %d" #: libsrc/colour/im_icc_transform.c:457 libsrc/colour/im_icc_transform.c:718 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:457 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:718 #, fuzzy, c-format msgid "unimplemented output colour space 0x%x" msgstr "unsupported colourspace %d" #: libsrc/colour/im_icc_transform.c:473 libsrc/colour/im_icc_transform.c:576 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:473 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:576 msgid "uchar or ushort input only" msgstr "" #: libsrc/colour/im_icc_transform.c:526 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:526 #, c-format msgid "" "intent %d (%s) not supported by profile; falling back to default intent " @@ -580,600 +440,500 @@ msgid "" msgstr "" #: libsrc/colour/im_icc_transform.c:543 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:543 msgid "CMYK profile needs a 4 band input image" msgstr "" #: libsrc/colour/im_icc_transform.c:552 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:552 msgid "RGB profile needs a 3 band input image" msgstr "" #: libsrc/colour/im_icc_transform.c:615 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:615 msgid "no embedded profile" msgstr "" #: libsrc/colour/im_icc_transform.c:671 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:671 msgid "3-band uncoded Lab float only" msgstr "" #: libsrc/colour/im_icc_transform.c:676 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:676 #, fuzzy msgid "unsupported bit depth" msgstr "unsupported colourspace %d" #: libsrc/colour/im_icc_transform.c:761 -#: vips-7.15.1/libsrc/colour/im_icc_transform.c:761 msgid "unable to get media white point" msgstr "" -#: libsrc/colour/im_XYZ2Lab.c:163 libsrc/colour/im_Lab2XYZ.c:121 -#: vips-7.15.1/libsrc/colour/im_Lab2XYZ.c:121 -#: vips-7.15.1/libsrc/colour/im_XYZ2Lab.c:163 -msgid "not 3-band uncoded float" -msgstr "" - -#: libsrc/colour/im_disp2XYZ.c:92 vips-7.15.1/libsrc/colour/im_disp2XYZ.c:92 -msgid "input not 3-band uncoded char" -msgstr "" - -#: libsrc/colour/im_XYZ2disp.c:142 vips-7.15.1/libsrc/colour/im_XYZ2disp.c:142 -msgid "3-band uncoded float only" -msgstr "" - -#: libsrc/conversion/im_copy.c:134 libsrc/conversion/im_copy.c:281 -#: libsrc/conversion/im_clip.c:415 libsrc/conversion/im_fliphor.c:128 -#: vips-7.15.1/libsrc/conversion/im_clip.c:415 -#: vips-7.15.1/libsrc/conversion/im_copy.c:134 -#: vips-7.15.1/libsrc/conversion/im_copy.c:281 -#: vips-7.15.1/libsrc/conversion/im_fliphor.c:128 -msgid "in must be uncoded" -msgstr "" - -#: libsrc/conversion/im_copy.c:138 vips-7.15.1/libsrc/conversion/im_copy.c:138 -msgid "Coding must be NONE or LABQ" -msgstr "" - -#: libsrc/conversion/im_copy.c:142 vips-7.15.1/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.15.1/libsrc/conversion/im_copy.c:165 -msgid "sizeof( pixel ) has changed" -msgstr "" - -#: libsrc/conversion/im_copy.c:318 vips-7.15.1/libsrc/conversion/im_copy.c:318 -#, fuzzy -msgid "unsupported image type" -msgstr "unsupported colourspace %d" - -#: libsrc/conversion/im_copy.c:345 vips-7.15.1/libsrc/conversion/im_copy.c:345 -#, c-format -msgid "bad architecture: %d" -msgstr "" - #: libsrc/conversion/im_rot90.c:141 libsrc/conversion/im_rot180.c:139 #: libsrc/conversion/im_rot270.c:141 libsrc/format/im_vips2ppm.c:275 #: libsrc/inplace/im_flood.c:329 libsrc/inplace/im_flood.c:375 -#: vips-7.15.1/libsrc/conversion/im_rot180.c:139 -#: vips-7.15.1/libsrc/conversion/im_rot270.c:141 -#: vips-7.15.1/libsrc/conversion/im_rot90.c:141 -#: vips-7.15.1/libsrc/format/im_vips2ppm.c:275 -#: vips-7.15.1/libsrc/inplace/im_flood.c:329 -#: vips-7.15.1/libsrc/inplace/im_flood.c:375 msgid "uncoded or IM_CODING_LABQ only" msgstr "" -#: libsrc/conversion/im_zoom.c:328 libsrc/convolution/im_shrink.c:312 -#: libsrc/format/im_vips2tiff.c:1575 libsrc/format/im_file2vips.c:758 -#: libsrc/iofuncs/im_open_vips.c:1074 libsrc/mosaicing/im_tbmerge.c:632 -#: libsrc/mosaicing/im_lrmerge.c:809 -#: vips-7.15.1/libsrc/conversion/im_zoom.c:328 -#: vips-7.15.1/libsrc/convolution/im_shrink.c:312 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1575 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:1074 -#: vips-7.15.1/libsrc/mosaicing/im_lrmerge.c:809 -#: vips-7.15.1/libsrc/mosaicing/im_tbmerge.c:632 -msgid "unknown coding type" -msgstr "" - -#: libsrc/conversion/im_zoom.c:332 vips-7.15.1/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.15.1/libsrc/conversion/im_zoom.c:339 -msgid "zoom factors too large" -msgstr "" - -#: libsrc/conversion/im_grid.c:151 -#: libsrc/convolution/im_contrast_surface.c:153 -#: libsrc/format/im_tile_cache.c:373 libsrc/iofuncs/im_render.c:1185 -#: libsrc/iofuncs/im_binfile.c:92 vips-7.15.1/libsrc/conversion/im_grid.c:151 -#: vips-7.15.1/libsrc/convolution/im_contrast_surface.c:153 -#: vips-7.15.1/libsrc/format/im_tile_cache.c:373 -#: vips-7.15.1/libsrc/iofuncs/im_binfile.c:92 -#: vips-7.15.1/libsrc/iofuncs/im_render.c:1185 -msgid "bad parameters" -msgstr "" - -#: libsrc/conversion/im_grid.c:156 vips-7.15.1/libsrc/conversion/im_grid.c:156 -msgid "bad grid geometry" -msgstr "" - -#: libsrc/conversion/im_clip.c:122 vips-7.15.1/libsrc/conversion/im_clip.c:122 -#, c-format -msgid "%d underflows and %d overflows detected" -msgstr "" - -#: libsrc/conversion/im_clip.c:419 vips-7.15.1/libsrc/conversion/im_clip.c:419 -msgid "ofmt out of range" -msgstr "" - -#: libsrc/conversion/im_gbandjoin.c:175 -#: vips-7.15.1/libsrc/conversion/im_gbandjoin.c:175 -msgid "zero input images!" -msgstr "" - -#: libsrc/conversion/im_gbandjoin.c:196 -#: vips-7.15.1/libsrc/conversion/im_gbandjoin.c:196 -msgid "input images differ in format" -msgstr "" - -#: libsrc/conversion/im_gbandjoin.c:202 -#: vips-7.15.1/libsrc/conversion/im_gbandjoin.c:202 -msgid "input images differ in size" -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 -#: vips-7.15.1/libsrc/conversion/im_msb.c:213 -#: vips-7.15.1/libsrc/conversion/im_rightshift_size.c:114 -#: vips-7.15.1/libsrc/convolution/rw_mask.c:141 -#: vips-7.15.1/libsrc/convolution/rw_mask.c:198 msgid "bad arguments" msgstr "" #: libsrc/conversion/im_rightshift_size.c:118 -#: vips-7.15.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.15.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.15.1/libsrc/conversion/im_rightshift_size.c:126 msgid "integer type images only" msgstr "" #: libsrc/conversion/im_rightshift_size.c:135 -#: vips-7.15.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.15.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_extract.c:166 -#: vips-7.15.1/libsrc/conversion/im_extract.c:166 -msgid "band selection out of range" -msgstr "" - -#: libsrc/conversion/im_extract.c:173 -#: vips-7.15.1/libsrc/conversion/im_extract.c:173 -msgid "bad extract area" -msgstr "" - -#: libsrc/conversion/im_extract.c:179 libsrc/conversion/im_msb.c:179 -#: libsrc/conversion/im_msb.c:276 -#: vips-7.15.1/libsrc/conversion/im_extract.c:179 -#: vips-7.15.1/libsrc/conversion/im_msb.c:179 -#: vips-7.15.1/libsrc/conversion/im_msb.c:276 -msgid "unknown coding" -msgstr "" - -#: libsrc/conversion/im_extract.c:187 -#: vips-7.15.1/libsrc/conversion/im_extract.c:187 -msgid "can only extract areas from LABQ" -msgstr "" - -#: libsrc/conversion/im_falsecolour.c:339 -#: vips-7.15.1/libsrc/conversion/im_falsecolour.c:339 -msgid "input image not one band uchar uncoded" -msgstr "" - -#: libsrc/conversion/im_vips2mask.c:103 -#: vips-7.15.1/libsrc/conversion/im_vips2mask.c:103 -msgid "one band, nx1, or 1xn images only" -msgstr "" - -#: libsrc/conversion/im_msb.c:143 libsrc/conversion/im_msb.c:230 -#: vips-7.15.1/libsrc/conversion/im_msb.c:143 -#: vips-7.15.1/libsrc/conversion/im_msb.c:230 -msgid "char, short or int only" -msgstr "" - -#: libsrc/conversion/im_msb.c:236 libsrc/conversion/im_msb.c:262 -#: vips-7.15.1/libsrc/conversion/im_msb.c:236 -#: vips-7.15.1/libsrc/conversion/im_msb.c:262 -msgid "image does not have that many bands" -msgstr "" - -#: libsrc/conversion/im_text.c:145 vips-7.15.1/libsrc/conversion/im_text.c:145 -msgid "no text to render" -msgstr "" - -#: libsrc/conversion/im_text.c:200 vips-7.15.1/libsrc/conversion/im_text.c:200 -msgid "invalid markup in text" -msgstr "" - -#: libsrc/conversion/im_text.c:232 vips-7.15.1/libsrc/conversion/im_text.c:232 -msgid "pangoft2 support disabled" -msgstr "" - -#: libsrc/conversion/im_subsample.c:198 -#: vips-7.15.1/libsrc/conversion/im_subsample.c:198 -msgid "factors should both be >= 1" -msgstr "" - -#: libsrc/conversion/im_subsample.c:215 libsrc/convolution/im_shrink.c:264 -#: vips-7.15.1/libsrc/conversion/im_subsample.c:215 -#: vips-7.15.1/libsrc/convolution/im_shrink.c:264 -msgid "image has shrunk to nothing" -msgstr "" - #: libsrc/conversion/im_insert.c:234 libsrc/conversion/im_insert.c:324 #: libsrc/inplace/im_insertplace.c:83 -#: vips-7.15.1/libsrc/conversion/im_insert.c:234 -#: vips-7.15.1/libsrc/conversion/im_insert.c:324 -#: vips-7.15.1/libsrc/inplace/im_insertplace.c:83 msgid "inputs differ in format" msgstr "" #: libsrc/conversion/im_insert.c:239 libsrc/conversion/im_insert.c:329 #: libsrc/inplace/im_insertplace.c:87 -#: vips-7.15.1/libsrc/conversion/im_insert.c:239 -#: vips-7.15.1/libsrc/conversion/im_insert.c:329 -#: vips-7.15.1/libsrc/inplace/im_insertplace.c:87 msgid "input should be uncoded or IM_CODING_LABQ" msgstr "" #: libsrc/conversion/im_insert.c:243 libsrc/conversion/im_insert.c:333 -#: vips-7.15.1/libsrc/conversion/im_insert.c:243 -#: vips-7.15.1/libsrc/conversion/im_insert.c:333 msgid "xy out of range" msgstr "" -#: libsrc/convolution/im_convf.c:289 libsrc/convolution/im_convsep.c:383 -#: libsrc/convolution/im_convsepf.c:289 libsrc/convolution/im_zerox.c:144 -#: vips-7.15.1/libsrc/convolution/im_convf.c:289 -#: vips-7.15.1/libsrc/convolution/im_convsep.c:383 -#: vips-7.15.1/libsrc/convolution/im_convsepf.c:289 -#: vips-7.15.1/libsrc/convolution/im_zerox.c:144 +#: libsrc/conversion/im_falsecolour.c:339 +msgid "input image not one band uchar uncoded" +msgstr "" + +#: libsrc/conversion/im_text.c:145 +msgid "no text to render" +msgstr "" + +#: libsrc/conversion/im_text.c:200 +msgid "invalid markup in text" +msgstr "" + +#: libsrc/conversion/im_text.c:232 +msgid "pangoft2 support disabled" +msgstr "" + +#: libsrc/conversion/im_msb.c:143 libsrc/conversion/im_msb.c:230 +msgid "char, short or int only" +msgstr "" + +#: libsrc/conversion/im_msb.c:179 libsrc/conversion/im_msb.c:276 +#: libsrc/conversion/im_extract.c:179 +msgid "unknown coding" +msgstr "" + +#: libsrc/conversion/im_msb.c:236 libsrc/conversion/im_msb.c:262 +msgid "image does not have that many bands" +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 +msgid "in must be uncoded" +msgstr "" + +#: libsrc/conversion/im_copy.c:138 +msgid "Coding must be NONE or LABQ" +msgstr "" + +#: libsrc/conversion/im_copy.c:142 +#, c-format +msgid "BandFmt must be in range [0,%d]" +msgstr "" + +#: libsrc/conversion/im_copy.c:165 +msgid "sizeof( pixel ) has changed" +msgstr "" + +#: libsrc/conversion/im_copy.c:318 +#, fuzzy +msgid "unsupported image type" +msgstr "unsupported colourspace %d" + +#: libsrc/conversion/im_copy.c:345 +#, c-format +msgid "bad architecture: %d" +msgstr "" + +#: libsrc/conversion/im_extract.c:166 +msgid "band selection out of range" +msgstr "" + +#: libsrc/conversion/im_extract.c:173 +msgid "bad extract area" +msgstr "" + +#: libsrc/conversion/im_extract.c:187 +msgid "can only extract areas from LABQ" +msgstr "" + +#: libsrc/conversion/im_zoom.c:328 libsrc/convolution/im_shrink.c:312 +#: libsrc/format/im_vips2tiff.c:1587 libsrc/format/im_file2vips.c:758 +#: libsrc/iofuncs/im_open_vips.c:1074 libsrc/mosaicing/im_tbmerge.c:632 +#: libsrc/mosaicing/im_lrmerge.c:809 +msgid "unknown coding type" +msgstr "" + +#: 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 +msgid "zoom factors too large" +msgstr "" + +#: libsrc/conversion/im_clip.c:124 +#, c-format +msgid "%d underflows and %d overflows detected" +msgstr "" + +#: libsrc/conversion/im_clip.c:445 +msgid "ofmt out of range" +msgstr "" + +#: libsrc/conversion/im_vips2mask.c:103 +msgid "one band, nx1, or 1xn images only" +msgstr "" + +#: libsrc/conversion/im_grid.c:151 +#: libsrc/convolution/im_contrast_surface.c:153 +#: libsrc/format/im_tile_cache.c:373 libsrc/iofuncs/im_render.c:1185 +#: libsrc/iofuncs/im_binfile.c:92 +msgid "bad parameters" +msgstr "" + +#: libsrc/conversion/im_grid.c:156 +msgid "bad grid geometry" +msgstr "" + +#: libsrc/conversion/im_gbandjoin.c:175 +msgid "zero input images!" +msgstr "" + +#: libsrc/conversion/im_gbandjoin.c:196 +msgid "input images differ in format" +msgstr "" + +#: libsrc/conversion/im_gbandjoin.c:202 +msgid "input images differ in size" +msgstr "" + +#: libsrc/conversion/im_subsample.c:198 +msgid "factors should both be >= 1" +msgstr "" + +#: libsrc/conversion/im_subsample.c:215 libsrc/convolution/im_shrink.c:264 +msgid "image has shrunk to nothing" +msgstr "" + +#: libsrc/convolution/im_contrast_surface.c:147 +msgid "one band uncoded uchar only" +msgstr "" + +#: libsrc/convolution/im_contrast_surface.c:160 +msgid "parameters would result in zero size output image" +msgstr "" + +#: libsrc/convolution/im_zerox.c:138 +msgid "flag not -1 ot 1" +msgstr "" + +#: libsrc/convolution/im_zerox.c:144 libsrc/convolution/im_convsepf.c:289 +#: libsrc/convolution/im_convsep.c:383 libsrc/convolution/im_convf.c:289 msgid "non-complex uncoded only" msgstr "" -#: libsrc/convolution/im_convf.c:295 libsrc/convolution/im_convsep.c:389 -#: vips-7.15.1/libsrc/convolution/im_convf.c:295 -#: vips-7.15.1/libsrc/convolution/im_convsep.c:389 -msgid "nonsense mask parameters" -msgstr "" - -#: libsrc/convolution/im_convf.c:315 libsrc/convolution/im_convsep.c:409 -#: libsrc/convolution/im_convsepf.c:319 libsrc/morphology/im_erode.c:276 -#: libsrc/morphology/im_dilate.c:280 -#: vips-7.15.1/libsrc/convolution/im_convf.c:315 -#: vips-7.15.1/libsrc/convolution/im_convsep.c:409 -#: vips-7.15.1/libsrc/convolution/im_convsepf.c:319 -#: vips-7.15.1/libsrc/morphology/im_dilate.c:280 -#: vips-7.15.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:381 libsrc/iofuncs/im_setupout.c:97 -#: vips-7.15.1/libsrc/convolution/im_embed.c:358 -#: vips-7.15.1/libsrc/convolution/im_embed.c:447 -#: vips-7.15.1/libsrc/iofuncs/im_generate.c:381 -#: vips-7.15.1/libsrc/iofuncs/im_setupout.c:97 -msgid "bad dimensions" -msgstr "" - -#: libsrc/convolution/im_embed.c:439 -#: vips-7.15.1/libsrc/convolution/im_embed.c:439 -msgid "unknown image coding type" -msgstr "" - -#: libsrc/convolution/im_embed.c:443 -#: vips-7.15.1/libsrc/convolution/im_embed.c:443 -msgid "unknown flag" -msgstr "" - -#: libsrc/convolution/im_convsep.c:98 libsrc/convolution/im_conv.c:152 -#: vips-7.15.1/libsrc/convolution/im_conv.c:152 -#: vips-7.15.1/libsrc/convolution/im_convsep.c:98 -#, c-format -msgid "%d overflows and %d underflows detected" -msgstr "" - -#: libsrc/convolution/im_convsep.c:393 libsrc/convolution/im_convsepf.c:299 -#: vips-7.15.1/libsrc/convolution/im_convsep.c:393 -#: vips-7.15.1/libsrc/convolution/im_convsepf.c:299 -msgid "expect 1xN or Nx1 input mask" +#: libsrc/convolution/im_zerox.c:148 +msgid "image too narrow" msgstr "" #: libsrc/convolution/rw_mask.c:254 -#: vips-7.15.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.15.1/libsrc/convolution/rw_mask.c:268 msgid "unexpected EOF" msgstr "" #: libsrc/convolution/rw_mask.c:306 -#: vips-7.15.1/libsrc/convolution/rw_mask.c:306 msgid "error reading matrix header" msgstr "" #: libsrc/convolution/rw_mask.c:310 -#: vips-7.15.1/libsrc/convolution/rw_mask.c:310 msgid "scale should be non-zero" msgstr "" #: libsrc/convolution/rw_mask.c:390 -#: vips-7.15.1/libsrc/convolution/rw_mask.c:390 msgid "scale and offset should be int" msgstr "" #: libsrc/convolution/rw_mask.c:398 -#: vips-7.15.1/libsrc/convolution/rw_mask.c:398 #, c-format msgid "cofficient at position (%d, %d) is not int" msgstr "" #: libsrc/convolution/rw_mask.c:432 -#: vips-7.15.1/libsrc/convolution/rw_mask.c:432 msgid "bad args" msgstr "" -#: libsrc/convolution/rw_mask.c:540 libsrc/format/im_vips2tiff.c:262 -#: libsrc/format/im_vips2ppm.c:93 vips-7.15.1/libsrc/convolution/rw_mask.c:540 -#: vips-7.15.1/libsrc/format/im_vips2ppm.c:93 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:262 +#: libsrc/convolution/rw_mask.c:540 libsrc/format/im_vips2tiff.c:265 +#: libsrc/format/im_vips2ppm.c:93 #, c-format msgid "unable to open \"%s\" for output" msgstr "" #: libsrc/convolution/rw_mask.c:557 -#: vips-7.15.1/libsrc/convolution/rw_mask.c:557 msgid "write error, disc full?" msgstr "" #: libsrc/convolution/rw_mask.c:615 libsrc/convolution/rw_mask.c:666 -#: vips-7.15.1/libsrc/convolution/rw_mask.c:615 -#: vips-7.15.1/libsrc/convolution/rw_mask.c:666 msgid "filename not set" msgstr "" -#: libsrc/convolution/im_convsepf.c:295 -#: vips-7.15.1/libsrc/convolution/im_convsepf.c:295 -msgid "bad mask parameters" +#: libsrc/convolution/im_sharpen.c:249 +msgid "input not 3-band short" +msgstr "" + +#: libsrc/convolution/im_sharpen.c:260 +msgid "parameters out of range" +msgstr "" + +#: libsrc/convolution/im_spcor.c:256 +msgid "ref not smaller than in" +msgstr "" + +#: libsrc/convolution/im_spcor.c:267 +msgid "input not uncoded 1 band" +msgstr "" + +#: libsrc/convolution/im_spcor.c:274 +msgid "input not char/uchar/short/ushort" msgstr "" #: libsrc/convolution/im_shrink.c:229 -#: vips-7.15.1/libsrc/convolution/im_shrink.c:229 #, fuzzy msgid "unsupported input format" msgstr "unsupported colourspace %d" #: libsrc/convolution/im_shrink.c:244 -#: vips-7.15.1/libsrc/convolution/im_shrink.c:244 msgid "non-complex input only" msgstr "" #: libsrc/convolution/im_shrink.c:249 -#: vips-7.15.1/libsrc/convolution/im_shrink.c:249 msgid "shrink factors should both be >1" msgstr "" +#: libsrc/convolution/im_convsepf.c:295 +msgid "bad mask parameters" +msgstr "" + +#: libsrc/convolution/im_convsepf.c:299 libsrc/convolution/im_convsep.c:393 +msgid "expect 1xN or Nx1 input mask" +msgstr "" + +#: libsrc/convolution/im_convsepf.c:319 libsrc/convolution/im_convsep.c:409 +#: libsrc/convolution/im_convf.c:315 libsrc/morphology/im_dilate.c:280 +#: 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:381 libsrc/iofuncs/im_setupout.c:97 +msgid "bad dimensions" +msgstr "" + +#: libsrc/convolution/im_embed.c:439 +msgid "unknown image coding type" +msgstr "" + +#: libsrc/convolution/im_embed.c:443 +msgid "unknown flag" +msgstr "" + #: libsrc/convolution/im_stretch3.c:271 -#: vips-7.15.1/libsrc/convolution/im_stretch3.c:271 msgid "not uncoded unsigned short" msgstr "" #: libsrc/convolution/im_stretch3.c:276 -#: vips-7.15.1/libsrc/convolution/im_stretch3.c:276 msgid "displacements out of range [0,1)" msgstr "" -#: libsrc/convolution/im_sharpen.c:249 -#: vips-7.15.1/libsrc/convolution/im_sharpen.c:249 -msgid "input not 3-band short" -msgstr "" - -#: libsrc/convolution/im_sharpen.c:260 -#: vips-7.15.1/libsrc/convolution/im_sharpen.c:260 -msgid "parameters out of range" -msgstr "" - -#: libsrc/convolution/im_contrast_surface.c:147 -#: vips-7.15.1/libsrc/convolution/im_contrast_surface.c:147 -msgid "one band uncoded uchar only" -msgstr "" - -#: libsrc/convolution/im_contrast_surface.c:160 -#: vips-7.15.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.15.1/libsrc/convolution/im_zerox.c:138 -msgid "flag not -1 ot 1" -msgstr "" - -#: libsrc/convolution/im_zerox.c:148 -#: vips-7.15.1/libsrc/convolution/im_zerox.c:148 -msgid "image too narrow" -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.15.1/libsrc/format/im_jpeg2vips.c:70 -#: vips-7.15.1/libsrc/format/im_vips2jpeg.c:73 -#: vips-7.15.1/libsrc/format/im_vips2jpeg.c:81 -#: vips-7.15.1/libsrc/format/im_vips2jpeg.c:89 -msgid "JPEG support disabled" -msgstr "" - -#: libsrc/format/im_jpeg2vips.c:141 libsrc/format/im_vips2jpeg.c:155 -#: vips-7.15.1/libsrc/format/im_jpeg2vips.c:141 -#: vips-7.15.1/libsrc/format/im_vips2jpeg.c:155 +#: libsrc/convolution/im_convsep.c:98 libsrc/convolution/im_conv.c:152 #, c-format -msgid "%s" +msgid "%d overflows and %d underflows detected" msgstr "" -#: libsrc/format/im_jpeg2vips.c:343 -#: vips-7.15.1/libsrc/format/im_jpeg2vips.c:343 -msgid "error reading resolution" +#: libsrc/convolution/im_convsep.c:389 libsrc/convolution/im_convf.c:295 +msgid "nonsense mask parameters" msgstr "" -#: libsrc/format/im_jpeg2vips.c:363 -#: vips-7.15.1/libsrc/format/im_jpeg2vips.c:363 -msgid "bad resolution unit" +#: libsrc/format/im_magick2vips.c:67 +msgid "libMagick support disabled" msgstr "" -#: libsrc/format/im_jpeg2vips.c:592 -#: vips-7.15.1/libsrc/format/im_jpeg2vips.c:592 -msgid "truncated JPEG file" -msgstr "" - -#: libsrc/format/im_jpeg2vips.c:636 -#: vips-7.15.1/libsrc/format/im_jpeg2vips.c:636 +#: libsrc/format/im_magick2vips.c:202 libsrc/format/im_magick2vips.c:299 #, c-format -msgid "bad shrink factor %d" +msgid "unsupported colorspace %d" +msgstr "unsupported colourspace %d" + +#: libsrc/format/im_magick2vips.c:267 +#, fuzzy, c-format +msgid "unsupported bit depth %d" +msgstr "unsupported colourspace %d" + +#: libsrc/format/im_magick2vips.c:578 +msgid "unable to read pixels" msgstr "" -#: libsrc/format/im_jpeg2vips.c:665 libsrc/format/im_vips2jpeg.c:692 -#: libsrc/format/im_csv2vips.c:285 libsrc/format/im_vips2csv.c:133 +#: libsrc/format/im_magick2vips.c:600 +#, c-format +msgid "" +"unable to read file \"%s\"\n" +"libMagick error: %s %s" +msgstr "" + +#: libsrc/format/im_magick2vips.c:625 +#, c-format +msgid "" +"unable to ping file \"%s\"\n" +"libMagick error: %s %s" +msgstr "" + +#: libsrc/format/im_magick2vips.c:636 +msgid "bad image size" +msgstr "" + +#. internal name +#: libsrc/format/im_magick2vips.c:667 +msgid "libMagick-supported" +msgstr "" + +#: libsrc/format/im_vips2csv.c:133 libsrc/format/im_csv2vips.c:285 #: libsrc/format/im_ppm2vips.c:404 libsrc/format/im_ppm2vips.c:434 -#: libsrc/format/im_ppm2vips.c:464 libsrc/format/im_png2vips.c:159 -#: libsrc/format/im_vips2png.c:301 libsrc/mosaicing/global_balance.c:1200 +#: libsrc/format/im_ppm2vips.c:464 libsrc/format/im_jpeg2vips.c:660 +#: libsrc/format/im_png2vips.c:154 libsrc/format/im_vips2png.c:301 +#: libsrc/format/im_vips2jpeg.c:692 libsrc/mosaicing/global_balance.c:1200 #: libsrc/mosaicing/global_balance.c:1534 -#: vips-7.15.1/libsrc/format/im_csv2vips.c:285 -#: vips-7.15.1/libsrc/format/im_jpeg2vips.c:665 -#: vips-7.15.1/libsrc/format/im_png2vips.c:159 -#: vips-7.15.1/libsrc/format/im_ppm2vips.c:404 -#: vips-7.15.1/libsrc/format/im_ppm2vips.c:434 -#: vips-7.15.1/libsrc/format/im_ppm2vips.c:464 -#: vips-7.15.1/libsrc/format/im_vips2csv.c:133 -#: vips-7.15.1/libsrc/format/im_vips2jpeg.c:692 -#: vips-7.15.1/libsrc/format/im_vips2png.c:301 -#: vips-7.15.1/libsrc/mosaicing/global_balance.c:1200 -#: vips-7.15.1/libsrc/mosaicing/global_balance.c:1534 #, c-format msgid "unable to open \"%s\"" msgstr "" -#: libsrc/format/im_jpeg2vips.c:690 -#: vips-7.15.1/libsrc/format/im_jpeg2vips.c:690 +#: libsrc/format/im_csv2vips.c:122 #, c-format -msgid "read gave %ld warnings" +msgid "error parsing number, line %d, column %d" +msgstr "" + +#: libsrc/format/im_csv2vips.c:175 +msgid "end of file while skipping start" +msgstr "" + +#: libsrc/format/im_csv2vips.c:183 libsrc/iofuncs/util.c:965 +#: libsrc/iofuncs/util.c:971 +msgid "unable to seek" +msgstr "" + +#: libsrc/format/im_csv2vips.c:192 +msgid "empty line" +msgstr "" + +#: libsrc/format/im_csv2vips.c:226 +msgid "unexpected end of file" +msgstr "" + +#: libsrc/format/im_csv2vips.c:231 +msgid "unexpected end of line" msgstr "" #. internal name -#: libsrc/format/im_jpeg2vips.c:731 -#: vips-7.15.1/libsrc/format/im_jpeg2vips.c:731 -msgid "JPEG" +#: libsrc/format/im_csv2vips.c:325 +msgid "CSV" msgstr "" -#: libsrc/format/im_vips2jpeg.c:226 -#: vips-7.15.1/libsrc/format/im_vips2jpeg.c:226 -msgid "unable to convert to saveable format" +#. internal name +#: libsrc/format/format.c:149 +msgid "VIPS" msgstr "" -#: libsrc/format/im_vips2jpeg.c:327 -#: vips-7.15.1/libsrc/format/im_vips2jpeg.c:327 -msgid "error setting JPEG resolution" -msgstr "" - -#: libsrc/format/im_vips2jpeg.c:370 -#: vips-7.15.1/libsrc/format/im_vips2jpeg.c:370 -msgid "error saving EXIF" -msgstr "" - -#: libsrc/format/im_vips2jpeg.c:559 -#: vips-7.15.1/libsrc/format/im_vips2jpeg.c:559 -msgid "qfac should be in 0-100" -msgstr "" - -#: libsrc/format/im_vips2jpeg.c:663 libsrc/format/im_vips2tiff.c:1373 -#: vips-7.15.1/libsrc/format/im_vips2jpeg.c:663 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1373 +#: libsrc/format/format.c:216 #, c-format -msgid "unknown extra options \"%s\"" +msgid "\"%s\" is not readable" msgstr "" -#: libsrc/format/im_vips2jpeg.c:889 -#: vips-7.15.1/libsrc/format/im_vips2jpeg.c:889 -msgid "error writing output" +#: libsrc/format/format.c:224 +#, c-format +msgid "\"%s\" is not in a supported format" msgstr "" -#: libsrc/format/im_vips2tiff.c:151 libsrc/format/im_tiff2vips.c:150 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:150 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:151 +#: libsrc/format/format.c:255 +#, fuzzy, c-format +msgid "\"%s\" is not a supported image format." +msgstr "unsupported colourspace %d" + +#: libsrc/format/im_analyze2vips.c:310 libsrc/format/im_analyze2vips.c:355 +msgid "header file size incorrect" +msgstr "" + +#: libsrc/format/im_analyze2vips.c:373 +#, c-format +msgid "%d-dimensional images not supported" +msgstr "" + +#: libsrc/format/im_analyze2vips.c:426 +#, c-format +msgid "datatype %d not supported" +msgstr "" + +#. internal name +#: libsrc/format/im_analyze2vips.c:597 +msgid "Analyze 6.0" +msgstr "" + +#: libsrc/format/im_vips2tiff.c:153 libsrc/format/im_tiff2vips.c:150 msgid "TIFF support disabled" msgstr "" -#: libsrc/format/im_vips2tiff.c:278 libsrc/format/im_tiff2vips.c:1404 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:1404 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:278 +#: libsrc/format/im_vips2tiff.c:281 libsrc/format/im_tiff2vips.c:1399 #, c-format msgid "unable to open \"%s\" for input" msgstr "" #. Out of space! #. -#: libsrc/format/im_vips2tiff.c:689 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:689 +#: libsrc/format/im_vips2tiff.c:692 msgid "layer buffer exhausted -- try making TIFF output tiles smaller" msgstr "" -#: libsrc/format/im_vips2tiff.c:920 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:920 +#: libsrc/format/im_vips2tiff.c:923 msgid "TIFF write tile failed" msgstr "" -#: libsrc/format/im_vips2tiff.c:995 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:995 +#: libsrc/format/im_vips2tiff.c:998 msgid "internal error #9876345" msgstr "" -#: libsrc/format/im_vips2tiff.c:1237 libsrc/format/im_vips2tiff.c:1248 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1237 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1248 +#: libsrc/format/im_vips2tiff.c:1249 libsrc/format/im_vips2tiff.c:1260 msgid "bad predictor parameter" msgstr "" -#: libsrc/format/im_vips2tiff.c:1259 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1259 +#: libsrc/format/im_vips2tiff.c:1271 msgid "bad JPEG quality parameter" msgstr "" -#: libsrc/format/im_vips2tiff.c:1265 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1265 +#: libsrc/format/im_vips2tiff.c:1277 #, c-format msgid "" "unknown compression mode \"%s\"\n" @@ -1181,640 +941,388 @@ msgid "" "or \"jpeg\"" msgstr "" -#: libsrc/format/im_vips2tiff.c:1279 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1279 +#: libsrc/format/im_vips2tiff.c:1291 msgid "bad tile sizes" msgstr "" -#: libsrc/format/im_vips2tiff.c:1286 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1286 +#: libsrc/format/im_vips2tiff.c:1298 #, c-format msgid "bad tile size %dx%d" msgstr "" -#: libsrc/format/im_vips2tiff.c:1294 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1294 +#: libsrc/format/im_vips2tiff.c:1306 msgid "tile size not a multiple of 16" msgstr "" -#: libsrc/format/im_vips2tiff.c:1303 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1303 +#: libsrc/format/im_vips2tiff.c:1315 #, c-format msgid "" "unknown layout mode \"%s\"\n" "should be one of \"tile\" or \"strip\"" msgstr "" -#: libsrc/format/im_vips2tiff.c:1315 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1315 +#: libsrc/format/im_vips2tiff.c:1327 #, c-format msgid "" "unknown multi-res mode \"%s\"\n" "should be one of \"flat\" or \"pyramid\"" msgstr "" -#: libsrc/format/im_vips2tiff.c:1327 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1327 +#: libsrc/format/im_vips2tiff.c:1339 #, c-format msgid "" "unknown format \"%s\"\n" "should be one of \"onebit\" or \"manybit\"" msgstr "" -#: libsrc/format/im_vips2tiff.c:1349 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1349 +#: libsrc/format/im_vips2tiff.c:1361 #, c-format msgid "" "unknown resolution unit \"%s\"\n" "should be one of \"res_cm\" or \"res_inch\"" msgstr "" -#: libsrc/format/im_vips2tiff.c:1358 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1358 +#: libsrc/format/im_vips2tiff.c:1370 msgid "bad resolution values" msgstr "" -#: libsrc/format/im_vips2tiff.c:1377 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1377 +#: libsrc/format/im_vips2tiff.c:1385 libsrc/format/im_vips2jpeg.c:663 +#, c-format +msgid "unknown extra options \"%s\"" +msgstr "" + +#: libsrc/format/im_vips2tiff.c:1389 msgid "can't have strip pyramid -- enabling tiling" msgstr "" -#: libsrc/format/im_vips2tiff.c:1387 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1387 +#: libsrc/format/im_vips2tiff.c:1399 msgid "can only pyramid LABQ and non-complex images" msgstr "" -#: libsrc/format/im_vips2tiff.c:1403 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1403 +#: libsrc/format/im_vips2tiff.c:1415 msgid "can't have 1-bit JPEG -- disabling JPEG" msgstr "" -#: libsrc/format/im_vips2tiff.c:1583 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1583 +#: libsrc/format/im_vips2tiff.c:1595 msgid "unsigned 8-bit int, 16-bit int, and 32-bit float only" msgstr "" -#: libsrc/format/im_vips2tiff.c:1589 -#: vips-7.15.1/libsrc/format/im_vips2tiff.c:1589 +#: libsrc/format/im_vips2tiff.c:1601 msgid "1 to 5 bands only" msgstr "" -#: libsrc/format/im_tiff2vips.c:268 libsrc/format/im_tiff2vips.c:291 -#: libsrc/format/im_tiff2vips.c:310 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:268 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:291 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:310 +#: libsrc/format/im_ppm2vips.c:114 +msgid "bad unsigned int" +msgstr "" + +#: libsrc/format/im_ppm2vips.c:164 +msgid "bad magic number" +msgstr "" + +#: libsrc/format/im_ppm2vips.c:194 +msgid "not whitespace before start of binary data" +msgstr "" + +#. internal name +#: libsrc/format/im_ppm2vips.c:511 +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 +msgid "JPEG support disabled" +msgstr "" + +#: libsrc/format/im_jpeg2vips.c:136 libsrc/format/im_vips2jpeg.c:155 +#, c-format +msgid "%s" +msgstr "" + +#: libsrc/format/im_jpeg2vips.c:338 +msgid "error reading resolution" +msgstr "" + +#: libsrc/format/im_jpeg2vips.c:358 +msgid "bad resolution unit" +msgstr "" + +#: libsrc/format/im_jpeg2vips.c:587 +msgid "truncated JPEG file" +msgstr "" + +#: libsrc/format/im_jpeg2vips.c:631 +#, c-format +msgid "bad shrink factor %d" +msgstr "" + +#: libsrc/format/im_jpeg2vips.c:685 +#, c-format +msgid "read gave %ld warnings" +msgstr "" + +#. internal name +#: libsrc/format/im_jpeg2vips.c:726 +msgid "JPEG" +msgstr "" + +#: libsrc/format/im_png2vips.c:59 libsrc/format/im_vips2png.c:59 +msgid "PNG support disabled" +msgstr "" + +#: libsrc/format/im_png2vips.c:85 libsrc/format/im_vips2png.c:85 +#, c-format +msgid "PNG error: \"%s\"" +msgstr "" + +#: libsrc/format/im_png2vips.c:91 libsrc/format/im_vips2png.c:91 +#, c-format +msgid "PNG warning: \"%s\"" +msgstr "" + +#: libsrc/format/im_png2vips.c:272 +#, fuzzy +msgid "unsupported colour type" +msgstr "unsupported colourspace %d" + +#. internal name +#: libsrc/format/im_png2vips.c:391 +msgid "PNG" +msgstr "" + +#: libsrc/format/im_vips2ppm.c:142 libsrc/format/im_vips2ppm.c:159 +msgid "write error ... disc full?" +msgstr "" + +#: libsrc/format/im_vips2ppm.c:258 +msgid "bad mode string, should be \"binary\" or \"ascii\"" +msgstr "" + +#: libsrc/format/im_vips2ppm.c:266 +msgid "can't write binary >8 bit images" +msgstr "" + +#: libsrc/format/im_vips2ppm.c:270 +msgid "unsigned int formats only" +msgstr "" + +#: libsrc/format/im_vips2ppm.c:279 +msgid "1 or 3 band images only" +msgstr "" + +#: libsrc/format/im_vips2png.c:130 +msgid "unable to convert to RGB for save" +msgstr "" + +#: libsrc/format/im_vips2png.c:211 +msgid "compress should be in [0,9]" +msgstr "" + +#: libsrc/format/im_vips2png.c:311 +#, c-format +msgid "unable to write \"%s\"" +msgstr "" + +#: libsrc/format/im_vips2jpeg.c:226 +msgid "unable to convert to saveable format" +msgstr "" + +#: libsrc/format/im_vips2jpeg.c:327 +msgid "error setting JPEG resolution" +msgstr "" + +#: libsrc/format/im_vips2jpeg.c:370 +msgid "error saving EXIF" +msgstr "" + +#: libsrc/format/im_vips2jpeg.c:559 +msgid "qfac should be in 0-100" +msgstr "" + +#: libsrc/format/im_vips2jpeg.c:889 +msgid "error writing output" +msgstr "" + +#: libsrc/format/im_tiff2vips.c:263 libsrc/format/im_tiff2vips.c:286 +#: libsrc/format/im_tiff2vips.c:305 #, c-format msgid "required field %d missing" msgstr "" -#: libsrc/format/im_tiff2vips.c:272 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:272 +#: libsrc/format/im_tiff2vips.c:267 #, c-format msgid "required field %d=%d, not %d" msgstr "" -#: libsrc/format/im_tiff2vips.c:681 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:681 +#: libsrc/format/im_tiff2vips.c:676 msgid "bad colormap" msgstr "bad colourmap" -#: libsrc/format/im_tiff2vips.c:735 libsrc/format/im_tiff2vips.c:783 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:735 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:783 +#: libsrc/format/im_tiff2vips.c:730 libsrc/format/im_tiff2vips.c:778 msgid "3 or 4 bands RGB TIFF only" msgstr "" -#: libsrc/format/im_tiff2vips.c:872 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:872 +#: libsrc/format/im_tiff2vips.c:867 msgid "4 or 5 bands CMYK TIFF only" msgstr "" -#: libsrc/format/im_tiff2vips.c:923 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:923 +#: libsrc/format/im_tiff2vips.c:918 msgid "unknown resolution unit" msgstr "" -#: libsrc/format/im_tiff2vips.c:928 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:928 +#: libsrc/format/im_tiff2vips.c:923 #, c-format msgid "" "no resolution information for TIFF image \"%s\" -- defaulting to 1 pixel per " "mm" msgstr "" -#: libsrc/format/im_tiff2vips.c:995 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:995 +#: libsrc/format/im_tiff2vips.c:990 #, c-format msgid "unsupported sample format %d for lab image" msgstr "" -#: libsrc/format/im_tiff2vips.c:1005 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:1005 +#: libsrc/format/im_tiff2vips.c:1000 #, c-format msgid "unsupported depth %d for LAB image" msgstr "" -#: libsrc/format/im_tiff2vips.c:1052 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:1052 +#: libsrc/format/im_tiff2vips.c:1047 #, c-format msgid "unsupported sample format %d for greyscale image" msgstr "" -#: libsrc/format/im_tiff2vips.c:1061 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:1061 +#: libsrc/format/im_tiff2vips.c:1056 #, c-format msgid "unsupported depth %d for greyscale image" msgstr "" -#: libsrc/format/im_tiff2vips.c:1101 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:1101 +#: libsrc/format/im_tiff2vips.c:1096 #, c-format msgid "unsupported sample format %d for rgb image" msgstr "" -#: libsrc/format/im_tiff2vips.c:1110 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:1110 +#: libsrc/format/im_tiff2vips.c:1105 #, c-format msgid "unsupported depth %d for RGB image" msgstr "" -#: libsrc/format/im_tiff2vips.c:1124 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:1124 +#: libsrc/format/im_tiff2vips.c:1119 #, c-format msgid "unknown photometric interpretation %d" msgstr "" -#: libsrc/format/im_tiff2vips.c:1321 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:1321 +#: libsrc/format/im_tiff2vips.c:1316 msgid "read error" msgstr "" -#: libsrc/format/im_tiff2vips.c:1383 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:1383 +#: libsrc/format/im_tiff2vips.c:1378 #, c-format msgid "bad page number %d" msgstr "" -#: libsrc/format/im_tiff2vips.c:1458 libsrc/format/im_tiff2vips.c:1490 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:1458 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:1490 +#: libsrc/format/im_tiff2vips.c:1453 libsrc/format/im_tiff2vips.c:1485 #, c-format msgid "TIFF file does not contain page %d" msgstr "" #. internal name -#: libsrc/format/im_tiff2vips.c:1562 -#: vips-7.15.1/libsrc/format/im_tiff2vips.c:1562 +#: libsrc/format/im_tiff2vips.c:1557 msgid "TIFF" msgstr "" -#: libsrc/format/im_csv2vips.c:122 vips-7.15.1/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.15.1/libsrc/format/im_csv2vips.c:175 -msgid "end of file while skipping start" -msgstr "" - -#: libsrc/format/im_csv2vips.c:183 libsrc/iofuncs/util.c:935 -#: libsrc/iofuncs/util.c:941 vips-7.15.1/libsrc/format/im_csv2vips.c:183 -#: vips-7.15.1/libsrc/iofuncs/util.c:935 vips-7.15.1/libsrc/iofuncs/util.c:941 -msgid "unable to seek" -msgstr "" - -#: libsrc/format/im_csv2vips.c:192 vips-7.15.1/libsrc/format/im_csv2vips.c:192 -msgid "empty line" -msgstr "" - -#: libsrc/format/im_csv2vips.c:226 vips-7.15.1/libsrc/format/im_csv2vips.c:226 -msgid "unexpected end of file" -msgstr "" - -#: libsrc/format/im_csv2vips.c:231 vips-7.15.1/libsrc/format/im_csv2vips.c:231 -msgid "unexpected end of line" -msgstr "" - -#. internal name -#: libsrc/format/im_csv2vips.c:325 vips-7.15.1/libsrc/format/im_csv2vips.c:325 -msgid "CSV" -msgstr "" - -#: libsrc/format/im_magick2vips.c:67 -#: vips-7.15.1/libsrc/format/im_magick2vips.c:67 -msgid "libMagick support disabled" -msgstr "" - -#: libsrc/format/im_magick2vips.c:207 libsrc/format/im_magick2vips.c:304 -#: vips-7.15.1/libsrc/format/im_magick2vips.c:207 -#: vips-7.15.1/libsrc/format/im_magick2vips.c:304 -#, c-format -msgid "unsupported colorspace %d" -msgstr "unsupported colourspace %d" - -#: libsrc/format/im_magick2vips.c:272 -#: vips-7.15.1/libsrc/format/im_magick2vips.c:272 -#, fuzzy, c-format -msgid "unsupported bit depth %d" -msgstr "unsupported colourspace %d" - -#: libsrc/format/im_magick2vips.c:583 -#: vips-7.15.1/libsrc/format/im_magick2vips.c:583 -msgid "unable to read pixels" -msgstr "" - -#: libsrc/format/im_magick2vips.c:605 -#: vips-7.15.1/libsrc/format/im_magick2vips.c:605 -#, c-format -msgid "" -"unable to read file \"%s\"\n" -"libMagick error: %s %s" -msgstr "" - -#: libsrc/format/im_magick2vips.c:630 -#: vips-7.15.1/libsrc/format/im_magick2vips.c:630 -#, c-format -msgid "" -"unable to ping file \"%s\"\n" -"libMagick error: %s %s" -msgstr "" - -#: libsrc/format/im_magick2vips.c:641 -#: vips-7.15.1/libsrc/format/im_magick2vips.c:641 -msgid "bad image size" -msgstr "" - -#. internal name -#: libsrc/format/im_magick2vips.c:672 -#: vips-7.15.1/libsrc/format/im_magick2vips.c:672 -msgid "libMagick-supported" -msgstr "" - -#: libsrc/format/im_vips2ppm.c:142 libsrc/format/im_vips2ppm.c:159 -#: vips-7.15.1/libsrc/format/im_vips2ppm.c:142 -#: vips-7.15.1/libsrc/format/im_vips2ppm.c:159 -msgid "write error ... disc full?" -msgstr "" - -#: libsrc/format/im_vips2ppm.c:258 vips-7.15.1/libsrc/format/im_vips2ppm.c:258 -msgid "bad mode string, should be \"binary\" or \"ascii\"" -msgstr "" - -#: libsrc/format/im_vips2ppm.c:266 vips-7.15.1/libsrc/format/im_vips2ppm.c:266 -msgid "can't write binary >8 bit images" -msgstr "" - -#: libsrc/format/im_vips2ppm.c:270 vips-7.15.1/libsrc/format/im_vips2ppm.c:270 -msgid "unsigned int formats only" -msgstr "" - -#: libsrc/format/im_vips2ppm.c:279 vips-7.15.1/libsrc/format/im_vips2ppm.c:279 -msgid "1 or 3 band images only" -msgstr "" - -#: libsrc/format/im_ppm2vips.c:114 vips-7.15.1/libsrc/format/im_ppm2vips.c:114 -msgid "bad unsigned int" -msgstr "" - -#: libsrc/format/im_ppm2vips.c:164 vips-7.15.1/libsrc/format/im_ppm2vips.c:164 -msgid "bad magic number" -msgstr "" - -#: libsrc/format/im_ppm2vips.c:194 vips-7.15.1/libsrc/format/im_ppm2vips.c:194 -msgid "not whitespace before start of binary data" -msgstr "" - -#. internal name -#: libsrc/format/im_ppm2vips.c:511 vips-7.15.1/libsrc/format/im_ppm2vips.c:511 -msgid "PPM/PBM/PNM" -msgstr "" - -#: libsrc/format/im_exr2vips.c:68 vips-7.15.1/libsrc/format/im_exr2vips.c:68 +#: libsrc/format/im_exr2vips.c:68 msgid "OpenEXR support disabled" msgstr "" -#: libsrc/format/im_exr2vips.c:112 vips-7.15.1/libsrc/format/im_exr2vips.c:112 +#: libsrc/format/im_exr2vips.c:110 #, c-format msgid "EXR error: %s" msgstr "" #. internal name -#: libsrc/format/im_exr2vips.c:471 vips-7.15.1/libsrc/format/im_exr2vips.c:471 +#: libsrc/format/im_exr2vips.c:469 msgid "OpenEXR" msgstr "" -#: libsrc/format/im_analyze2vips.c:310 libsrc/format/im_analyze2vips.c:355 -#: vips-7.15.1/libsrc/format/im_analyze2vips.c:310 -#: vips-7.15.1/libsrc/format/im_analyze2vips.c:355 -msgid "header file size incorrect" -msgstr "" - -#: libsrc/format/im_analyze2vips.c:373 -#: vips-7.15.1/libsrc/format/im_analyze2vips.c:373 -#, c-format -msgid "%d-dimensional images not supported" -msgstr "" - -#: libsrc/format/im_analyze2vips.c:426 -#: vips-7.15.1/libsrc/format/im_analyze2vips.c:426 -#, c-format -msgid "datatype %d not supported" -msgstr "" - -#. internal name -#: libsrc/format/im_analyze2vips.c:597 -#: vips-7.15.1/libsrc/format/im_analyze2vips.c:597 -msgid "Analyze 6.0" -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:915 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:126 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:915 #, c-format msgid "unable to open \"%s\", %s" msgstr "" #: libsrc/format/im_file2vips.c:252 libsrc/iofuncs/im_open_vips.c:253 -#: vips-7.15.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.15.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.15.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:397 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:397 msgid "incorrect namespace in XML" msgstr "" #: libsrc/format/im_file2vips.c:517 libsrc/iofuncs/im_open_vips.c:518 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:518 msgid "error transforming from save format" msgstr "" #: libsrc/format/im_file2vips.c:631 libsrc/iofuncs/im_open_vips.c:904 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:904 #, c-format msgid "unable to read header for \"%s\", %s" msgstr "" #: libsrc/format/im_file2vips.c:643 libsrc/iofuncs/im_open_vips.c:722 #: libsrc/iofuncs/im_open_vips.c:916 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:722 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:916 msgid "file has been truncated" msgstr "" #: libsrc/format/im_file2vips.c:656 libsrc/iofuncs/im_open_vips.c:929 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:929 #, c-format msgid "error reading XML: %s" msgstr "" -#: libsrc/format/im_png2vips.c:59 libsrc/format/im_vips2png.c:59 -#: vips-7.15.1/libsrc/format/im_png2vips.c:59 -#: vips-7.15.1/libsrc/format/im_vips2png.c:59 -msgid "PNG support disabled" -msgstr "" - -#: libsrc/format/im_png2vips.c:90 libsrc/format/im_vips2png.c:85 -#: vips-7.15.1/libsrc/format/im_png2vips.c:90 -#: vips-7.15.1/libsrc/format/im_vips2png.c:85 -#, c-format -msgid "PNG error: \"%s\"" -msgstr "" - -#: libsrc/format/im_png2vips.c:96 libsrc/format/im_vips2png.c:91 -#: vips-7.15.1/libsrc/format/im_png2vips.c:96 -#: vips-7.15.1/libsrc/format/im_vips2png.c:91 -#, c-format -msgid "PNG warning: \"%s\"" -msgstr "" - -#: libsrc/format/im_png2vips.c:277 vips-7.15.1/libsrc/format/im_png2vips.c:277 -#, fuzzy -msgid "unsupported colour type" -msgstr "unsupported colourspace %d" - -#. internal name -#: libsrc/format/im_png2vips.c:396 vips-7.15.1/libsrc/format/im_png2vips.c:396 -msgid "PNG" -msgstr "" - -#: libsrc/format/im_vips2png.c:130 vips-7.15.1/libsrc/format/im_vips2png.c:130 -msgid "unable to convert to RGB for save" -msgstr "" - -#: libsrc/format/im_vips2png.c:211 vips-7.15.1/libsrc/format/im_vips2png.c:211 -msgid "compress should be in [0,9]" -msgstr "" - -#: libsrc/format/im_vips2png.c:311 vips-7.15.1/libsrc/format/im_vips2png.c:311 -#, c-format -msgid "unable to write \"%s\"" -msgstr "" - -#: libsrc/format/format.c:159 vips-7.15.1/libsrc/format/format.c:159 -#, c-format -msgid "\"%s\" is not readable" -msgstr "" - -#: libsrc/format/format.c:169 vips-7.15.1/libsrc/format/format.c:169 -#, c-format -msgid "\"%s\" is not in a supported format" -msgstr "" - +#: libsrc/freq_filt/im_invfft.c:95 libsrc/freq_filt/im_invfft.c:143 #: 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:421 -#: libsrc/freq_filt/im_invfft.c:95 libsrc/freq_filt/im_invfft.c:143 #: libsrc/freq_filt/im_invfftr.c:90 libsrc/freq_filt/im_invfftr.c:172 -#: vips-7.15.1/libsrc/freq_filt/im_fwfft.c:113 -#: vips-7.15.1/libsrc/freq_filt/im_fwfft.c:218 -#: vips-7.15.1/libsrc/freq_filt/im_fwfft.c:309 -#: vips-7.15.1/libsrc/freq_filt/im_fwfft.c:421 -#: vips-7.15.1/libsrc/freq_filt/im_invfft.c:95 -#: vips-7.15.1/libsrc/freq_filt/im_invfft.c:143 -#: vips-7.15.1/libsrc/freq_filt/im_invfftr.c:90 -#: vips-7.15.1/libsrc/freq_filt/im_invfftr.c:172 msgid "one band uncoded only" msgstr "" +#: libsrc/freq_filt/im_invfft.c:107 libsrc/freq_filt/im_invfft.c:157 #: libsrc/freq_filt/im_fwfft.c:124 libsrc/freq_filt/im_fwfft.c:229 #: libsrc/freq_filt/im_fwfft.c:322 libsrc/freq_filt/im_fwfft.c:434 -#: libsrc/freq_filt/im_invfft.c:107 libsrc/freq_filt/im_invfft.c:157 #: libsrc/freq_filt/im_invfftr.c:127 libsrc/freq_filt/im_invfftr.c:210 -#: vips-7.15.1/libsrc/freq_filt/im_fwfft.c:124 -#: vips-7.15.1/libsrc/freq_filt/im_fwfft.c:229 -#: vips-7.15.1/libsrc/freq_filt/im_fwfft.c:322 -#: vips-7.15.1/libsrc/freq_filt/im_fwfft.c:434 -#: vips-7.15.1/libsrc/freq_filt/im_invfft.c:107 -#: vips-7.15.1/libsrc/freq_filt/im_invfft.c:157 -#: vips-7.15.1/libsrc/freq_filt/im_invfftr.c:127 -#: vips-7.15.1/libsrc/freq_filt/im_invfftr.c:210 msgid "unable to create transform plan" msgstr "" -#: libsrc/freq_filt/im_fwfft.c:512 vips-7.15.1/libsrc/freq_filt/im_fwfft.c:512 -msgid "one band non-complex uncoded only" -msgstr "" - -#: libsrc/freq_filt/im_fwfft.c:516 libsrc/freq_filt/im_invfft.c:204 -#: libsrc/freq_filt/im_invfftr.c:257 -#: vips-7.15.1/libsrc/freq_filt/im_fwfft.c:516 -#: vips-7.15.1/libsrc/freq_filt/im_invfft.c:204 -#: vips-7.15.1/libsrc/freq_filt/im_invfftr.c:257 -msgid "sides must be power of 2" -msgstr "" - -#: libsrc/freq_filt/im_fwfft.c:536 libsrc/freq_filt/im_invfft.c:224 -#: libsrc/freq_filt/im_invfftr.c:277 -#: vips-7.15.1/libsrc/freq_filt/im_fwfft.c:536 -#: vips-7.15.1/libsrc/freq_filt/im_invfft.c:224 -#: vips-7.15.1/libsrc/freq_filt/im_invfftr.c:277 -msgid "fft_sp failed" -msgstr "" - #: libsrc/freq_filt/im_invfft.c:200 libsrc/freq_filt/im_invfftr.c:253 -#: vips-7.15.1/libsrc/freq_filt/im_invfft.c:200 -#: vips-7.15.1/libsrc/freq_filt/im_invfftr.c:253 msgid "one band complex uncoded only" msgstr "" -#: libsrc/histograms_lut/im_lhisteq.c:160 -#: vips-7.15.1/libsrc/histograms_lut/im_lhisteq.c:160 -msgid "one band uchar uncoded only" +#: libsrc/freq_filt/im_invfft.c:204 libsrc/freq_filt/im_fwfft.c:516 +#: libsrc/freq_filt/im_invfftr.c:257 +msgid "sides must be power of 2" msgstr "" -#: libsrc/histograms_lut/im_lhisteq.c:164 -#: vips-7.15.1/libsrc/histograms_lut/im_lhisteq.c:164 -msgid "window too large" +#: libsrc/freq_filt/im_invfft.c:224 libsrc/freq_filt/im_fwfft.c:536 +#: libsrc/freq_filt/im_invfftr.c:277 +msgid "fft_sp failed" msgstr "" -#: libsrc/histograms_lut/im_lhisteq.c:168 -#: vips-7.15.1/libsrc/histograms_lut/im_lhisteq.c:168 -msgid "window too small" +#: libsrc/freq_filt/im_fwfft.c:512 +msgid "one band non-complex uncoded only" msgstr "" -#: libsrc/histograms_lut/tone.c:233 -#: vips-7.15.1/libsrc/histograms_lut/tone.c:233 -msgid "bad in_max, out_max parameters" -msgstr "" - -#: libsrc/histograms_lut/tone.c:237 -#: vips-7.15.1/libsrc/histograms_lut/tone.c:237 -msgid "bad Lb, Lw parameters" -msgstr "" - -#: libsrc/histograms_lut/tone.c:241 -#: vips-7.15.1/libsrc/histograms_lut/tone.c:241 -msgid "Ps not in range [0.0,1.0]" -msgstr "" - -#: libsrc/histograms_lut/tone.c:245 -#: vips-7.15.1/libsrc/histograms_lut/tone.c:245 -msgid "Pm not in range [0.0,1.0]" -msgstr "" - -#: libsrc/histograms_lut/tone.c:249 -#: vips-7.15.1/libsrc/histograms_lut/tone.c:249 -msgid "Ph not in range [0.0,1.0]" -msgstr "" - -#: libsrc/histograms_lut/tone.c:253 -#: vips-7.15.1/libsrc/histograms_lut/tone.c:253 -msgid "S not in range [-30,+30]" -msgstr "" - -#: libsrc/histograms_lut/tone.c:257 -#: vips-7.15.1/libsrc/histograms_lut/tone.c:257 -msgid "M not in range [-30,+30]" -msgstr "" - -#: libsrc/histograms_lut/tone.c:261 -#: vips-7.15.1/libsrc/histograms_lut/tone.c:261 -msgid "H not in range [-30,+30]" -msgstr "" - -#: libsrc/histograms_lut/tone.c:342 libsrc/histograms_lut/tone.c:390 -#: vips-7.15.1/libsrc/histograms_lut/tone.c:342 -#: vips-7.15.1/libsrc/histograms_lut/tone.c:390 -msgid "not 1 by n or n by 1 image" -msgstr "" - -#: libsrc/histograms_lut/tone.c:396 -#: vips-7.15.1/libsrc/histograms_lut/tone.c:396 -msgid "not 1024-point IM_BANDFMT_SHORT lut" -msgstr "" - -#: libsrc/histograms_lut/tone.c:413 libsrc/histograms_lut/tone.c:487 -#: vips-7.15.1/libsrc/histograms_lut/tone.c:413 -#: vips-7.15.1/libsrc/histograms_lut/tone.c:487 -msgid "input not LabS or LabQ" -msgstr "" - -#: libsrc/histograms_lut/im_buildlut.c:134 -#: vips-7.15.1/libsrc/histograms_lut/im_buildlut.c:134 -msgid "x value not an int" -msgstr "" - -#: libsrc/histograms_lut/im_buildlut.c:146 -#: vips-7.15.1/libsrc/histograms_lut/im_buildlut.c:146 -msgid "x range too small" -msgstr "" - -#: libsrc/histograms_lut/im_buildlut.c:217 -#: vips-7.15.1/libsrc/histograms_lut/im_buildlut.c:217 -msgid "bad input matrix size" -msgstr "" - -#: libsrc/histograms_lut/im_histnD.c:217 -#: vips-7.15.1/libsrc/histograms_lut/im_histnD.c:217 -msgid " uncoded images only" -msgstr "" - -#: libsrc/histograms_lut/im_histnD.c:223 -#: vips-7.15.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.15.1/libsrc/histograms_lut/im_histnD.c:230 -#, c-format -msgid " bins out of range [1,%d]" -msgstr "" - -#: libsrc/histograms_lut/im_histeq.c:99 -#: vips-7.15.1/libsrc/histograms_lut/im_histeq.c:99 -msgid "input coded" -msgstr "" - -#: libsrc/histograms_lut/im_histeq.c:103 -#: vips-7.15.1/libsrc/histograms_lut/im_histeq.c:103 -msgid "input too large" -msgstr "" - -#: libsrc/histograms_lut/im_histgr.c:325 -#: vips-7.15.1/libsrc/histograms_lut/im_histgr.c:325 -msgid "input not uchar or ushort" -msgstr "" - -#: libsrc/histograms_lut/im_histgr.c:332 -#: vips-7.15.1/libsrc/histograms_lut/im_histgr.c:332 -msgid "bad band parameter" +#: libsrc/histograms_lut/im_project.c:262 +msgid "non-complex images only" msgstr "" #: libsrc/histograms_lut/im_maplut.c:122 -#: vips-7.15.1/libsrc/histograms_lut/im_maplut.c:122 #, c-format msgid "%d overflows detected" msgstr "" @@ -1822,7 +1330,6 @@ msgstr "" #. Switch for input types. Has to be uint type! #. #: libsrc/histograms_lut/im_maplut.c:484 -#: vips-7.15.1/libsrc/histograms_lut/im_maplut.c:484 msgid "bad input file" msgstr "" @@ -1831,71 +1338,158 @@ msgstr "" #. * uchar. #. #: libsrc/histograms_lut/im_maplut.c:515 -#: vips-7.15.1/libsrc/histograms_lut/im_maplut.c:515 msgid "bad lut file" msgstr "" #: libsrc/histograms_lut/im_maplut.c:568 -#: vips-7.15.1/libsrc/histograms_lut/im_maplut.c:568 msgid "lut is not uncoded" msgstr "" #: libsrc/histograms_lut/im_maplut.c:572 -#: vips-7.15.1/libsrc/histograms_lut/im_maplut.c:572 msgid "lut seems very large!" msgstr "" #: libsrc/histograms_lut/im_maplut.c:584 -#: vips-7.15.1/libsrc/histograms_lut/im_maplut.c:584 msgid "input is not uncoded" msgstr "" #: libsrc/histograms_lut/im_maplut.c:588 -#: vips-7.15.1/libsrc/histograms_lut/im_maplut.c:588 msgid "input is not some unsigned integer type" msgstr "" #: libsrc/histograms_lut/im_maplut.c:593 -#: vips-7.15.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.15.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:325 +msgid "input not uchar or ushort" +msgstr "" + +#: libsrc/histograms_lut/im_histgr.c:332 +msgid "bad band parameter" +msgstr "" + +#: libsrc/histograms_lut/im_histnD.c:217 +msgid " uncoded images only" +msgstr "" + +#: libsrc/histograms_lut/im_histnD.c:223 +msgid " unsigned 8 or 16 bit images only" +msgstr "" + +#: libsrc/histograms_lut/im_histnD.c:230 +#, c-format +msgid " bins out of range [1,%d]" +msgstr "" + +#: libsrc/histograms_lut/tone.c:233 +msgid "bad in_max, out_max parameters" +msgstr "" + +#: libsrc/histograms_lut/tone.c:237 +msgid "bad Lb, Lw parameters" +msgstr "" + +#: libsrc/histograms_lut/tone.c:241 +msgid "Ps not in range [0.0,1.0]" +msgstr "" + +#: libsrc/histograms_lut/tone.c:245 +msgid "Pm not in range [0.0,1.0]" +msgstr "" + +#: libsrc/histograms_lut/tone.c:249 +msgid "Ph not in range [0.0,1.0]" +msgstr "" + +#: libsrc/histograms_lut/tone.c:253 +msgid "S not in range [-30,+30]" +msgstr "" + +#: libsrc/histograms_lut/tone.c:257 +msgid "M not in range [-30,+30]" +msgstr "" + +#: libsrc/histograms_lut/tone.c:261 +msgid "H not in range [-30,+30]" +msgstr "" + +#: libsrc/histograms_lut/tone.c:342 libsrc/histograms_lut/tone.c:390 +msgid "not 1 by n or n by 1 image" +msgstr "" + +#: libsrc/histograms_lut/tone.c:396 +msgid "not 1024-point IM_BANDFMT_SHORT lut" +msgstr "" + +#: libsrc/histograms_lut/tone.c:413 libsrc/histograms_lut/tone.c:487 +msgid "input not LabS or LabQ" +msgstr "" + #: libsrc/histograms_lut/im_histplot.c:93 -#: vips-7.15.1/libsrc/histograms_lut/im_histplot.c:93 msgid "uncoded only" msgstr "" #: libsrc/histograms_lut/im_histplot.c:97 -#: vips-7.15.1/libsrc/histograms_lut/im_histplot.c:97 msgid "non-complex only" msgstr "" #: libsrc/histograms_lut/im_histplot.c:187 #: libsrc/histograms_lut/im_histplot.c:241 -#: vips-7.15.1/libsrc/histograms_lut/im_histplot.c:187 -#: vips-7.15.1/libsrc/histograms_lut/im_histplot.c:241 msgid "internal error #8255" msgstr "" #: libsrc/histograms_lut/im_histplot.c:329 -#: vips-7.15.1/libsrc/histograms_lut/im_histplot.c:329 msgid "Xsize or Ysize not 1" msgstr "" -#: libsrc/histograms_lut/im_project.c:262 -#: vips-7.15.1/libsrc/histograms_lut/im_project.c:262 -msgid "non-complex images only" +#: libsrc/histograms_lut/im_histeq.c:99 +msgid "input coded" +msgstr "" + +#: libsrc/histograms_lut/im_histeq.c:103 +msgid "input too large" +msgstr "" + +#: libsrc/histograms_lut/im_lhisteq.c:160 +msgid "one band uchar uncoded only" +msgstr "" + +#: libsrc/histograms_lut/im_lhisteq.c:164 +msgid "window too large" +msgstr "" + +#: libsrc/histograms_lut/im_lhisteq.c:168 +msgid "window too small" +msgstr "" + +#: libsrc/histograms_lut/im_buildlut.c:134 +msgid "x value not an int" +msgstr "" + +#: libsrc/histograms_lut/im_buildlut.c:146 +msgid "x range too small" +msgstr "" + +#: libsrc/histograms_lut/im_buildlut.c:217 +msgid "bad input matrix size" +msgstr "" + +#: libsrc/inplace/inplace_dispatch.c:239 +msgid "bad vector length" +msgstr "" + +#: libsrc/inplace/smudge_area.c:185 libsrc/inplace/smudge_area.c:312 +msgid "unknown band format" msgstr "" #: libsrc/inplace/im_insertplace.c:106 -#: vips-7.15.1/libsrc/inplace/im_insertplace.c:106 msgid "small not inside big" msgstr "" @@ -1903,898 +1497,798 @@ msgstr "" #: libsrc/mosaicing/im_tbmerge.c:216 libsrc/mosaicing/im_tbmerge.c:534 #: libsrc/mosaicing/im_lrmerge.c:222 libsrc/mosaicing/im_lrmerge.c:271 #: libsrc/mosaicing/im_lrmerge.c:612 -#: vips-7.15.1/libsrc/inplace/im_plotmask.c:229 -#: vips-7.15.1/libsrc/mosaicing/im_lrmerge.c:222 -#: vips-7.15.1/libsrc/mosaicing/im_lrmerge.c:271 -#: vips-7.15.1/libsrc/mosaicing/im_lrmerge.c:612 -#: vips-7.15.1/libsrc/mosaicing/im_tbmerge.c:162 -#: vips-7.15.1/libsrc/mosaicing/im_tbmerge.c:216 -#: vips-7.15.1/libsrc/mosaicing/im_tbmerge.c:534 msgid "internal error" msgstr "" -#: libsrc/inplace/line_draw.c:415 vips-7.15.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.15.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.15.1/libsrc/inplace/line_draw.c:425 +#: libsrc/inplace/line_draw.c:425 msgid "ink image not 1x1 pixels" msgstr "" -#: libsrc/inplace/inplace_dispatch.c:239 -#: vips-7.15.1/libsrc/inplace/inplace_dispatch.c:239 -msgid "bad vector length" +#: libsrc/iofuncs/im_open.c:319 +#, c-format +msgid "%s %s: %d%% complete" msgstr "" -#: libsrc/inplace/smudge_area.c:185 libsrc/inplace/smudge_area.c:312 -#: vips-7.15.1/libsrc/inplace/smudge_area.c:185 -#: vips-7.15.1/libsrc/inplace/smudge_area.c:312 -msgid "unknown band format" +#. Spaces at end help to erase the %complete message we overwrite. +#. +#: libsrc/iofuncs/im_open.c:337 +#, c-format +msgid "%s %s: done in %ds \n" msgstr "" -#: libsrc/iofuncs/im_demand_hint.c:183 libsrc/iofuncs/im_cp_desc.c:140 -#: vips-7.15.1/libsrc/iofuncs/im_cp_desc.c:140 -#: vips-7.15.1/libsrc/iofuncs/im_demand_hint.c:183 -msgid "too many images" +#: libsrc/iofuncs/im_open.c:357 +msgid "NULL filename or mode" +msgstr "" + +#: libsrc/iofuncs/im_open.c:384 +#, c-format +msgid "\"%s\" is not in a recognised format" +msgstr "" + +#: libsrc/iofuncs/im_open.c:408 +#, fuzzy, c-format +msgid "unsupported filetype \"%s\"" +msgstr "unsupported colourspace %d" + +#: libsrc/iofuncs/im_open.c:424 +#, c-format +msgid "bad mode \"%s\"" +msgstr "" + +#. Not a known output style. +#. +#: libsrc/iofuncs/im_writeline.c:110 libsrc/iofuncs/im_generate.c:461 +#, c-format +msgid "unable to output to a %s image" +msgstr "" + +#: libsrc/iofuncs/util.c:665 +msgid "unable to get file stats" +msgstr "" + +#: libsrc/iofuncs/util.c:682 libsrc/iofuncs/im_wbuffer.c:359 +#: libsrc/iofuncs/im_wbuffer.c:396 +msgid "write failed" +msgstr "" + +#. Seems crazy! +#. +#: libsrc/iofuncs/util.c:709 +#, c-format +msgid "\"%s\" too long" +msgstr "" + +#: libsrc/iofuncs/util.c:726 +msgid "out of memory" +msgstr "" + +#: libsrc/iofuncs/util.c:752 +#, c-format +msgid "error reading from file \"%s\"" +msgstr "" + +#: libsrc/iofuncs/util.c:779 +#, c-format +msgid "unable to open file \"%s\"" +msgstr "" + +#: libsrc/iofuncs/util.c:999 libsrc/iofuncs/util.c:1006 +msgid "unable to truncate" +msgstr "" + +#: libsrc/iofuncs/util.c:1026 +#, c-format +msgid "writing error (%zd out of %zd blocks written) ... disc full?" +msgstr "" + +#: libsrc/iofuncs/im_iocheck.c:162 +msgid "no image data" +msgstr "" + +#: libsrc/iofuncs/im_iocheck.c:206 +#, c-format +msgid "auto-rewind for %s failed" +msgstr "" + +#: libsrc/iofuncs/im_iocheck.c:214 +msgid "image not readable" +msgstr "" + +#: libsrc/iofuncs/im_iocheck.c:235 libsrc/iofuncs/im_iocheck.c:250 +msgid "image already written" +msgstr "" + +#: libsrc/iofuncs/im_iocheck.c:263 +msgid "image not writeable" +msgstr "" + +#: libsrc/iofuncs/im_iocheck.c:285 +msgid "unable to rewind file" +msgstr "" + +#: libsrc/iofuncs/im_iocheck.c:308 +msgid "bad file type" msgstr "" #: libsrc/iofuncs/im_mapfile.c:140 libsrc/iofuncs/im_mapfile.c:301 -#: vips-7.15.1/libsrc/iofuncs/im_mapfile.c:140 -#: vips-7.15.1/libsrc/iofuncs/im_mapfile.c:301 msgid "unable to CreateFileMapping" msgstr "" #: libsrc/iofuncs/im_mapfile.c:150 libsrc/iofuncs/im_mapfile.c:313 -#: vips-7.15.1/libsrc/iofuncs/im_mapfile.c:150 -#: vips-7.15.1/libsrc/iofuncs/im_mapfile.c:313 msgid "unable to MapViewOfFile" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:177 vips-7.15.1/libsrc/iofuncs/im_mapfile.c:177 +#: libsrc/iofuncs/im_mapfile.c:177 msgid "unable to mmap" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:178 vips-7.15.1/libsrc/iofuncs/im_mapfile.c:178 +#: libsrc/iofuncs/im_mapfile.c:178 #, c-format msgid "" "map failed (%s), running very low on system resources, expect a crash soon" msgstr "" #: libsrc/iofuncs/im_mapfile.c:195 libsrc/iofuncs/im_mapfile.c:307 -#: vips-7.15.1/libsrc/iofuncs/im_mapfile.c:195 -#: vips-7.15.1/libsrc/iofuncs/im_mapfile.c:307 msgid "unable to UnmapViewOfFile" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:201 vips-7.15.1/libsrc/iofuncs/im_mapfile.c:201 +#: libsrc/iofuncs/im_mapfile.c:201 msgid "unable to munmap file" msgstr "" #: libsrc/iofuncs/im_mapfile.c:224 libsrc/iofuncs/im_mapfile.c:265 -#: vips-7.15.1/libsrc/iofuncs/im_mapfile.c:224 -#: vips-7.15.1/libsrc/iofuncs/im_mapfile.c:265 msgid "unable to get file status" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:229 vips-7.15.1/libsrc/iofuncs/im_mapfile.c:229 +#: libsrc/iofuncs/im_mapfile.c:229 msgid "file is less than 64 bytes" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:233 vips-7.15.1/libsrc/iofuncs/im_mapfile.c:233 +#: libsrc/iofuncs/im_mapfile.c:233 msgid "not a regular file" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:270 vips-7.15.1/libsrc/iofuncs/im_mapfile.c:270 +#: libsrc/iofuncs/im_mapfile.c:270 msgid "unable to read data" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:333 vips-7.15.1/libsrc/iofuncs/im_mapfile.c:333 +#: libsrc/iofuncs/im_mapfile.c:333 #, c-format msgid "unable to mmap: \"%s\" - %s" msgstr "" -#: libsrc/iofuncs/im_mapfile.c:343 vips-7.15.1/libsrc/iofuncs/im_mapfile.c:343 +#: libsrc/iofuncs/im_mapfile.c:343 #, c-format msgid "unable to mmap \"%s\" to same address" msgstr "" -#: libsrc/iofuncs/im_render.c:566 libsrc/iofuncs/im_render.c:724 -#: libsrc/iofuncs/im_wbuffer.c:176 libsrc/iofuncs/threadgroup.c:469 -#: vips-7.15.1/libsrc/iofuncs/im_render.c:566 -#: vips-7.15.1/libsrc/iofuncs/im_render.c:724 -#: vips-7.15.1/libsrc/iofuncs/im_wbuffer.c:176 -#: vips-7.15.1/libsrc/iofuncs/threadgroup.c:469 -msgid "unable to create thread" -msgstr "" - -#: libsrc/iofuncs/im_header.c:106 vips-7.15.1/libsrc/iofuncs/im_header.c:106 +#: libsrc/iofuncs/package.c:482 #, c-format -msgid "no such int field \"%s\"" +msgid "unable to close plugin \"%s\"" msgstr "" -#: libsrc/iofuncs/im_header.c:128 vips-7.15.1/libsrc/iofuncs/im_header.c:128 +#: libsrc/iofuncs/package.c:507 +msgid "plugins not supported on this platform" +msgstr "" + +#: libsrc/iofuncs/package.c:530 #, c-format -msgid "no such double field \"%s\"" +msgid "unable to open plugin \"%s\"" msgstr "" -#: libsrc/iofuncs/im_header.c:150 vips-7.15.1/libsrc/iofuncs/im_header.c:150 +#: libsrc/iofuncs/package.c:544 #, c-format -msgid "no such string field \"%s\"" +msgid "unable to find symbol \"package_table\" in plugin \"%s\"" msgstr "" -#: libsrc/iofuncs/util.c:635 vips-7.15.1/libsrc/iofuncs/util.c:635 -msgid "unable to get file stats" -msgstr "" - -#: libsrc/iofuncs/util.c:652 libsrc/iofuncs/im_wbuffer.c:359 -#: libsrc/iofuncs/im_wbuffer.c:396 vips-7.15.1/libsrc/iofuncs/im_wbuffer.c:359 -#: vips-7.15.1/libsrc/iofuncs/im_wbuffer.c:396 -#: vips-7.15.1/libsrc/iofuncs/util.c:652 -msgid "write failed" -msgstr "" - -#. Seems crazy! -#. -#: libsrc/iofuncs/util.c:679 vips-7.15.1/libsrc/iofuncs/util.c:679 +#: libsrc/iofuncs/package.c:557 #, c-format -msgid "\"%s\" too long" +msgid "corrupted package table in plugin \"%s\"" msgstr "" -#: libsrc/iofuncs/util.c:696 vips-7.15.1/libsrc/iofuncs/util.c:696 -msgid "out of memory" -msgstr "" - -#: libsrc/iofuncs/util.c:722 vips-7.15.1/libsrc/iofuncs/util.c:722 +#: libsrc/iofuncs/package.c:677 libsrc/iofuncs/package.c:704 +#: libsrc/iofuncs/package.c:732 #, c-format -msgid "error reading from file \"%s\"" +msgid "\"%s\" not found" msgstr "" -#: libsrc/iofuncs/util.c:749 vips-7.15.1/libsrc/iofuncs/util.c:749 +#: libsrc/iofuncs/package.c:842 +msgid "too few arguments" +msgstr "" + +#: libsrc/iofuncs/package.c:863 +msgid "too many arguments" +msgstr "" + +#: libsrc/iofuncs/package.c:1080 +msgid "flag not 0,1,2" +msgstr "" + +#: libsrc/iofuncs/im_wrapmany.c:166 +msgid "too many input images" +msgstr "" + +#: libsrc/iofuncs/im_wrapmany.c:184 +msgid "descriptors differ in size" +msgstr "" + +#: libsrc/iofuncs/im_open_vips.c:626 #, c-format -msgid "unable to open file \"%s\"" +msgid "unable to set property \"%s\" to value \"%s\"." msgstr "" -#: libsrc/iofuncs/util.c:969 libsrc/iofuncs/util.c:976 -#: vips-7.15.1/libsrc/iofuncs/util.c:969 vips-7.15.1/libsrc/iofuncs/util.c:976 -msgid "unable to truncate" +#: libsrc/iofuncs/im_open_vips.c:674 +msgid "error transforming to save format" msgstr "" -#: libsrc/iofuncs/util.c:994 vips-7.15.1/libsrc/iofuncs/util.c:994 -#, c-format -msgid "writing error (%d out of %d blocks written) ... disc full?" +#: libsrc/iofuncs/im_open_vips.c:836 libsrc/iofuncs/im_open_vips.c:845 +#: libsrc/iofuncs/im_open_vips.c:868 +msgid "xml save error" msgstr "" -#. \r at end returns to the start of this line. -#. -#: libsrc/iofuncs/im_open.c:321 vips-7.15.1/libsrc/iofuncs/im_open.c:321 -#, c-format -msgid "%s %s: %d%% complete\r" +#: libsrc/iofuncs/im_open_vips.c:1025 +msgid "open for read-write for native format images only" msgstr "" -#. Spaces at end help to erase the %complete message we overwrite. -#. -#: libsrc/iofuncs/im_open.c:338 vips-7.15.1/libsrc/iofuncs/im_open.c:338 -#, c-format -msgid "%s %s: done in %ds \n" -msgstr "" - -#: libsrc/iofuncs/im_open.c:360 vips-7.15.1/libsrc/iofuncs/im_open.c:360 -msgid "NULL filename or mode" -msgstr "" - -#: libsrc/iofuncs/im_open.c:412 vips-7.15.1/libsrc/iofuncs/im_open.c:412 -#, c-format -msgid "bad mode \"%s\"" -msgstr "" - -#: libsrc/iofuncs/im_generate.c:392 libsrc/iofuncs/im_generate.c:415 -#: vips-7.15.1/libsrc/iofuncs/im_generate.c:392 -#: vips-7.15.1/libsrc/iofuncs/im_generate.c:415 -msgid "func already attached" -msgstr "" - -#. Not a known output style. -#. -#: libsrc/iofuncs/im_generate.c:461 libsrc/iofuncs/im_writeline.c:110 -#: vips-7.15.1/libsrc/iofuncs/im_generate.c:461 -#: vips-7.15.1/libsrc/iofuncs/im_writeline.c:110 -#, c-format -msgid "unable to output to a %s image" -msgstr "" - -#: libsrc/iofuncs/im_generate.c:500 libsrc/iofuncs/im_prepare.c:164 -#: libsrc/iofuncs/im_prepare.c:368 -#: vips-7.15.1/libsrc/iofuncs/im_generate.c:500 -#: vips-7.15.1/libsrc/iofuncs/im_prepare.c:164 -#: vips-7.15.1/libsrc/iofuncs/im_prepare.c:368 -#, c-format -msgid "unable to input from a %s image" -msgstr "" - -#: libsrc/iofuncs/region.c:124 vips-7.15.1/libsrc/iofuncs/region.c:124 -#, c-format -msgid "start function failed for image %s" -msgstr "" - -#: libsrc/iofuncs/region.c:338 libsrc/iofuncs/region.c:392 -#: libsrc/iofuncs/region.c:522 libsrc/iofuncs/im_prepare.c:318 -#: vips-7.15.1/libsrc/iofuncs/im_prepare.c:318 -#: vips-7.15.1/libsrc/iofuncs/region.c:338 -#: vips-7.15.1/libsrc/iofuncs/region.c:392 -#: vips-7.15.1/libsrc/iofuncs/region.c:522 -msgid "valid clipped to nothing" -msgstr "" - -#: libsrc/iofuncs/region.c:437 vips-7.15.1/libsrc/iofuncs/region.c:437 -msgid "bad image type" -msgstr "" - -#: libsrc/iofuncs/region.c:472 libsrc/iofuncs/im_prepare.c:276 -#: vips-7.15.1/libsrc/iofuncs/im_prepare.c:276 -#: vips-7.15.1/libsrc/iofuncs/region.c:472 -msgid "inappropriate region type" -msgstr "" - -#: libsrc/iofuncs/region.c:504 libsrc/iofuncs/im_prepare.c:301 -#: vips-7.15.1/libsrc/iofuncs/im_prepare.c:301 -#: vips-7.15.1/libsrc/iofuncs/region.c:504 -msgid "dest too small" -msgstr "" - -#: libsrc/iofuncs/region.c:572 vips-7.15.1/libsrc/iofuncs/region.c:572 -msgid "bad position" -msgstr "" - -#: libsrc/iofuncs/meta.c:291 vips-7.15.1/libsrc/iofuncs/meta.c:291 +#: libsrc/iofuncs/meta.c:294 #, c-format msgid "field \"%s\" not found" msgstr "" -#: libsrc/iofuncs/meta.c:336 vips-7.15.1/libsrc/iofuncs/meta.c:336 +#: libsrc/iofuncs/meta.c:339 #, c-format msgid "field \"%s\" is of type %s, not %s" msgstr "" -#: libsrc/iofuncs/error.c:128 vips-7.15.1/libsrc/iofuncs/error.c:128 +#: 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:368 +#: libsrc/iofuncs/im_generate.c:500 +#, c-format +msgid "unable to input from a %s image" +msgstr "" + +#: libsrc/iofuncs/im_prepare.c:228 +msgid "incomplete header" +msgstr "" + +#: libsrc/iofuncs/im_prepare.c:276 libsrc/iofuncs/region.c:472 +msgid "inappropriate region type" +msgstr "" + +#: libsrc/iofuncs/im_prepare.c:301 libsrc/iofuncs/region.c:504 +msgid "dest too small" +msgstr "" + +#: libsrc/iofuncs/im_prepare.c:318 libsrc/iofuncs/region.c:338 +#: libsrc/iofuncs/region.c:392 libsrc/iofuncs/region.c:522 +msgid "valid clipped to nothing" +msgstr "" + +#: libsrc/iofuncs/im_init_world.c:211 +msgid "evaluate with N concurrent threads" +msgstr "" + +#: libsrc/iofuncs/im_init_world.c:213 +msgid "set tile width to N (DEBUG)" +msgstr "" + +#: libsrc/iofuncs/im_init_world.c:215 +msgid "set tile height to N (DEBUG)" +msgstr "" + +#: libsrc/iofuncs/im_init_world.c:218 +msgid "set thinstrip height to N (DEBUG)" +msgstr "" + +#: libsrc/iofuncs/im_init_world.c:221 +msgid "set fatstrip height to N (DEBUG)" +msgstr "" + +#: libsrc/iofuncs/im_init_world.c:223 +msgid "show progress feedback" +msgstr "" + +#: libsrc/iofuncs/im_init_world.c:236 +msgid "VIPS Options" +msgstr "" + +#: libsrc/iofuncs/im_init_world.c:236 +msgid "Show VIPS options" +msgstr "" + +#: libsrc/iofuncs/callback.c:138 +#, c-format +msgid "user callback failed for %s" +msgstr "" + +#: libsrc/iofuncs/im_iterate.c:163 +#, c-format +msgid "start function failed for image \"%s\"" +msgstr "" + +#: libsrc/iofuncs/im_iterate.c:185 +#, c-format +msgid "stop function failed for image \"%s\"" +msgstr "" + +#: libsrc/iofuncs/im_cp_desc.c:140 libsrc/iofuncs/im_demand_hint.c:183 +msgid "too many images" +msgstr "" + +#: libsrc/iofuncs/memory.c:162 libsrc/iofuncs/memory.c:165 +#, c-format +msgid "out of memory --- size == %dMB" +msgstr "" + +#: libsrc/iofuncs/im_render.c:566 libsrc/iofuncs/im_render.c:724 +#: libsrc/iofuncs/threadgroup.c:469 libsrc/iofuncs/im_wbuffer.c:176 +msgid "unable to create thread" +msgstr "" + +#: libsrc/iofuncs/im_generate.c:392 libsrc/iofuncs/im_generate.c:415 +msgid "func already attached" +msgstr "" + +#: libsrc/iofuncs/im_header.c:107 +#, c-format +msgid "no such int field \"%s\"" +msgstr "" + +#: libsrc/iofuncs/im_header.c:129 +#, c-format +msgid "no such double field \"%s\"" +msgstr "" + +#: libsrc/iofuncs/im_header.c:151 +#, c-format +msgid "no such string field \"%s\"" +msgstr "" + +#: libsrc/iofuncs/threadgroup.c:145 +#, c-format +msgid "threads clipped to %d" +msgstr "" + +#: libsrc/iofuncs/error.c:128 msgid "windows error" msgstr "" -#: libsrc/iofuncs/error.c:137 vips-7.15.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.15.1/libsrc/iofuncs/error.c:166 -#: vips-7.15.1/libsrc/iofuncs/error.c:167 -#: vips-7.15.1/libsrc/iofuncs/error.c:189 -#: vips-7.15.1/libsrc/iofuncs/error.c:190 #, c-format msgid "%s: " msgstr "" -#: libsrc/iofuncs/error.c:166 vips-7.15.1/libsrc/iofuncs/error.c:166 +#: libsrc/iofuncs/error.c:166 msgid "vips diagnostic" msgstr "" -#: libsrc/iofuncs/error.c:189 vips-7.15.1/libsrc/iofuncs/error.c:189 +#: libsrc/iofuncs/error.c:189 msgid "vips warning" msgstr "" -#: libsrc/iofuncs/im_init_world.c:203 -#: vips-7.15.1/libsrc/iofuncs/im_init_world.c:203 -msgid "evaluate with N concurrent threads" -msgstr "" - -#: libsrc/iofuncs/im_init_world.c:205 -#: vips-7.15.1/libsrc/iofuncs/im_init_world.c:205 -msgid "set tile width to N (DEBUG)" -msgstr "" - -#: libsrc/iofuncs/im_init_world.c:207 -#: vips-7.15.1/libsrc/iofuncs/im_init_world.c:207 -msgid "set tile height to N (DEBUG)" -msgstr "" - -#: libsrc/iofuncs/im_init_world.c:210 -#: vips-7.15.1/libsrc/iofuncs/im_init_world.c:210 -msgid "set thinstrip height to N (DEBUG)" -msgstr "" - -#: libsrc/iofuncs/im_init_world.c:213 -#: vips-7.15.1/libsrc/iofuncs/im_init_world.c:213 -msgid "set fatstrip height to N (DEBUG)" -msgstr "" - -#: libsrc/iofuncs/im_init_world.c:215 -#: vips-7.15.1/libsrc/iofuncs/im_init_world.c:215 -msgid "show progress feedback" -msgstr "" - -#: libsrc/iofuncs/im_init_world.c:228 -#: vips-7.15.1/libsrc/iofuncs/im_init_world.c:228 -msgid "VIPS Options" -msgstr "" - -#: libsrc/iofuncs/im_init_world.c:228 -#: vips-7.15.1/libsrc/iofuncs/im_init_world.c:228 -msgid "Show VIPS options" -msgstr "" - -#: libsrc/iofuncs/memory.c:162 libsrc/iofuncs/memory.c:165 -#: vips-7.15.1/libsrc/iofuncs/memory.c:162 -#: vips-7.15.1/libsrc/iofuncs/memory.c:165 -#, c-format -msgid "out of memory --- size == %dMB" -msgstr "" - -#. Sanity failure! -#. -#: libsrc/iofuncs/im_setupout.c:125 -#: vips-7.15.1/libsrc/iofuncs/im_setupout.c:125 -msgid "called twice!" -msgstr "" - -#: libsrc/iofuncs/im_setupout.c:143 -#: vips-7.15.1/libsrc/iofuncs/im_setupout.c:143 -#, c-format -msgid "unable to write to \"%s\"" -msgstr "" - -#: libsrc/iofuncs/im_setupout.c:155 -#: vips-7.15.1/libsrc/iofuncs/im_setupout.c:155 -msgid "bad image descriptor" -msgstr "" - -#: libsrc/iofuncs/im_bits_of_fmt.c:61 -#: vips-7.15.1/libsrc/iofuncs/im_bits_of_fmt.c:61 -#, fuzzy, c-format -msgid "unsupported band format: %d" -msgstr "unsupported colourspace %d" - #: libsrc/iofuncs/im_printdesc.c:157 -#: vips-7.15.1/libsrc/iofuncs/im_printdesc.c:157 msgid "" msgstr "" #: libsrc/iofuncs/im_printdesc.c:163 -#: vips-7.15.1/libsrc/iofuncs/im_printdesc.c:163 msgid "" msgstr "" #: libsrc/iofuncs/im_printdesc.c:169 -#: vips-7.15.1/libsrc/iofuncs/im_printdesc.c:169 msgid "" msgstr "" #: libsrc/iofuncs/im_printdesc.c:175 -#: vips-7.15.1/libsrc/iofuncs/im_printdesc.c:175 msgid "" msgstr "" #: libsrc/iofuncs/im_printdesc.c:181 -#: vips-7.15.1/libsrc/iofuncs/im_printdesc.c:181 msgid "" msgstr "" #: libsrc/iofuncs/im_printdesc.c:187 -#: vips-7.15.1/libsrc/iofuncs/im_printdesc.c:187 msgid "" msgstr "" -#: libsrc/iofuncs/im_iterate.c:163 vips-7.15.1/libsrc/iofuncs/im_iterate.c:163 -#, c-format -msgid "start function failed for image \"%s\"" -msgstr "" - -#: libsrc/iofuncs/im_iterate.c:185 vips-7.15.1/libsrc/iofuncs/im_iterate.c:185 -#, c-format -msgid "stop function failed for image \"%s\"" -msgstr "" - -#: libsrc/iofuncs/dispatch_types.c:72 -#: vips-7.15.1/libsrc/iofuncs/dispatch_types.c:72 -#, c-format -msgid "unknown display type \"%s\"" -msgstr "" - -#: libsrc/iofuncs/dispatch_types.c:73 -#: vips-7.15.1/libsrc/iofuncs/dispatch_types.c:73 -msgid "display should be one of:\n" -msgstr "" - -#: libsrc/iofuncs/dispatch_types.c:455 -#: vips-7.15.1/libsrc/iofuncs/dispatch_types.c:455 -#, c-format -msgid "bad double \"%s\"" -msgstr "" - -#: libsrc/iofuncs/dispatch_types.c:541 -#: vips-7.15.1/libsrc/iofuncs/dispatch_types.c:541 -#, c-format -msgid "bad integer \"%s\"" -msgstr "" - -#: libsrc/iofuncs/dispatch_types.c:600 -#: vips-7.15.1/libsrc/iofuncs/dispatch_types.c:600 -#, fuzzy -msgid "bad format" -msgstr "bad colourmap" - -#: libsrc/iofuncs/im_prepare.c:98 vips-7.15.1/libsrc/iofuncs/im_prepare.c:98 -#, c-format -msgid "killed for image \"%s\"" -msgstr "" - -#: libsrc/iofuncs/im_prepare.c:228 vips-7.15.1/libsrc/iofuncs/im_prepare.c:228 -msgid "incomplete header" -msgstr "" - -#: libsrc/iofuncs/im_wrapmany.c:166 -#: vips-7.15.1/libsrc/iofuncs/im_wrapmany.c:166 -msgid "too many input images" -msgstr "" - -#: libsrc/iofuncs/im_wrapmany.c:184 -#: vips-7.15.1/libsrc/iofuncs/im_wrapmany.c:184 -msgid "descriptors differ in size" -msgstr "" - -#: libsrc/iofuncs/base64.c:168 vips-7.15.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.15.1/libsrc/iofuncs/base64.c:174 -#: vips-7.15.1/libsrc/iofuncs/base64.c:239 msgid "too much data" msgstr "" -#: libsrc/iofuncs/threadgroup.c:145 -#: vips-7.15.1/libsrc/iofuncs/threadgroup.c:145 -#, c-format -msgid "threads clipped to %d" -msgstr "" - -#: libsrc/iofuncs/im_open_vips.c:626 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:626 -#, c-format -msgid "unable to set property \"%s\" to value \"%s\"." -msgstr "" - -#: libsrc/iofuncs/im_open_vips.c:674 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:674 -msgid "error transforming to save format" -msgstr "" - -#: libsrc/iofuncs/im_open_vips.c:836 libsrc/iofuncs/im_open_vips.c:845 -#: libsrc/iofuncs/im_open_vips.c:868 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:836 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:845 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:868 -msgid "xml save error" -msgstr "" - -#: libsrc/iofuncs/im_open_vips.c:1025 -#: vips-7.15.1/libsrc/iofuncs/im_open_vips.c:1025 -msgid "open for read-write for native format images only" -msgstr "" - -#: libsrc/iofuncs/package.c:482 vips-7.15.1/libsrc/iofuncs/package.c:482 -#, c-format -msgid "unable to close plugin \"%s\"" -msgstr "" - -#: libsrc/iofuncs/package.c:507 vips-7.15.1/libsrc/iofuncs/package.c:507 -msgid "plugins not supported on this platform" -msgstr "" - -#: libsrc/iofuncs/package.c:530 vips-7.15.1/libsrc/iofuncs/package.c:530 -#, c-format -msgid "unable to open plugin \"%s\"" -msgstr "" - -#: libsrc/iofuncs/package.c:544 vips-7.15.1/libsrc/iofuncs/package.c:544 -#, c-format -msgid "unable to find symbol \"package_table\" in plugin \"%s\"" -msgstr "" - -#: libsrc/iofuncs/package.c:557 vips-7.15.1/libsrc/iofuncs/package.c:557 -#, c-format -msgid "corrupted package table in plugin \"%s\"" -msgstr "" - -#: libsrc/iofuncs/package.c:677 libsrc/iofuncs/package.c:704 -#: libsrc/iofuncs/package.c:732 vips-7.15.1/libsrc/iofuncs/package.c:677 -#: vips-7.15.1/libsrc/iofuncs/package.c:704 -#: vips-7.15.1/libsrc/iofuncs/package.c:732 -#, c-format -msgid "\"%s\" not found" -msgstr "" - -#: libsrc/iofuncs/package.c:842 vips-7.15.1/libsrc/iofuncs/package.c:842 -msgid "too few arguments" -msgstr "" - -#: libsrc/iofuncs/package.c:863 vips-7.15.1/libsrc/iofuncs/package.c:863 -msgid "too many arguments" -msgstr "" - -#: libsrc/iofuncs/package.c:1080 vips-7.15.1/libsrc/iofuncs/package.c:1080 -msgid "flag not 0,1,2" -msgstr "" - -#: libsrc/iofuncs/callback.c:138 vips-7.15.1/libsrc/iofuncs/callback.c:138 -#, c-format -msgid "user callback failed for %s" -msgstr "" - -#: libsrc/iofuncs/im_binfile.c:122 vips-7.15.1/libsrc/iofuncs/im_binfile.c:122 +#: libsrc/iofuncs/im_binfile.c:122 #, c-format msgid "unable to open %s: file has been truncated" msgstr "" -#: libsrc/iofuncs/im_binfile.c:132 vips-7.15.1/libsrc/iofuncs/im_binfile.c:132 +#: libsrc/iofuncs/im_binfile.c:132 #, c-format msgid "%s is longer than expected" msgstr "" -#: libsrc/morphology/im_erode.c:198 libsrc/morphology/im_dilate.c:198 -#: vips-7.15.1/libsrc/morphology/im_dilate.c:198 -#: vips-7.15.1/libsrc/morphology/im_erode.c:198 +#. Sanity failure! +#. +#: libsrc/iofuncs/im_setupout.c:125 +msgid "called twice!" +msgstr "" + +#: libsrc/iofuncs/im_setupout.c:143 +#, c-format +msgid "unable to write to \"%s\"" +msgstr "" + +#: libsrc/iofuncs/im_setupout.c:155 +msgid "bad image descriptor" +msgstr "" + +#: 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 +#, c-format +msgid "unknown display type \"%s\"" +msgstr "" + +#: libsrc/iofuncs/dispatch_types.c:73 +msgid "display should be one of:\n" +msgstr "" + +#: libsrc/iofuncs/dispatch_types.c:455 +#, c-format +msgid "bad double \"%s\"" +msgstr "" + +#: libsrc/iofuncs/dispatch_types.c:541 +#, c-format +msgid "bad integer \"%s\"" +msgstr "" + +#: libsrc/iofuncs/dispatch_types.c:600 +#, fuzzy +msgid "bad format" +msgstr "bad colourmap" + +#: libsrc/iofuncs/region.c:124 +#, c-format +msgid "start function failed for image %s" +msgstr "" + +#: libsrc/iofuncs/region.c:437 +msgid "bad image type" +msgstr "" + +#: libsrc/iofuncs/region.c:572 +msgid "bad position" +msgstr "" + +#: libsrc/morphology/im_dilate.c:198 libsrc/morphology/im_erode.c:198 #, c-format msgid "bad mask element (%d should be 0, 128 or 255)" msgstr "" -#: libsrc/morphology/im_erode.c:252 libsrc/morphology/im_dilate.c:256 -#: vips-7.15.1/libsrc/morphology/im_dilate.c:256 -#: vips-7.15.1/libsrc/morphology/im_erode.c:252 +#: libsrc/morphology/im_dilate.c:256 libsrc/morphology/im_erode.c:252 msgid "mask size not odd" msgstr "" -#: libsrc/morphology/im_erode.c:262 -#: vips-7.15.1/libsrc/morphology/im_erode.c:262 -msgid "1-band uchar uncoded only" -msgstr "" - #: libsrc/morphology/im_dilate.c:266 -#: vips-7.15.1/libsrc/morphology/im_dilate.c:266 msgid "uchar uncoded only" msgstr "" +#: libsrc/morphology/im_erode.c:262 +msgid "1-band uchar uncoded only" +msgstr "" + +#: libsrc/mosaicing/im_tbmerge.c:650 libsrc/mosaicing/im_lrmerge.c:826 +msgid "too much overlap" +msgstr "" + +#: libsrc/mosaicing/im_tbmerge.c:671 libsrc/mosaicing/im_lrmerge.c:1070 +msgid "input images incompatible" +msgstr "" + +#: libsrc/mosaicing/im_tbmerge.c:676 libsrc/mosaicing/im_lrmerge.c:1075 +msgid "inputs not uncoded or IM_CODING_LABQ" +msgstr "" + #: libsrc/mosaicing/global_balance.c:146 -#: vips-7.15.1/libsrc/mosaicing/global_balance.c:146 msgid "no matching '>'" msgstr "" #: libsrc/mosaicing/global_balance.c:155 -#: vips-7.15.1/libsrc/mosaicing/global_balance.c:155 msgid "too many items" msgstr "" #: libsrc/mosaicing/global_balance.c:450 -#: vips-7.15.1/libsrc/mosaicing/global_balance.c:450 msgid "circularity detected" msgstr "" #: libsrc/mosaicing/global_balance.c:484 libsrc/mosaicing/global_balance.c:540 -#: vips-7.15.1/libsrc/mosaicing/global_balance.c:484 -#: vips-7.15.1/libsrc/mosaicing/global_balance.c:540 #, c-format msgid "image \"%s\" used twice as output" msgstr "" #: libsrc/mosaicing/global_balance.c:589 -#: vips-7.15.1/libsrc/mosaicing/global_balance.c:589 msgid "bad number of args in join line" msgstr "" #: libsrc/mosaicing/global_balance.c:631 -#: vips-7.15.1/libsrc/mosaicing/global_balance.c:631 msgid "bad number of args in join1 line" msgstr "" #: libsrc/mosaicing/global_balance.c:667 -#: vips-7.15.1/libsrc/mosaicing/global_balance.c:667 msgid "bad number of args in copy line" msgstr "" #: libsrc/mosaicing/global_balance.c:725 -#: vips-7.15.1/libsrc/mosaicing/global_balance.c:725 msgid "" "mosaic root not found in desc file\n" "is this really a mosaiced image?" msgstr "" #: libsrc/mosaicing/global_balance.c:735 -#: vips-7.15.1/libsrc/mosaicing/global_balance.c:735 msgid "more than one root" msgstr "" #: libsrc/mosaicing/global_balance.c:1072 -#: vips-7.15.1/libsrc/mosaicing/global_balance.c:1072 msgid "empty overlap!" msgstr "" -#: libsrc/mosaicing/im_tbmerge.c:650 libsrc/mosaicing/im_lrmerge.c:826 -#: vips-7.15.1/libsrc/mosaicing/im_lrmerge.c:826 -#: vips-7.15.1/libsrc/mosaicing/im_tbmerge.c:650 -msgid "too much overlap" -msgstr "" - -#: libsrc/mosaicing/im_tbmerge.c:671 libsrc/mosaicing/im_lrmerge.c:1070 -#: vips-7.15.1/libsrc/mosaicing/im_lrmerge.c:1070 -#: vips-7.15.1/libsrc/mosaicing/im_tbmerge.c:671 -msgid "input images incompatible" -msgstr "" - -#: libsrc/mosaicing/im_tbmerge.c:676 libsrc/mosaicing/im_lrmerge.c:1075 -#: vips-7.15.1/libsrc/mosaicing/im_lrmerge.c:1075 -#: vips-7.15.1/libsrc/mosaicing/im_tbmerge.c:676 -msgid "inputs not uncoded or IM_CODING_LABQ" -msgstr "" - -#: libsrc/mosaicing/im_lrmerge.c:710 -#: vips-7.15.1/libsrc/mosaicing/im_lrmerge.c:710 -msgid "mwidth must be -1 or >= 0" -msgstr "" - -#: libsrc/mosaicing/im_lrmerge.c:739 -#: vips-7.15.1/libsrc/mosaicing/im_lrmerge.c:739 -msgid "no overlap" -msgstr "" - #: libsrc/mosaicing/im_remosaic.c:79 -#: vips-7.15.1/libsrc/mosaicing/im_remosaic.c:79 #, c-format msgid "file \"%s\" not found" msgstr "" #: libsrc/mosaicing/im_remosaic.c:107 -#: vips-7.15.1/libsrc/mosaicing/im_remosaic.c:107 #, c-format msgid "substitute image \"%s\" is not the same size as \"%s\"" msgstr "" -#: libsrc/relational/im_blend.c:330 -#: vips-7.15.1/libsrc/relational/im_blend.c:330 -msgid "images not uncoded" +#: libsrc/mosaicing/im_lrmerge.c:710 +msgid "mwidth must be -1 or >= 0" msgstr "" -#: libsrc/relational/im_blend.c:336 libsrc/relational/im_ifthenelse.c:186 -#: vips-7.15.1/libsrc/relational/im_ifthenelse.c:186 -#: vips-7.15.1/libsrc/relational/im_blend.c:336 -msgid "size and format of then and else must match" -msgstr "" - -#: libsrc/relational/im_blend.c:341 libsrc/relational/im_ifthenelse.c:191 -#: vips-7.15.1/libsrc/relational/im_ifthenelse.c:191 -#: vips-7.15.1/libsrc/relational/im_blend.c:341 -msgid "conditional image must be uchar" -msgstr "" - -#: libsrc/relational/im_blend.c:346 libsrc/relational/im_ifthenelse.c:196 -#: vips-7.15.1/libsrc/relational/im_ifthenelse.c:196 -#: vips-7.15.1/libsrc/relational/im_blend.c:346 -msgid "conditional image must be one band or same as then and else images" +#: libsrc/mosaicing/im_lrmerge.c:739 +msgid "no overlap" msgstr "" #: libsrc/relational/im_ifthenelse.c:170 -#: vips-7.15.1/libsrc/relational/im_ifthenelse.c:170 msgid "then image must be uncoded or labpack" msgstr "" #: libsrc/relational/im_ifthenelse.c:175 -#: vips-7.15.1/libsrc/relational/im_ifthenelse.c:175 msgid "else image must be uncoded or labpack" msgstr "" #: libsrc/relational/im_ifthenelse.c:180 -#: vips-7.15.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 +msgid "size and format of then and else must match" +msgstr "" + +#: libsrc/relational/im_ifthenelse.c:191 libsrc/relational/im_blend.c:341 +msgid "conditional image must be uchar" +msgstr "" + +#: libsrc/relational/im_ifthenelse.c:196 libsrc/relational/im_blend.c:346 +msgid "conditional image must be one band or same as then and else images" +msgstr "" + +#: libsrc/relational/im_blend.c:330 +msgid "images not uncoded" +msgstr "" + #: libsrc/video/im_video_v4l1.c:246 -#: vips-7.15.1/libsrc/video/im_video_v4l1.c:246 msgid "no file descriptor" msgstr "" #: libsrc/video/im_video_v4l1.c:251 -#: vips-7.15.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.15.1/libsrc/video/im_video_v4l1.c:300 #, c-format msgid "cannot open video device \"%s\"" msgstr "" #: libsrc/video/im_video_v4l1.c:307 -#: vips-7.15.1/libsrc/video/im_video_v4l1.c:307 msgid "cannot get video capability" msgstr "" #: libsrc/video/im_video_v4l1.c:315 -#: vips-7.15.1/libsrc/video/im_video_v4l1.c:315 msgid "card cannot capture to memory" msgstr "" #: libsrc/video/im_video_v4l1.c:461 -#: vips-7.15.1/libsrc/video/im_video_v4l1.c:461 msgid "unable to map memory" msgstr "" #: libsrc/video/im_video_v4l1.c:473 -#: vips-7.15.1/libsrc/video/im_video_v4l1.c:473 #, c-format msgid "channel not between 0 and %d" msgstr "" #: libsrc/video/im_video_v4l1.c:673 -#: vips-7.15.1/libsrc/video/im_video_v4l1.c:673 msgid "compiled without im_video_v4l1 support" msgstr "" -#: libsrc/video/im_video_test.c:45 vips-7.15.1/libsrc/video/im_video_test.c:45 +#: libsrc/video/im_video_test.c:45 msgid "error requested" msgstr "" -#: src/iofuncs/vips.c:81 vips-7.15.1/src/iofuncs/vips.c:81 +#: src/iofuncs/vips.c:83 msgid "list operations in PACKAGE (or \"all\", \"packages\")" msgstr "" -#: src/iofuncs/vips.c:84 vips-7.15.1/src/iofuncs/vips.c:84 +#: src/iofuncs/vips.c:86 msgid "show usage message for OPERATION" msgstr "" -#: src/iofuncs/vips.c:87 vips-7.15.1/src/iofuncs/vips.c:87 +#: src/iofuncs/vips.c:89 msgid "load PLUGIN" msgstr "" -#: src/iofuncs/vips.c:90 vips-7.15.1/src/iofuncs/vips.c:90 +#: src/iofuncs/vips.c:92 msgid "print link lines for all operations" msgstr "" -#: src/iofuncs/vips.c:92 vips-7.15.1/src/iofuncs/vips.c:92 +#: src/iofuncs/vips.c:94 msgid "print C++ decls for PACKAGE (or \"all\")" msgstr "" -#: src/iofuncs/vips.c:95 vips-7.15.1/src/iofuncs/vips.c:95 +#: src/iofuncs/vips.c:97 msgid "print C++ binding for PACKAGE (or \"all\")" msgstr "" -#: src/iofuncs/vips.c:98 vips-7.15.1/src/iofuncs/vips.c:98 +#: src/iofuncs/vips.c:100 msgid "print im_version_string" msgstr "" -#: src/iofuncs/vips.c:141 vips-7.15.1/src/iofuncs/vips.c:141 +#: src/iofuncs/vips.c:143 #, c-format msgid "no package or function \"%s\"" msgstr "" -#: src/iofuncs/vips.c:850 vips-7.15.1/src/iofuncs/vips.c:850 +#: src/iofuncs/vips.c:884 msgid "- VIPS driver program" msgstr "" -#: src/iofuncs/header.c:77 vips-7.15.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.15.1/src/iofuncs/header.c:161 +#: src/iofuncs/header.c:161 msgid "- print image header" msgstr "" -#: src/iofuncs/edvips.c:79 vips-7.15.1/src/iofuncs/edvips.c:79 +#: src/iofuncs/edvips.c:79 msgid "set Xsize to N" msgstr "" -#: src/iofuncs/edvips.c:81 vips-7.15.1/src/iofuncs/edvips.c:81 +#: src/iofuncs/edvips.c:81 msgid "set Ysize to N" msgstr "" -#: src/iofuncs/edvips.c:83 vips-7.15.1/src/iofuncs/edvips.c:83 +#: src/iofuncs/edvips.c:83 msgid "set Bands to N" msgstr "" -#: src/iofuncs/edvips.c:85 vips-7.15.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.15.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.15.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.15.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.15.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.15.1/src/iofuncs/edvips.c:95 +#: src/iofuncs/edvips.c:95 msgid "set Xoffset to N" msgstr "" -#: src/iofuncs/edvips.c:97 vips-7.15.1/src/iofuncs/edvips.c:97 +#: src/iofuncs/edvips.c:97 msgid "set Yoffset to N" msgstr "" -#: src/iofuncs/edvips.c:99 vips-7.15.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.15.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.15.1/src/iofuncs/edvips.c:122 +#: src/iofuncs/edvips.c:122 msgid "unable to start VIPS" msgstr "" -#: src/iofuncs/edvips.c:125 vips-7.15.1/src/iofuncs/edvips.c:125 +#: src/iofuncs/edvips.c:125 msgid "vipsfile - edit vipsfile header" msgstr "" -#: src/iofuncs/edvips.c:137 vips-7.15.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.15.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.15.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.15.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.15.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.15.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.15.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.15.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.15.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.15.1/src/iofuncs/edvips.c:198 +#: src/iofuncs/edvips.c:198 msgid "could not set extension" msgstr "" diff --git a/python/test/bench_pil.py b/python/test/bench_pil.py new file mode 100755 index 00000000..99e7374d --- /dev/null +++ b/python/test/bench_pil.py @@ -0,0 +1,24 @@ +#!/usr/bin/python + +import Image, sys +import ImageFilter + +im = Image.open (sys.argv[1]) + +# Crop 100 pixels off all edges. +im = im.crop ((100, 100, im.size[0] - 100, im.size[1] - 100)) + +# Shrink by 10% +im = im.resize ((int (im.size[0] * 0.9), int (im.size[1] * 0.9)), + Image.BILINEAR) + +# sharpen +filter = ImageFilter.Kernel ((3, 3), + (-1, -1, -1, + -1, 16, -1, + -1, -1, -1)) +im = im.filter (filter) + +# write back again +im.save (sys.argv[2]) + diff --git a/python/test/bench_vips.py b/python/test/bench_vips.py new file mode 100755 index 00000000..cf8e0bc2 --- /dev/null +++ b/python/test/bench_vips.py @@ -0,0 +1,24 @@ +#!/usr/bin/python + +import sys +from vipsCC import * + +im = VImage.VImage (sys.argv[1]) + +# Crop 100 pixels off all edges. +im = im.extract_area (100, 100, im.Xsize() - 200, im.Ysize() - 200) + +# Shrink by 10% +im = im.affine (0.9, 0, 0, 0.9, 0, 0, 0, 0, + int (im.Xsize() * 0.9), int (im.Ysize() * 0.9)) + +# sharpen +mask = VMask.VIMask (3, 3, 8, 0, + [-1, -1, -1, + -1, 16, -1, + -1, -1, -1]) +im = im.conv (mask) + +# write back again +im.write (sys.argv[2]) + diff --git a/python/test/pilvips.py b/python/test/pilvips.py new file mode 100755 index 00000000..4bd62102 --- /dev/null +++ b/python/test/pilvips.py @@ -0,0 +1,37 @@ +#!/usr/bin/python + +import sys + +from vipsCC import * +import Image + +# try this 1,000 times and check for leaks +for i in range (0,1000): + vim = VImage.VImage (sys.argv[1]) + + # do some processing in vips ... cut out a small piece of image + vim = vim.extract_area (500, 500, 100, 100) + + # make a PIL image + # we use Image.frombuffer (), so PIL is using vim's memory + # you need to be very careful not to destroy vim until you're done with pim + # ideally you should make a proxy class that wraps this lifetime problem up + mode = VImage.PIL_mode_from_vips (vim) + size = (vim.Xsize (), vim.Ysize ()) + data = vim.tobuffer () + pim = Image.frombuffer (mode, size, data, 'raw', mode, 0, 1) + + # rotate 12 degrees with PIL + pim = pim.rotate (12, Image.BILINEAR, 1) + + # back to vips again + # PIL doesn't have a tobuffer method, so we have to use tostring to copy the + # data out of PIL and then fromstring to copy back into VIPS + str = pim.tostring () + bands, format, type = VImage.vips_from_PIL_mode (pim.mode) + width, height = pim.size + vim2 = VImage.VImage.fromstring (str, width, height, bands, format) + + # finally write from vips + vim2.write (sys.argv[2]) + diff --git a/python/vipsCC/Makefile.am b/python/vipsCC/Makefile.am index d02d02da..4498c173 100644 --- a/python/vipsCC/Makefile.am +++ b/python/vipsCC/Makefile.am @@ -1,5 +1,5 @@ # Let make substitute the value of PYTHON_INCLUDES rather than auto* -# # this makes it easier to support multiple python installs +# this makes it easier to support multiple python installs INCLUDES = -I${top_srcdir}/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ $(PYTHON_INCLUDES) # we install to a directory inside the python area, since we are a module @@ -44,9 +44,10 @@ vmaskmodule_la_LDFLAGS = -module -avoid-version vmaskmodule_la_LIBADD = ../../libsrcCC/libvipsCC.la $(VIPS_LIBS) nodist_vmaskmodule_la_SOURCES = vmaskmodule.cxx -CLEANFILES = \ - vimagemodule.cxx VImage.h \ +CLEANFILES = VImage.h + +EXTRA_DIST = \ + VImage.i VDisplay.i VError.i VMask.i __init__.py \ + vimagemodule.cxx \ verrormodule.cxx vdisplaymodule.cxx vmaskmodule.cxx \ VImage.py VDisplay.py VError.py VMask.py - -EXTRA_DIST = VImage.i VDisplay.i VError.i VMask.i __init__.py diff --git a/src/iofuncs/Makefile.am b/src/iofuncs/Makefile.am index 4eb3548d..90ae564a 100644 --- a/src/iofuncs/Makefile.am +++ b/src/iofuncs/Makefile.am @@ -17,8 +17,10 @@ INCLUDES = -I${top_srcdir}/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ AM_LDFLAGS = @LDFLAGS@ LDADD = @VIPS_CFLAGS@ ${top_builddir}/libsrc/libvips.la @VIPS_LIBS@ +if ENABLE_LINKS install-exec-hook: ${top_srcdir}/src/scripts/post_install ${DESTDIR}${bindir} +endif uninstall-hook: ${RM} ${bindir}/im_* diff --git a/src/scripts/Makefile.am b/src/scripts/Makefile.am index 382b260a..0fe17500 100644 --- a/src/scripts/Makefile.am +++ b/src/scripts/Makefile.am @@ -4,12 +4,12 @@ bin_SCRIPTS = \ batch_image_convert \ batch_rubber_sheet \ batch_crop \ - vips-7.14 + vips-7.16 noinst_SCRIPTS = post_install EXTRA_DIST = \ - vips-7.14 \ + vips-7.16 \ ${noinst_SCRIPTS} \ light_correct.in \ shrink_width.in \ diff --git a/src/scripts/vips-7.14 b/src/scripts/vips-7.16 similarity index 100% rename from src/scripts/vips-7.14 rename to src/scripts/vips-7.16 diff --git a/vips-7.15.pc.in b/vips-7.16.pc.in similarity index 100% rename from vips-7.15.pc.in rename to vips-7.16.pc.in diff --git a/vips-7.15.spec.in b/vips-7.16.spec.in similarity index 97% rename from vips-7.15.spec.in rename to vips-7.16.spec.in index a471f97b..f4535861 100644 --- a/vips-7.15.spec.in +++ b/vips-7.16.spec.in @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel libtiff-devel zlib-devel fftw-devel lcms-devel BuildRequires: libpng-devel glib2-devel ImageMagick-devel pango-devel -BuildRequires: pkgconfig gettext perl(XML::Parser) +BuildRequires: pkgconfig gettext BuildRequires: libtool python-devel libxml2-devel liboil-devel BuildRequires: OpenEXR-devel libexif-devel swig #Requires: @@ -147,6 +147,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 4 2008 John Cupitt - 7.16.0 +- Removed perl(XML::Parser) from BuildRequires since we no longer use + intltool + * Sat Jul 19 2008 Jesper Friis - 7.15.0-1 - Replaced the distributed spec file with the one in the source rpm package from Fedora to fix issues with harcoding BuildRoot in the diff --git a/vipsCC-7.15.pc.in b/vipsCC-7.16.pc.in similarity index 100% rename from vipsCC-7.15.pc.in rename to vipsCC-7.16.pc.in diff --git a/win32/README b/win32/README deleted file mode 100644 index 3405ac06..00000000 --- a/win32/README +++ /dev/null @@ -1,15 +0,0 @@ -Build files for vips.dll with the MS toolchain - -proj/ - - Build system based on hand-written makefiles for MSVC 6, copy into - vips libsrc area and tweak files before building. No support, sorry. - -tmake/ - - Build system based on trolltech's tmake. - -msvc/ - - A set of project files for visual studio. You'll need to copy them - into the source area and edit them a bit. Version 6 only. diff --git a/win32/msvc/config.h b/win32/msvc/config.h deleted file mode 100644 index 462f91bb..00000000 --- a/win32/msvc/config.h +++ /dev/null @@ -1,243 +0,0 @@ -/* config.h. Generated by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* define to open non-text files in binary mode */ -#define BINARY_OPEN 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DIRECT_H 1 - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#define HAVE_DIRENT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -/* #undef HAVE_DOPRNT */ - -/* Define to 1 if you have the header file. */ -#define HAVE_ERRNO_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define if you have fftw libraries and header files. */ -//#define HAVE_FFTW 1 - -/* Define to 1 if you have the `getcwd' function. */ -#define HAVE_GETCWD 1 - -/* Define to 1 if you have the `getpagesize' function. */ -#define HAVE_GETPAGESIZE 1 - -/* Define to 1 if you have the `gettimeofday' function. */ -/* #undef HAVE_GETTIMEOFDAY */ - -/* Define to 1 if you have the `getwd' function. */ -/* #undef HAVE_GETWD */ - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_IO_H 1 - -/* Define if you have jpeg libraries and header files. */ -#define HAVE_JPEG 1 - -/* Define if you have lcms libraries and header files. */ -//#define HAVE_LCMS 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* define if you have the libMagick libraries and header files. */ -/* #undef HAVE_MAGICK */ - -/* Define to 1 if you have the header file. */ -#define HAVE_MATH_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `memset' function. */ -#define HAVE_MEMSET 1 - -/* Define to 1 if you have the `mkstemp' function. */ -/* #undef HAVE_MKSTEMP */ - -/* Define to 1 if you have the `mktemp' function. */ -#define HAVE_MKTEMP 1 - -/* Define to 1 if you have a working `mmap' system call. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the `munmap' function. */ -/* #undef HAVE_MUNMAP */ - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_NDIR_H */ - -/* Define if you have png libraries and header files. */ -#define HAVE_PNG 1 - -/* Define if you have POSIX threads libraries and header files. */ -//#define HAVE_PTHREAD 1 - -/* have pthread_setconcurrency() */ -//#define HAVE_PTHREAD_SETCONCURRENCY 1 - -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define to 1 if you have the `rand' function. */ -#define HAVE_RAND 1 - -/* Define to 1 if you have the `random' function. */ -/* #undef HAVE_RANDOM */ - -/* Define to 1 if you have the `realpath' function. */ -/* #undef HAVE_REALPATH */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strcasecmp' function. */ -#define HAVE_STRCASECMP 1 - -/* Define to 1 if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - -/* Define to 1 if you have the `strcspn' function. */ -#define HAVE_STRCSPN 1 - -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strrchr' function. */ -#define HAVE_STRRCHR 1 - -/* Define to 1 if you have the `strspn' function. */ -#define HAVE_STRSPN 1 - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define to 1 if you have the header file. */ -//#define HAVE_SYS_FILE_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_IOCTL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MMAN_H */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define to 1 if you have the header file. */ -//#define HAVE_SYS_PARAM_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -//#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define if you have tiff libraries and header files. */ -#define HAVE_TIFF 1 - -/* Define to 1 if you have the header file. */ -//#define HAVE_UNISTD_H 1 - -/* have video4linux 1 */ -/* #undef HAVE_VIDEODEV */ - -/* Define to 1 if you have the `vprintf' function. */ -#define HAVE_VPRINTF 1 - -/* Define to 1 if you have the `vsnprintf' function. */ -#define HAVE_VSNPRINTF 1 -#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) - - - -/* Define to 1 if you have the header file. */ -#define HAVE_WINDOWS_H 1 - -/* Define if you have libz libraries and header files. */ -#define HAVE_ZIP 1 - -/* Name of package */ -#define PACKAGE "vips" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* Define to the necessary symbol if this constant uses a non-standard name on - your system. */ -/* #undef PTHREAD_CREATE_JOINABLE */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Version number of package */ -#define VERSION "7.8.7" - -/* Define if using the dmalloc debugging malloc package */ -/* #undef WITH_DMALLOC */ - -/* Define to 1 if the X Window System is missing or not being used. */ -#define X_DISPLAY_MISSING 1 - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `int' if does not define. */ -#define mode_t int - -/* Define to `long' if does not define. */ -/* #undef off_t */ - -/* Define to `unsigned' if does not define. */ -/* #undef size_t */ - -#define PATH_MAX 512 -#define R_OK 4 diff --git a/win32/msvc/vips.dsp b/win32/msvc/vips.dsp deleted file mode 100644 index 95348017..00000000 --- a/win32/msvc/vips.dsp +++ /dev/null @@ -1,1327 +0,0 @@ -# Microsoft Developer Studio Project File - Name="vips" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=vips - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "vips.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "vips.mak" CFG="vips - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "vips - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "vips - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "vips - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VIPS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VIPS_EXPORTS" /D "HAVE_CONFIG_H" /YX /FD /I./include /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0xc0a /d "NDEBUG" -# ADD RSC /l 0xc0a /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ./lib/libtiff.lib ./lib/jpeg.lib ./lib/libpng.lib ./lib/zlib.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "vips - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VIPS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VIPS_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0xc0a /d "_DEBUG" -# ADD RSC /l 0xc0a /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "vips - Win32 Release" -# Name "vips - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Group "acquire" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\acquire\im_clamp.c -# End Source File -# End Group -# Begin Group "arithmetic" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\arithmetic\arith_dispatch.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_abs.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_add.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_avg.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_ceil.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_cmulnorm.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_costra.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_deviate.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_divide.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_expntra.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_fav4.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_floor.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_gadd.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_gaddim.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_gfadd.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_invert.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_lintra.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_litecor.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_log10tra.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_logtra.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_max.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_maxpos.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_measure.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_min.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_minpos.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_multiply.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_powtra.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_remainder.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_sign.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_sintra.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_stats.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_subtract.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\arithmetic\im_tantra.c -# End Source File -# End Group -# Begin Group "boolean" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\boolean\bool_dispatch.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\boolean\boolean.c -# End Source File -# End Group -# Begin Group "colour" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\colour\colour.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\colour_dispatch.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\derived.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_dE00_fromLab.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_dE_fromLab.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_dECMC_fromLab.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_disp2XYZ.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_icc_transform.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_Lab2LabQ.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_Lab2LabS.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_Lab2LCh.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_Lab2XYZ.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_lab_morph.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_LabQ2disp.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_LabQ2Lab.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_LabQ2LabS.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_LabS2Lab.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_LabS2LabQ.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_LCh2Lab.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_LCh2UCS.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_UCS2LCh.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_XYZ2disp.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_XYZ2Lab.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_XYZ2Yxy.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\colour\im_Yxy2XYZ.c -# End Source File -# End Group -# Begin Group "conversion" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\conversion\conver_dispatch.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_bandjoin.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_bernd.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_black.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_c2amph.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_c2imag.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_c2ps.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_c2real.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_c2rect.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_clip.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_copy.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_extract.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_falsecolour.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_fliphor.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_flipver.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_gbandjoin.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_insert.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_lrjoin.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_magick2vips.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_mask2vips.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_ppm2vips.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_print.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_recomb.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_ri2c.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_rot180.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_rot270.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_rot90.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_scale.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_scaleps.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_slice.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_subsample.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_system.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_tbjoin.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_thresh.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_tiff2vips.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_vips2mask.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_vips2ppm.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_vips2tiff.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\im_zoom.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\vips_jpeg.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\conversion\vips_png.c -# End Source File -# End Group -# Begin Group "convolution" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\convolution\convol_dispatch.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_addgnoise.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_compass.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_conv.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_convf.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_convsep.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_convsepf.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_convsub.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_embed.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_fastcor.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_gaussmasks.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_gaussnoise.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_gradient.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_lindetect.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_logmasks.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_maxvalue.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_mpercent.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_rank.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_resize_linear.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_sharpen.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_shrink.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_spcor.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_stretch3.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\im_zerox.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\rotmask.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\convolution\rw_mask.c -# End Source File -# End Group -# Begin Group "freq_filt" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\freq_filt\fft_sp.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\freq_filt\fmask4th.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\freq_filt\fmaskcir.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\freq_filt\freq_dispatch.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\freq_filt\im_disp_ps.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\freq_filt\im_fractsurf.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\freq_filt\im_freq_mask.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\freq_filt\im_freqflt.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\freq_filt\im_fwfft.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\freq_filt\im_invfft.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\freq_filt\im_invfftr.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\freq_filt\im_rotquad.c -# End Source File -# End Group -# Begin Group "histograms_lut" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\hist_dispatch.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\im_gammacorrect.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\im_heq.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\im_hist.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\im_histeq.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\im_histgr.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\im_histnD.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\im_histplot.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\im_histspec.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\im_hsp.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\im_identity.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\im_invertlut.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\im_lhisteq.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\im_maplut.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\im_stdif.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\histograms_lut\tone.c -# End Source File -# End Group -# Begin Group "inplace" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\inplace\im_circle.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\inplace\im_flood.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\inplace\im_insertplace.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\inplace\im_line.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\inplace\im_paintrect.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\inplace\im_plotmask.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\inplace\inplace_dispatch.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\inplace\line_draw.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\inplace\plot_point.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\inplace\smudge_area.c -# End Source File -# End Group -# Begin Group "iofuncs" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\iofuncs\callback.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\debug.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\dispatch_types.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\error.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\error_exit.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_append_Hist.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_binfile.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_close.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_cp_desc.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_cp_Hist.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_crwrhd.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_debugim.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_demand_hint.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_desc_hd.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_generate.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_guess_prefix.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_header.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_histlin.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_image.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_init.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_initdesc.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_inithd.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_iocheck.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_iterate.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_makerw.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_mapfile.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_open.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_openin.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_openout.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_partial.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_piocheck.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_prepare.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_printdesc.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_printhd.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_printlines.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_readhist.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_setbox.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_setbuf.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_setupout.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_unmapfile.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_updatehist.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_wrapmany.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_wrapone.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\im_writeline.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\list.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\memory.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\package.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\predicate.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\rect.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\region.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\thread.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\threadgroup.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\iofuncs\time.c -# End Source File -# End Group -# Begin Group "matrix" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\matrix\im_invmat.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\matrix\im_matcat.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\matrix\im_matinv.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\matrix\im_matmul.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\matrix\im_mattrn.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\matrix\matalloc.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\matrix\matrix_dispatch.c -# End Source File -# End Group -# Begin Group "morphology" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\morphology\im_cntlines.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\morphology\im_dilate.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\morphology\im_erode.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\morphology\im_profile.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\morphology\morph_dispatch.c -# End Source File -# End Group -# Begin Group "mosaicing" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\mosaicing\global_balance.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\global_balance.h -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\im_affine.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\im_avgdxdy.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\im_chkpair.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\im_clinear.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\im_improve.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\im_initialize.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\im_lrcalcon.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\im_lrmerge.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\im_lrmosaic.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\im_remosaic.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\im_tbcalcon.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\im_tbmerge.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\im_tbmosaic.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\match.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\merge.h -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\mosaic.h -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\mosaic1.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\mosaicing_dispatch.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\mosaicing\similarity.c -# End Source File -# End Group -# Begin Group "other" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\other\cooc_funcs.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\other\glds_funcs.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\other\im_dif_std.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\other\im_eye.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\other\im_grey.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\other\im_meanstd.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\other\im_simcontr.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\other\im_sines.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\other\im_spatres.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\other\im_zone.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\other\other_dispatch.c -# End Source File -# End Group -# Begin Group "relational" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\relational\im_blend.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\relational\im_ifthenelse.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\relational\relational.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\relational\relational_dispatch.c -# End Source File -# End Group -# Begin Group "video" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\libsrc\video\im_video_v4l1.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\video\video_dispatch.c -# End Source File -# End Group -# Begin Source File - -SOURCE=.\libsrc\dummy.c -# End Source File -# Begin Source File - -SOURCE=.\libsrc\vips.def -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Group "vips" - -# PROP Default_Filter ".h" -# Begin Source File - -SOURCE=.\include\vips\colour.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\debug.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\dispatch.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\fmask.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\history.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\list.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\mosaic.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\proto.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\rect.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\region.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\struct.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\thread.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\threadgroup.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\time.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\util.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\version.h -# End Source File -# Begin Source File - -SOURCE=.\include\vips\vips.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\config.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/win32/msvc/vips.dsw b/win32/msvc/vips.dsw deleted file mode 100644 index 2df5c036..00000000 --- a/win32/msvc/vips.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "vips"=.\vips.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/win32/msvc/vips.opt b/win32/msvc/vips.opt deleted file mode 100644 index b0ab0d06..00000000 Binary files a/win32/msvc/vips.opt and /dev/null differ diff --git a/win32/proj/README b/win32/proj/README deleted file mode 100644 index 32841b77..00000000 --- a/win32/proj/README +++ /dev/null @@ -1,3 +0,0 @@ -sample config and makefiles for building with the MSC toolchain - -experts only, no support! diff --git a/win32/proj/config.h.win32 b/win32/proj/config.h.win32 deleted file mode 100644 index 462f91bb..00000000 --- a/win32/proj/config.h.win32 +++ /dev/null @@ -1,243 +0,0 @@ -/* config.h. Generated by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* define to open non-text files in binary mode */ -#define BINARY_OPEN 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DIRECT_H 1 - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#define HAVE_DIRENT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -/* #undef HAVE_DOPRNT */ - -/* Define to 1 if you have the header file. */ -#define HAVE_ERRNO_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define if you have fftw libraries and header files. */ -//#define HAVE_FFTW 1 - -/* Define to 1 if you have the `getcwd' function. */ -#define HAVE_GETCWD 1 - -/* Define to 1 if you have the `getpagesize' function. */ -#define HAVE_GETPAGESIZE 1 - -/* Define to 1 if you have the `gettimeofday' function. */ -/* #undef HAVE_GETTIMEOFDAY */ - -/* Define to 1 if you have the `getwd' function. */ -/* #undef HAVE_GETWD */ - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_IO_H 1 - -/* Define if you have jpeg libraries and header files. */ -#define HAVE_JPEG 1 - -/* Define if you have lcms libraries and header files. */ -//#define HAVE_LCMS 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* define if you have the libMagick libraries and header files. */ -/* #undef HAVE_MAGICK */ - -/* Define to 1 if you have the header file. */ -#define HAVE_MATH_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `memset' function. */ -#define HAVE_MEMSET 1 - -/* Define to 1 if you have the `mkstemp' function. */ -/* #undef HAVE_MKSTEMP */ - -/* Define to 1 if you have the `mktemp' function. */ -#define HAVE_MKTEMP 1 - -/* Define to 1 if you have a working `mmap' system call. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the `munmap' function. */ -/* #undef HAVE_MUNMAP */ - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_NDIR_H */ - -/* Define if you have png libraries and header files. */ -#define HAVE_PNG 1 - -/* Define if you have POSIX threads libraries and header files. */ -//#define HAVE_PTHREAD 1 - -/* have pthread_setconcurrency() */ -//#define HAVE_PTHREAD_SETCONCURRENCY 1 - -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define to 1 if you have the `rand' function. */ -#define HAVE_RAND 1 - -/* Define to 1 if you have the `random' function. */ -/* #undef HAVE_RANDOM */ - -/* Define to 1 if you have the `realpath' function. */ -/* #undef HAVE_REALPATH */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strcasecmp' function. */ -#define HAVE_STRCASECMP 1 - -/* Define to 1 if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - -/* Define to 1 if you have the `strcspn' function. */ -#define HAVE_STRCSPN 1 - -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strrchr' function. */ -#define HAVE_STRRCHR 1 - -/* Define to 1 if you have the `strspn' function. */ -#define HAVE_STRSPN 1 - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define to 1 if you have the header file. */ -//#define HAVE_SYS_FILE_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_IOCTL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MMAN_H */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define to 1 if you have the header file. */ -//#define HAVE_SYS_PARAM_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -//#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define if you have tiff libraries and header files. */ -#define HAVE_TIFF 1 - -/* Define to 1 if you have the header file. */ -//#define HAVE_UNISTD_H 1 - -/* have video4linux 1 */ -/* #undef HAVE_VIDEODEV */ - -/* Define to 1 if you have the `vprintf' function. */ -#define HAVE_VPRINTF 1 - -/* Define to 1 if you have the `vsnprintf' function. */ -#define HAVE_VSNPRINTF 1 -#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) - - - -/* Define to 1 if you have the header file. */ -#define HAVE_WINDOWS_H 1 - -/* Define if you have libz libraries and header files. */ -#define HAVE_ZIP 1 - -/* Name of package */ -#define PACKAGE "vips" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* Define to the necessary symbol if this constant uses a non-standard name on - your system. */ -/* #undef PTHREAD_CREATE_JOINABLE */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Version number of package */ -#define VERSION "7.8.7" - -/* Define if using the dmalloc debugging malloc package */ -/* #undef WITH_DMALLOC */ - -/* Define to 1 if the X Window System is missing or not being used. */ -#define X_DISPLAY_MISSING 1 - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `int' if does not define. */ -#define mode_t int - -/* Define to `long' if does not define. */ -/* #undef off_t */ - -/* Define to `unsigned' if does not define. */ -/* #undef size_t */ - -#define PATH_MAX 512 -#define R_OK 4 diff --git a/win32/proj/libsrc/acquire/makefile.msc b/win32/proj/libsrc/acquire/makefile.msc deleted file mode 100644 index 3d199b2b..00000000 --- a/win32/proj/libsrc/acquire/makefile.msc +++ /dev/null @@ -1,41 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = acquire -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - im_clamp.obj \ - -INCLUDES = \ - -DHAVE_CONFIG_H \ - -I../.. -I$(PRJ_TOP)/include - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/arithmetic/makefile.msc b/win32/proj/libsrc/arithmetic/makefile.msc deleted file mode 100644 index 3991a549..00000000 --- a/win32/proj/libsrc/arithmetic/makefile.msc +++ /dev/null @@ -1,75 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = arithmetic -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - arith_dispatch.obj \ - im_abs.obj \ - im_add.obj \ - im_avg.obj \ - im_cmulnorm.obj \ - im_costra.obj \ - im_deviate.obj \ - im_divide.obj \ - im_ceil.obj \ - im_floor.obj \ - im_expntra.obj \ - im_fav4.obj \ - im_gadd.obj \ - im_gaddim.obj \ - im_gfadd.obj \ - im_invert.obj \ - im_lintra.obj \ - im_litecor.obj \ - im_log10tra.obj \ - im_logtra.obj \ - im_max.obj \ - im_maxpos.obj \ - im_measure.obj \ - im_min.obj \ - im_minpos.obj \ - im_multiply.obj \ - im_powtra.obj \ - im_remainder.obj \ - im_sign.obj \ - im_sintra.obj \ - im_stats.obj \ - im_subtract.obj \ - im_tantra.obj \ - -INCLUDES = \ - -I$(PRJ_TOP) -DHAVE_CONFIG_H \ - -I$(PRJ_TOP)/include - -# @VIPS_CFLAGS@ @VIPS_INCLUDES@ - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/boolean/makefile.msc b/win32/proj/libsrc/boolean/makefile.msc deleted file mode 100644 index bb4b24bf..00000000 --- a/win32/proj/libsrc/boolean/makefile.msc +++ /dev/null @@ -1,42 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = boolean -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -INCLUDES = \ - -I$(PRJ_TOP) -DHAVE_CONFIG_H \ - -I$(PRJ_TOP)/include - -OBJECTS = \ - bool_dispatch.obj \ - boolean.obj \ - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/colour/makefile.msc b/win32/proj/libsrc/colour/makefile.msc deleted file mode 100644 index 9ce4485f..00000000 --- a/win32/proj/libsrc/colour/makefile.msc +++ /dev/null @@ -1,65 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = colour -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - colour.obj \ - colour_dispatch.obj \ - derived.obj \ - im_dE00_fromLab.obj \ - im_icc_transform.obj \ - im_LCh2Lab.obj \ - im_LCh2UCS.obj \ - im_Lab2LCh.obj \ - im_Lab2LabQ.obj \ - im_Lab2LabS.obj \ - im_Lab2XYZ.obj \ - im_LabQ2Lab.obj \ - im_LabQ2LabS.obj \ - im_LabQ2disp.obj \ - im_LabS2LabQ.obj \ - im_LabS2Lab.obj \ - im_lab_morph.obj \ - im_UCS2LCh.obj \ - im_XYZ2Lab.obj \ - im_XYZ2Yxy.obj \ - im_Yxy2XYZ.obj \ - im_XYZ2disp.obj \ - im_dECMC_fromLab.obj \ - im_dE_fromLab.obj \ - im_disp2XYZ.obj \ - -INCLUDES = \ - -I$(PRJ_TOP) -DHAVE_CONFIG_H \ - -I$(PRJ_TOP)/include - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/conversion/makefile.msc b/win32/proj/libsrc/conversion/makefile.msc deleted file mode 100644 index 495e0a86..00000000 --- a/win32/proj/libsrc/conversion/makefile.msc +++ /dev/null @@ -1,84 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = conversion -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -INCLUDES = \ - -DHAVE_CONFIG_H \ - -I../.. -I$(PRJ_TOP)/include \ - $(TIFF_CFLAGS) \ - $(JPEG_CFLAGS) \ - $(PNG_CFLAGS) - -OBJECTS = \ - im_bernd.obj \ - im_vips2tiff.obj \ - im_tiff2vips.obj \ - conver_dispatch.obj \ - im_bandjoin.obj \ - im_black.obj \ - im_c2amph.obj \ - im_c2rect.obj \ - im_c2imag.obj \ - im_c2ps.obj \ - im_c2real.obj \ - im_clip.obj \ - im_copy.obj \ - im_extract.obj \ - im_falsecolour.obj \ - im_fliphor.obj \ - im_flipver.obj \ - im_gbandjoin.obj \ - im_insert.obj \ - im_lrjoin.obj \ - im_magick2vips.obj \ - im_mask2vips.obj \ - im_ppm2vips.obj \ - im_recomb.obj \ - im_ri2c.obj \ - im_rot180.obj \ - im_rot270.obj \ - im_rot90.obj \ - im_scale.obj \ - im_scaleps.obj \ - im_slice.obj \ - im_subsample.obj \ - im_system.obj \ - im_print.obj \ - im_tbjoin.obj \ - im_thresh.obj \ - im_vips2mask.obj \ - im_vips2ppm.obj \ - vips_jpeg.obj \ - im_zoom.obj \ - vips_png.obj \ - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/convolution/makefile.msc b/win32/proj/libsrc/convolution/makefile.msc deleted file mode 100644 index 7d4bc748..00000000 --- a/win32/proj/libsrc/convolution/makefile.msc +++ /dev/null @@ -1,66 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = convolution -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - rotmask.obj \ - rw_mask.obj \ - convol_dispatch.obj \ - im_addgnoise.obj \ - im_compass.obj \ - im_conv.obj \ - im_convf.obj \ - im_convsep.obj \ - im_convsepf.obj \ - im_convsub.obj \ - im_embed.obj \ - im_fastcor.obj \ - im_gaussmasks.obj \ - im_gaussnoise.obj \ - im_gradient.obj \ - im_lindetect.obj \ - im_logmasks.obj \ - im_maxvalue.obj \ - im_mpercent.obj \ - im_rank.obj \ - im_resize_linear.obj \ - im_sharpen.obj \ - im_shrink.obj \ - im_spcor.obj \ - im_stretch3.obj \ - im_zerox.obj \ - -INCLUDES = \ - -DHAVE_CONFIG_H \ - -I../.. -I$(PRJ_TOP)/include - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/freq_filt/makefile.msc b/win32/proj/libsrc/freq_filt/makefile.msc deleted file mode 100644 index 3bb32e43..00000000 --- a/win32/proj/libsrc/freq_filt/makefile.msc +++ /dev/null @@ -1,51 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = freq_filt -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - fft_sp.obj \ - fmask4th.obj \ - fmaskcir.obj \ - freq_dispatch.obj \ - im_disp_ps.obj \ - im_fractsurf.obj \ - im_freq_mask.obj \ - im_freqflt.obj \ - im_fwfft.obj \ - im_invfft.obj \ - im_rotquad.obj \ - -INCLUDES = \ - -DHAVE_CONFIG_H \ - -I../.. -I$(PRJ_TOP)/include - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/histrograms_lut/makefile.msc b/win32/proj/libsrc/histrograms_lut/makefile.msc deleted file mode 100644 index fae4dd43..00000000 --- a/win32/proj/libsrc/histrograms_lut/makefile.msc +++ /dev/null @@ -1,55 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = histograms_lut -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - hist_dispatch.obj \ - im_gammacorrect.obj \ - im_heq.obj \ - im_hist.obj \ - im_histeq.obj \ - im_histgr.obj \ - im_histplot.obj \ - im_histspec.obj \ - im_hsp.obj \ - im_identity.obj \ - im_invertlut.obj \ - im_lhisteq.obj \ - im_maplut.obj \ - im_stdif.obj \ - tone.obj \ - -INCLUDES = \ - -DHAVE_CONFIG_H \ - -I../.. -I$(PRJ_TOP)/include - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/inplace/makefile.msc b/win32/proj/libsrc/inplace/makefile.msc deleted file mode 100644 index 71bc9e7a..00000000 --- a/win32/proj/libsrc/inplace/makefile.msc +++ /dev/null @@ -1,50 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = inplace -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - im_circle.obj \ - im_flood.obj \ - im_insertplace.obj \ - im_line.obj \ - im_paintrect.obj \ - im_plotmask.obj \ - inplace_dispatch.obj \ - line_draw.obj \ - plot_point.obj \ - smudge_area.obj \ - -INCLUDES = \ - -DHAVE_CONFIG_H \ - -I../.. -I$(PRJ_TOP)/include - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/iofuncs/makefile.msc b/win32/proj/libsrc/iofuncs/makefile.msc deleted file mode 100644 index 9d9f8062..00000000 --- a/win32/proj/libsrc/iofuncs/makefile.msc +++ /dev/null @@ -1,97 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = iofuncs -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -INCLUDES = \ - -DHAVE_CONFIG_H \ - -I../.. -I$(PRJ_TOP)/include \ - -DHAVE_DIRENT_H $(DIRENT_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(TIFF_CFLAGS) \ - $(PNG_CFLAGS) - -OBJECTS = \ - callback.obj \ - debug.obj \ - dispatch_types.obj \ - error.obj \ - error_exit.obj \ - im_append_Hist.obj \ - im_binfile.obj \ - im_close.obj \ - im_cp_Hist.obj \ - im_cp_desc.obj \ - im_crwrhd.obj \ - im_debugim.obj \ - im_demand_hint.obj \ - im_desc_hd.obj \ - im_generate.obj \ - im_header.obj \ - im_histlin.obj \ - im_image.obj \ - im_init.obj \ - im_initdesc.obj \ - im_inithd.obj \ - im_iocheck.obj \ - im_iterate.obj \ - im_makerw.obj \ - im_mapfile.obj \ - im_openin.obj \ - im_open.obj \ - im_openout.obj \ - im_partial.obj \ - im_piocheck.obj \ - im_prepare.obj \ - im_printdesc.obj \ - im_printhd.obj \ - im_printlines.obj \ - im_readhist.obj \ - im_setbox.obj \ - im_setbuf.obj \ - im_setupout.obj \ - im_unmapfile.obj \ - im_updatehist.obj \ - im_guess_prefix.obj \ - im_wrapmany.obj \ - im_wrapone.obj \ - im_writeline.obj \ - list.obj \ - memory.obj \ - package.obj \ - predicate.obj \ - region.obj \ - rect.obj \ - thread.obj \ - threadgroup.obj \ - time.obj \ - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/makefile.msc b/win32/proj/libsrc/makefile.msc deleted file mode 100644 index cdae8594..00000000 --- a/win32/proj/libsrc/makefile.msc +++ /dev/null @@ -1,78 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\.. -PRJ_TOP = .. -PACKAGE = vips -PKG_VER = 7.8.7 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -!IFDEF DEBUG -LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt -!ENDIF - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) -SUBDIRS = acquire arithmetic boolean colour conversion convolution freq_filt histograms_lut inplace iofuncs matrix morphology mosaicing other relational video - -sub-all: - for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d - -sub-one: - cd $(THIS) - nmake -nologo -f makefile.msc - cd .. - -PKG_CFLAGS = \ - $(GLIB_CFLAGS) - -PKG_LINK = \ - $(TIFF_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \ - $(GLIB_LIBS) - -OBJECTS = \ - dummy.obj \ - $(libvips_LIBS) - -libvips_LIBS = \ - acquire/acquire.lib \ - arithmetic/arithmetic.lib \ - boolean/boolean.lib \ - colour/colour.lib \ - conversion/conversion.lib \ - convolution/convolution.lib \ - freq_filt/freq_filt.lib \ - histograms_lut/histograms_lut.lib \ - inplace/inplace.lib \ - iofuncs/iofuncs.lib \ - matrix/matrix.lib \ - morphology/morphology.lib \ - mosaicing/mosaicing.lib \ - other/other.lib \ - relational/relational.lib \ - video/video.lib - -all : \ - $(PRJ_TOP)\config.h \ - sub-all \ - $(PACKAGE)-$(PKG_VER).dll - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib \ - $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/matrix/makefile.msc b/win32/proj/libsrc/matrix/makefile.msc deleted file mode 100644 index 9c95e05f..00000000 --- a/win32/proj/libsrc/matrix/makefile.msc +++ /dev/null @@ -1,47 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = matrix -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - im_invmat.obj \ - im_matcat.obj \ - im_matinv.obj \ - im_matmul.obj \ - im_mattrn.obj \ - matalloc.obj \ - matrix_dispatch.obj \ - -INCLUDES = \ - -DHAVE_CONFIG_H \ - -I../.. -I$(PRJ_TOP)/include - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/morphology/makefile.msc b/win32/proj/libsrc/morphology/makefile.msc deleted file mode 100644 index 3862175d..00000000 --- a/win32/proj/libsrc/morphology/makefile.msc +++ /dev/null @@ -1,45 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = morphology -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - im_cntlines.obj \ - im_dilate.obj \ - im_erode.obj \ - morph_dispatch.obj \ - im_profile.obj \ - -INCLUDES = \ - -DHAVE_CONFIG_H \ - -I../.. -I$(PRJ_TOP)/include - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/mosaicing/makefile.msc b/win32/proj/libsrc/mosaicing/makefile.msc deleted file mode 100644 index 773d39ee..00000000 --- a/win32/proj/libsrc/mosaicing/makefile.msc +++ /dev/null @@ -1,58 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = mosaicing -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - im_affine.obj \ - match.obj \ - mosaic1.obj \ - mosaicing_dispatch.obj \ - similarity.obj \ - global_balance.obj \ - im_avgdxdy.obj \ - im_chkpair.obj \ - im_clinear.obj \ - im_improve.obj \ - im_initialize.obj \ - im_lrcalcon.obj \ - im_lrmerge.obj \ - im_lrmosaic.obj \ - im_tbcalcon.obj \ - im_tbmerge.obj \ - im_remosaic.obj \ - im_tbmosaic.obj \ - -INCLUDES = \ - -DHAVE_CONFIG_H \ - -I../.. -I$(PRJ_TOP)/include - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/other/makefile.msc b/win32/proj/libsrc/other/makefile.msc deleted file mode 100644 index fe16671c..00000000 --- a/win32/proj/libsrc/other/makefile.msc +++ /dev/null @@ -1,51 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = other -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - cooc_funcs.obj \ - glds_funcs.obj \ - im_dif_std.obj \ - im_eye.obj \ - im_grey.obj \ - im_meanstd.obj \ - im_simcontr.obj \ - im_sines.obj \ - im_spatres.obj \ - im_zone.obj \ - other_dispatch.obj \ - -INCLUDES = \ - -DHAVE_CONFIG_H \ - -I../.. -I$(PRJ_TOP)/include - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/relational/makefile.msc b/win32/proj/libsrc/relational/makefile.msc deleted file mode 100644 index 8c8face7..00000000 --- a/win32/proj/libsrc/relational/makefile.msc +++ /dev/null @@ -1,44 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = relational -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - im_ifthenelse.obj \ - im_blend.obj \ - relational.obj \ - relational_dispatch.obj \ - -INCLUDES = \ - -DHAVE_CONFIG_H \ - -I../.. -I$(PRJ_TOP)/include - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/libsrc/video/makefile.msc b/win32/proj/libsrc/video/makefile.msc deleted file mode 100644 index 830e787e..00000000 --- a/win32/proj/libsrc/video/makefile.msc +++ /dev/null @@ -1,42 +0,0 @@ -# autogenerated from automake.am with automake.py -TOP = ..\..\.. -PRJ_TOP = ..\.. -PACKAGE = video -PKG_VER = 7.8 -!INCLUDE $(TOP)\glib\build\win32\make.msc - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - video_dispatch.obj \ - im_video_v4l1.obj \ - -INCLUDES = \ - -DHAVE_CONFIG_H \ - -I../.. -I$(PRJ_TOP)/include - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/win32/proj/src/iofuncs/makefile.msc b/win32/proj/src/iofuncs/makefile.msc deleted file mode 100644 index 71c5eb7b..00000000 --- a/win32/proj/src/iofuncs/makefile.msc +++ /dev/null @@ -1,42 +0,0 @@ -TOP = ..\..\.. -PRJ_TOP = ..\.. -PKG_VER = 7.8.7 - -!IFNDEF APP - -APPS = header binfile debugim edvips printlines vips - -sub-all: - for %d in ($(APPS)) do nmake -nologo -f makefile.msc sub-one THIS=%d - -sub-one: - nmake -nologo -f makefile.msc $(THIS).exe APP=$(THIS) OBJ_$(THIS)=1 - - -all : \ - sub-all - -!ELSE -!INCLUDE $(TOP)\glib\build\win32\make.msc - -PACKAGE = $(APP) - -!IFNDEF OBJECTS -OBJECTS = $(APP).obj -!ENDIF - -PKG_CFLAGS = -FImsvc_recommended_pragmas.h \ - $(GLIB_CFLAGS) \ - -I $(PRJ_TOP)\include - -PKG_LINK = $(GLIB_LIBS) \ - $(PRJ_TOP)\libsrc\vips-$(PKG_VER).lib - -$(PACKAGE).exe : $(OBJECTS) - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib \ - $(LDFLAGS) - -CFLAGS = -I. -I$(PRJ_TOP) $(PKG_CFLAGS) -DHAVE_CONFIG_H - -!ENDIF \ No newline at end of file diff --git a/win32/tmake/README b/win32/tmake/README deleted file mode 100644 index ac704046..00000000 --- a/win32/tmake/README +++ /dev/null @@ -1,16 +0,0 @@ -Build system based on trolltech's tmake. Makes a vips.dll on win32. - -Copy the .pro and Makefiles in this area into the main VIPS libsrc tree, -then either use the makefiles already there, (you'll need to edit them), -or install tmake and regenerate them from the .pro files. - - http://www.trolltech.com/download/tmake.html - - tmake todo.pro -o makefile_todo - nmake -f makefile_todo tmake_all - nmake -f makefile_todo all - tmake vips.pro -o Makefile - nmake -f Makefile all - -You might need to edit the .pro files a little as well. - diff --git a/win32/tmake/config.h b/win32/tmake/config.h deleted file mode 100644 index 462f91bb..00000000 --- a/win32/tmake/config.h +++ /dev/null @@ -1,243 +0,0 @@ -/* config.h. Generated by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* define to open non-text files in binary mode */ -#define BINARY_OPEN 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DIRECT_H 1 - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#define HAVE_DIRENT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -/* #undef HAVE_DOPRNT */ - -/* Define to 1 if you have the header file. */ -#define HAVE_ERRNO_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define if you have fftw libraries and header files. */ -//#define HAVE_FFTW 1 - -/* Define to 1 if you have the `getcwd' function. */ -#define HAVE_GETCWD 1 - -/* Define to 1 if you have the `getpagesize' function. */ -#define HAVE_GETPAGESIZE 1 - -/* Define to 1 if you have the `gettimeofday' function. */ -/* #undef HAVE_GETTIMEOFDAY */ - -/* Define to 1 if you have the `getwd' function. */ -/* #undef HAVE_GETWD */ - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_IO_H 1 - -/* Define if you have jpeg libraries and header files. */ -#define HAVE_JPEG 1 - -/* Define if you have lcms libraries and header files. */ -//#define HAVE_LCMS 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* define if you have the libMagick libraries and header files. */ -/* #undef HAVE_MAGICK */ - -/* Define to 1 if you have the header file. */ -#define HAVE_MATH_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `memset' function. */ -#define HAVE_MEMSET 1 - -/* Define to 1 if you have the `mkstemp' function. */ -/* #undef HAVE_MKSTEMP */ - -/* Define to 1 if you have the `mktemp' function. */ -#define HAVE_MKTEMP 1 - -/* Define to 1 if you have a working `mmap' system call. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the `munmap' function. */ -/* #undef HAVE_MUNMAP */ - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_NDIR_H */ - -/* Define if you have png libraries and header files. */ -#define HAVE_PNG 1 - -/* Define if you have POSIX threads libraries and header files. */ -//#define HAVE_PTHREAD 1 - -/* have pthread_setconcurrency() */ -//#define HAVE_PTHREAD_SETCONCURRENCY 1 - -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define to 1 if you have the `rand' function. */ -#define HAVE_RAND 1 - -/* Define to 1 if you have the `random' function. */ -/* #undef HAVE_RANDOM */ - -/* Define to 1 if you have the `realpath' function. */ -/* #undef HAVE_REALPATH */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strcasecmp' function. */ -#define HAVE_STRCASECMP 1 - -/* Define to 1 if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - -/* Define to 1 if you have the `strcspn' function. */ -#define HAVE_STRCSPN 1 - -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strrchr' function. */ -#define HAVE_STRRCHR 1 - -/* Define to 1 if you have the `strspn' function. */ -#define HAVE_STRSPN 1 - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define to 1 if you have the header file. */ -//#define HAVE_SYS_FILE_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_IOCTL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MMAN_H */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define to 1 if you have the header file. */ -//#define HAVE_SYS_PARAM_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -//#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define if you have tiff libraries and header files. */ -#define HAVE_TIFF 1 - -/* Define to 1 if you have the header file. */ -//#define HAVE_UNISTD_H 1 - -/* have video4linux 1 */ -/* #undef HAVE_VIDEODEV */ - -/* Define to 1 if you have the `vprintf' function. */ -#define HAVE_VPRINTF 1 - -/* Define to 1 if you have the `vsnprintf' function. */ -#define HAVE_VSNPRINTF 1 -#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) - - - -/* Define to 1 if you have the header file. */ -#define HAVE_WINDOWS_H 1 - -/* Define if you have libz libraries and header files. */ -#define HAVE_ZIP 1 - -/* Name of package */ -#define PACKAGE "vips" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* Define to the necessary symbol if this constant uses a non-standard name on - your system. */ -/* #undef PTHREAD_CREATE_JOINABLE */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Version number of package */ -#define VERSION "7.8.7" - -/* Define if using the dmalloc debugging malloc package */ -/* #undef WITH_DMALLOC */ - -/* Define to 1 if the X Window System is missing or not being used. */ -#define X_DISPLAY_MISSING 1 - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `int' if does not define. */ -#define mode_t int - -/* Define to `long' if does not define. */ -/* #undef off_t */ - -/* Define to `unsigned' if does not define. */ -/* #undef size_t */ - -#define PATH_MAX 512 -#define R_OK 4 diff --git a/win32/tmake/libsrc/Makefile b/win32/tmake/libsrc/Makefile deleted file mode 100644 index 8b9b6870..00000000 --- a/win32/tmake/libsrc/Makefile +++ /dev/null @@ -1,99 +0,0 @@ -############################################################################# -# Makefile for building vips -# Generated by tmake at 16:03, 2003/06/11 -# Project: vips -# Template: app -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DNO_DEBUG -DESTDIR= ../Release -INCPATH = -I".." -I"..\include" -I"$(QTDIR)\include" -LINK = link -LFLAGS = /NOLOGO /SUBSYSTEM:windows /DLL /DEF:vips.def -LIBS = kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib ..\lib\libjpeg.lib ..\lib\libtiff.lib ..\lib\libpng.lib ..\lib\libz.lib -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\config.h -SOURCES = dummy.c -OBJECTS = dummy.obj \ - $(DESTDIR)/acquire.lib \ - $(DESTDIR)/arithmetic.lib \ - $(DESTDIR)/boolean.lib \ - $(DESTDIR)/colour.lib \ - $(DESTDIR)/conversion.lib \ - $(DESTDIR)/convolution.lib \ - $(DESTDIR)/freq_filt.lib \ - $(DESTDIR)/histograms_lut.lib \ - $(DESTDIR)/inplace.lib \ - $(DESTDIR)/iofuncs.lib \ - $(DESTDIR)/matrix.lib \ - $(DESTDIR)/morphology.lib \ - $(DESTDIR)/mosaicing.lib \ - $(DESTDIR)/other.lib \ - $(DESTDIR)/relational.lib \ - $(DESTDIR)/video.lib \ - -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\Release\vips.dll -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LINK) $(LFLAGS) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) $(LIBS) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: vips.pro - tmake vips.pro -o Makefile - -dist: - $(ZIP) vips.zip vips.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del dummy.obj - -del $(TARGET) - -del vips.lib - -del vips.exp - -####### Compile - -dummy.obj: dummy.c - diff --git a/win32/tmake/libsrc/acquire/Makefile b/win32/tmake/libsrc/acquire/Makefile deleted file mode 100644 index 5dcc7f28..00000000 --- a/win32/tmake/libsrc/acquire/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################# -# Makefile for building acquire -# Generated by tmake at 16:03, 2003/06/11 -# Project: acquire -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = im_clamp.c -OBJECTS = im_clamp.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\acquire.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: acquire.pro - tmake acquire.pro -o Makefile - -dist: - $(ZIP) acquire.zip acquire.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del im_clamp.obj - -del $(TARGET) - -####### Compile - -im_clamp.obj: im_clamp.c - diff --git a/win32/tmake/libsrc/acquire/acquire.pro b/win32/tmake/libsrc/acquire/acquire.pro deleted file mode 100644 index 76304799..00000000 --- a/win32/tmake/libsrc/acquire/acquire.pro +++ /dev/null @@ -1,18 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -TARGET = acquire -SOURCES = im_clamp.c diff --git a/win32/tmake/libsrc/arithmetic/Makefile b/win32/tmake/libsrc/arithmetic/Makefile deleted file mode 100644 index 2aaaffdb..00000000 --- a/win32/tmake/libsrc/arithmetic/Makefile +++ /dev/null @@ -1,237 +0,0 @@ -############################################################################# -# Makefile for building arithmetic -# Generated by tmake at 16:03, 2003/06/11 -# Project: arithmetic -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = arith_dispatch.c \ - im_abs.c \ - im_add.c \ - im_avg.c \ - im_cmulnorm.c \ - im_costra.c \ - im_deviate.c \ - im_divide.c \ - im_ceil.c \ - im_floor.c \ - im_expntra.c \ - im_fav4.c \ - im_gadd.c \ - im_gaddim.c \ - im_gfadd.c \ - im_invert.c \ - im_lintra.c \ - im_litecor.c \ - im_log10tra.c \ - im_logtra.c \ - im_max.c \ - im_maxpos.c \ - im_measure.c \ - im_min.c \ - im_minpos.c \ - im_multiply.c \ - im_powtra.c \ - im_remainder.c \ - im_sign.c \ - im_sintra.c \ - im_stats.c \ - im_subtract.c \ - im_tantra.c -OBJECTS = arith_dispatch.obj \ - im_abs.obj \ - im_add.obj \ - im_avg.obj \ - im_cmulnorm.obj \ - im_costra.obj \ - im_deviate.obj \ - im_divide.obj \ - im_ceil.obj \ - im_floor.obj \ - im_expntra.obj \ - im_fav4.obj \ - im_gadd.obj \ - im_gaddim.obj \ - im_gfadd.obj \ - im_invert.obj \ - im_lintra.obj \ - im_litecor.obj \ - im_log10tra.obj \ - im_logtra.obj \ - im_max.obj \ - im_maxpos.obj \ - im_measure.obj \ - im_min.obj \ - im_minpos.obj \ - im_multiply.obj \ - im_powtra.obj \ - im_remainder.obj \ - im_sign.obj \ - im_sintra.obj \ - im_stats.obj \ - im_subtract.obj \ - im_tantra.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\arithmetic.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: arithmetic.pro - tmake arithmetic.pro -o Makefile - -dist: - $(ZIP) arithmetic.zip arithmetic.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del arith_dispatch.obj - -del im_abs.obj - -del im_add.obj - -del im_avg.obj - -del im_cmulnorm.obj - -del im_costra.obj - -del im_deviate.obj - -del im_divide.obj - -del im_ceil.obj - -del im_floor.obj - -del im_expntra.obj - -del im_fav4.obj - -del im_gadd.obj - -del im_gaddim.obj - -del im_gfadd.obj - -del im_invert.obj - -del im_lintra.obj - -del im_litecor.obj - -del im_log10tra.obj - -del im_logtra.obj - -del im_max.obj - -del im_maxpos.obj - -del im_measure.obj - -del im_min.obj - -del im_minpos.obj - -del im_multiply.obj - -del im_powtra.obj - -del im_remainder.obj - -del im_sign.obj - -del im_sintra.obj - -del im_stats.obj - -del im_subtract.obj - -del im_tantra.obj - -del $(TARGET) - -####### Compile - -arith_dispatch.obj: arith_dispatch.c - -im_abs.obj: im_abs.c - -im_add.obj: im_add.c - -im_avg.obj: im_avg.c - -im_cmulnorm.obj: im_cmulnorm.c - -im_costra.obj: im_costra.c - -im_deviate.obj: im_deviate.c - -im_divide.obj: im_divide.c - -im_ceil.obj: im_ceil.c - -im_floor.obj: im_floor.c - -im_expntra.obj: im_expntra.c - -im_fav4.obj: im_fav4.c - -im_gadd.obj: im_gadd.c - -im_gaddim.obj: im_gaddim.c - -im_gfadd.obj: im_gfadd.c - -im_invert.obj: im_invert.c - -im_lintra.obj: im_lintra.c - -im_litecor.obj: im_litecor.c - -im_log10tra.obj: im_log10tra.c - -im_logtra.obj: im_logtra.c - -im_max.obj: im_max.c - -im_maxpos.obj: im_maxpos.c - -im_measure.obj: im_measure.c - -im_min.obj: im_min.c - -im_minpos.obj: im_minpos.c - -im_multiply.obj: im_multiply.c - -im_powtra.obj: im_powtra.c - -im_remainder.obj: im_remainder.c - -im_sign.obj: im_sign.c - -im_sintra.obj: im_sintra.c - -im_stats.obj: im_stats.c - -im_subtract.obj: im_subtract.c - -im_tantra.obj: im_tantra.c - diff --git a/win32/tmake/libsrc/arithmetic/arithmetic.pro b/win32/tmake/libsrc/arithmetic/arithmetic.pro deleted file mode 100644 index c3052089..00000000 --- a/win32/tmake/libsrc/arithmetic/arithmetic.pro +++ /dev/null @@ -1,51 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - arith_dispatch.c \ - im_abs.c \ - im_add.c \ - im_avg.c \ - im_cmulnorm.c \ - im_costra.c \ - im_deviate.c \ - im_divide.c \ - im_ceil.c \ - im_floor.c \ - im_expntra.c \ - im_fav4.c \ - im_gadd.c \ - im_gaddim.c \ - im_gfadd.c \ - im_invert.c \ - im_lintra.c \ - im_litecor.c \ - im_log10tra.c \ - im_logtra.c \ - im_max.c \ - im_maxpos.c \ - im_measure.c \ - im_min.c \ - im_minpos.c \ - im_multiply.c \ - im_powtra.c \ - im_remainder.c \ - im_sign.c \ - im_sintra.c \ - im_stats.c \ - im_subtract.c \ - im_tantra.c -TARGET = arithmetic diff --git a/win32/tmake/libsrc/boolean/Makefile b/win32/tmake/libsrc/boolean/Makefile deleted file mode 100644 index c7b5f5c2..00000000 --- a/win32/tmake/libsrc/boolean/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -############################################################################# -# Makefile for building boolean -# Generated by tmake at 16:03, 2003/06/11 -# Project: boolean -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = bool_dispatch.c \ - boolean.c -OBJECTS = bool_dispatch.obj \ - boolean.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\boolean.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: boolean.pro - tmake boolean.pro -o Makefile - -dist: - $(ZIP) boolean.zip boolean.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del bool_dispatch.obj - -del boolean.obj - -del $(TARGET) - -####### Compile - -bool_dispatch.obj: bool_dispatch.c - -boolean.obj: boolean.c - diff --git a/win32/tmake/libsrc/boolean/boolean.pro b/win32/tmake/libsrc/boolean/boolean.pro deleted file mode 100644 index ea9e4cdc..00000000 --- a/win32/tmake/libsrc/boolean/boolean.pro +++ /dev/null @@ -1,20 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - bool_dispatch.c \ - boolean.c -TARGET = boolean diff --git a/win32/tmake/libsrc/colour/Makefile b/win32/tmake/libsrc/colour/Makefile deleted file mode 100644 index 7dba2966..00000000 --- a/win32/tmake/libsrc/colour/Makefile +++ /dev/null @@ -1,197 +0,0 @@ -############################################################################# -# Makefile for building colour -# Generated by tmake at 16:03, 2003/06/11 -# Project: colour -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = colour.c \ - colour_dispatch.c \ - derived.c \ - im_icc_transform.c \ - im_LCh2Lab.c \ - im_LCh2UCS.c \ - im_Lab2LCh.c \ - im_Lab2LabQ.c \ - im_Lab2LabS.c \ - im_Lab2XYZ.c \ - im_LabQ2Lab.c \ - im_LabQ2LabS.c \ - im_LabQ2disp.c \ - im_LabS2LabQ.c \ - im_LabS2Lab.c \ - im_lab_morph.c \ - im_UCS2LCh.c \ - im_XYZ2Lab.c \ - im_XYZ2Yxy.c \ - im_Yxy2XYZ.c \ - im_XYZ2disp.c \ - im_dE00_fromLab.c \ - im_dECMC_fromLab.c \ - im_dE_fromLab.c \ - im_disp2XYZ.c -OBJECTS = colour.obj \ - colour_dispatch.obj \ - derived.obj \ - im_icc_transform.obj \ - im_LCh2Lab.obj \ - im_LCh2UCS.obj \ - im_Lab2LCh.obj \ - im_Lab2LabQ.obj \ - im_Lab2LabS.obj \ - im_Lab2XYZ.obj \ - im_LabQ2Lab.obj \ - im_LabQ2LabS.obj \ - im_LabQ2disp.obj \ - im_LabS2LabQ.obj \ - im_LabS2Lab.obj \ - im_lab_morph.obj \ - im_UCS2LCh.obj \ - im_XYZ2Lab.obj \ - im_XYZ2Yxy.obj \ - im_Yxy2XYZ.obj \ - im_XYZ2disp.obj \ - im_dE00_fromLab.obj \ - im_dECMC_fromLab.obj \ - im_dE_fromLab.obj \ - im_disp2XYZ.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\colour.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: colour.pro - tmake colour.pro -o Makefile - -dist: - $(ZIP) colour.zip colour.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del colour.obj - -del colour_dispatch.obj - -del derived.obj - -del im_icc_transform.obj - -del im_LCh2Lab.obj - -del im_LCh2UCS.obj - -del im_Lab2LCh.obj - -del im_Lab2LabQ.obj - -del im_Lab2LabS.obj - -del im_Lab2XYZ.obj - -del im_LabQ2Lab.obj - -del im_LabQ2LabS.obj - -del im_LabQ2disp.obj - -del im_LabS2LabQ.obj - -del im_LabS2Lab.obj - -del im_lab_morph.obj - -del im_UCS2LCh.obj - -del im_XYZ2Lab.obj - -del im_XYZ2Yxy.obj - -del im_Yxy2XYZ.obj - -del im_XYZ2disp.obj - -del im_dE00_fromLab.obj - -del im_dECMC_fromLab.obj - -del im_dE_fromLab.obj - -del im_disp2XYZ.obj - -del $(TARGET) - -####### Compile - -colour.obj: colour.c - -colour_dispatch.obj: colour_dispatch.c - -derived.obj: derived.c - -im_icc_transform.obj: im_icc_transform.c - -im_LCh2Lab.obj: im_LCh2Lab.c - -im_LCh2UCS.obj: im_LCh2UCS.c - -im_Lab2LCh.obj: im_Lab2LCh.c - -im_Lab2LabQ.obj: im_Lab2LabQ.c - -im_Lab2LabS.obj: im_Lab2LabS.c - -im_Lab2XYZ.obj: im_Lab2XYZ.c - -im_LabQ2Lab.obj: im_LabQ2Lab.c - -im_LabQ2LabS.obj: im_LabQ2LabS.c - -im_LabQ2disp.obj: im_LabQ2disp.c - -im_LabS2LabQ.obj: im_LabS2LabQ.c - -im_LabS2Lab.obj: im_LabS2Lab.c - -im_lab_morph.obj: im_lab_morph.c - -im_UCS2LCh.obj: im_UCS2LCh.c - -im_XYZ2Lab.obj: im_XYZ2Lab.c - -im_XYZ2Yxy.obj: im_XYZ2Yxy.c - -im_Yxy2XYZ.obj: im_Yxy2XYZ.c - -im_XYZ2disp.obj: im_XYZ2disp.c - -im_dE00_fromLab.obj: im_dE00_fromLab.c - -im_dECMC_fromLab.obj: im_dECMC_fromLab.c - -im_dE_fromLab.obj: im_dE_fromLab.c - -im_disp2XYZ.obj: im_disp2XYZ.c - diff --git a/win32/tmake/libsrc/colour/colour.pro b/win32/tmake/libsrc/colour/colour.pro deleted file mode 100644 index 6f590679..00000000 --- a/win32/tmake/libsrc/colour/colour.pro +++ /dev/null @@ -1,43 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - colour.c \ - colour_dispatch.c \ - derived.c \ - im_icc_transform.c \ - im_LCh2Lab.c \ - im_LCh2UCS.c \ - im_Lab2LCh.c \ - im_Lab2LabQ.c \ - im_Lab2LabS.c \ - im_Lab2XYZ.c \ - im_LabQ2Lab.c \ - im_LabQ2LabS.c \ - im_LabQ2disp.c \ - im_LabS2LabQ.c \ - im_LabS2Lab.c \ - im_lab_morph.c \ - im_UCS2LCh.c \ - im_XYZ2Lab.c \ - im_XYZ2Yxy.c \ - im_Yxy2XYZ.c \ - im_XYZ2disp.c \ - im_dE00_fromLab.c \ - im_dECMC_fromLab.c \ - im_dE_fromLab.c \ - im_disp2XYZ.c -TARGET = colour diff --git a/win32/tmake/libsrc/conversion/Makefile b/win32/tmake/libsrc/conversion/Makefile deleted file mode 100644 index dc886880..00000000 --- a/win32/tmake/libsrc/conversion/Makefile +++ /dev/null @@ -1,277 +0,0 @@ -############################################################################# -# Makefile for building conversion -# Generated by tmake at 16:03, 2003/06/11 -# Project: conversion -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = im_bernd.c \ - im_vips2tiff.c \ - im_tiff2vips.c \ - conver_dispatch.c \ - im_bandjoin.c \ - im_black.c \ - im_c2amph.c \ - im_c2rect.c \ - im_c2imag.c \ - im_c2ps.c \ - im_c2real.c \ - im_clip.c \ - im_copy.c \ - im_extract.c \ - im_falsecolour.c \ - im_fliphor.c \ - im_flipver.c \ - im_gbandjoin.c \ - im_insert.c \ - im_lrjoin.c \ - im_magick2vips.c \ - im_mask2vips.c \ - im_ppm2vips.c \ - im_recomb.c \ - im_ri2c.c \ - im_rot180.c \ - im_rot270.c \ - im_rot90.c \ - im_scale.c \ - im_scaleps.c \ - im_slice.c \ - im_subsample.c \ - im_system.c \ - im_print.c \ - im_tbjoin.c \ - im_thresh.c \ - im_vips2mask.c \ - im_vips2ppm.c \ - vips_jpeg.c \ - vips_png.c \ - im_zoom.c -OBJECTS = im_bernd.obj \ - im_vips2tiff.obj \ - im_tiff2vips.obj \ - conver_dispatch.obj \ - im_bandjoin.obj \ - im_black.obj \ - im_c2amph.obj \ - im_c2rect.obj \ - im_c2imag.obj \ - im_c2ps.obj \ - im_c2real.obj \ - im_clip.obj \ - im_copy.obj \ - im_extract.obj \ - im_falsecolour.obj \ - im_fliphor.obj \ - im_flipver.obj \ - im_gbandjoin.obj \ - im_insert.obj \ - im_lrjoin.obj \ - im_magick2vips.obj \ - im_mask2vips.obj \ - im_ppm2vips.obj \ - im_recomb.obj \ - im_ri2c.obj \ - im_rot180.obj \ - im_rot270.obj \ - im_rot90.obj \ - im_scale.obj \ - im_scaleps.obj \ - im_slice.obj \ - im_subsample.obj \ - im_system.obj \ - im_print.obj \ - im_tbjoin.obj \ - im_thresh.obj \ - im_vips2mask.obj \ - im_vips2ppm.obj \ - vips_jpeg.obj \ - vips_png.obj \ - im_zoom.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\conversion.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: conversion.pro - tmake conversion.pro -o Makefile - -dist: - $(ZIP) conversion.zip conversion.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del im_bernd.obj - -del im_vips2tiff.obj - -del im_tiff2vips.obj - -del conver_dispatch.obj - -del im_bandjoin.obj - -del im_black.obj - -del im_c2amph.obj - -del im_c2rect.obj - -del im_c2imag.obj - -del im_c2ps.obj - -del im_c2real.obj - -del im_clip.obj - -del im_copy.obj - -del im_extract.obj - -del im_falsecolour.obj - -del im_fliphor.obj - -del im_flipver.obj - -del im_gbandjoin.obj - -del im_insert.obj - -del im_lrjoin.obj - -del im_magick2vips.obj - -del im_mask2vips.obj - -del im_ppm2vips.obj - -del im_recomb.obj - -del im_ri2c.obj - -del im_rot180.obj - -del im_rot270.obj - -del im_rot90.obj - -del im_scale.obj - -del im_scaleps.obj - -del im_slice.obj - -del im_subsample.obj - -del im_system.obj - -del im_print.obj - -del im_tbjoin.obj - -del im_thresh.obj - -del im_vips2mask.obj - -del im_vips2ppm.obj - -del vips_jpeg.obj - -del vips_png.obj - -del im_zoom.obj - -del $(TARGET) - -####### Compile - -im_bernd.obj: im_bernd.c - -im_vips2tiff.obj: im_vips2tiff.c - -im_tiff2vips.obj: im_tiff2vips.c - -conver_dispatch.obj: conver_dispatch.c - -im_bandjoin.obj: im_bandjoin.c - -im_black.obj: im_black.c - -im_c2amph.obj: im_c2amph.c - -im_c2rect.obj: im_c2rect.c - -im_c2imag.obj: im_c2imag.c - -im_c2ps.obj: im_c2ps.c - -im_c2real.obj: im_c2real.c - -im_clip.obj: im_clip.c - -im_copy.obj: im_copy.c - -im_extract.obj: im_extract.c - -im_falsecolour.obj: im_falsecolour.c - -im_fliphor.obj: im_fliphor.c - -im_flipver.obj: im_flipver.c - -im_gbandjoin.obj: im_gbandjoin.c - -im_insert.obj: im_insert.c - -im_lrjoin.obj: im_lrjoin.c - -im_magick2vips.obj: im_magick2vips.c - -im_mask2vips.obj: im_mask2vips.c - -im_ppm2vips.obj: im_ppm2vips.c - -im_recomb.obj: im_recomb.c - -im_ri2c.obj: im_ri2c.c - -im_rot180.obj: im_rot180.c - -im_rot270.obj: im_rot270.c - -im_rot90.obj: im_rot90.c - -im_scale.obj: im_scale.c - -im_scaleps.obj: im_scaleps.c - -im_slice.obj: im_slice.c - -im_subsample.obj: im_subsample.c - -im_system.obj: im_system.c - -im_print.obj: im_print.c - -im_tbjoin.obj: im_tbjoin.c - -im_thresh.obj: im_thresh.c - -im_vips2mask.obj: im_vips2mask.c - -im_vips2ppm.obj: im_vips2ppm.c - -vips_jpeg.obj: vips_jpeg.c - -vips_png.obj: vips_png.c - -im_zoom.obj: im_zoom.c - diff --git a/win32/tmake/libsrc/conversion/conversion.pro b/win32/tmake/libsrc/conversion/conversion.pro deleted file mode 100644 index 6bebb88d..00000000 --- a/win32/tmake/libsrc/conversion/conversion.pro +++ /dev/null @@ -1,60 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - im_bernd.c \ - im_vips2tiff.c \ - im_tiff2vips.c \ - conver_dispatch.c \ - im_bandjoin.c \ - im_black.c \ - im_c2amph.c \ - im_c2rect.c \ - im_c2imag.c \ - im_c2ps.c \ - im_c2real.c \ - im_clip.c \ - im_copy.c \ - im_extract.c \ - im_falsecolour.c \ - im_fliphor.c \ - im_flipver.c \ - im_gbandjoin.c \ - im_insert.c \ - im_lrjoin.c \ - im_magick2vips.c \ - im_mask2vips.c \ - im_ppm2vips.c \ - im_recomb.c \ - im_ri2c.c \ - im_rot180.c \ - im_rot270.c \ - im_rot90.c \ - im_scale.c \ - im_scaleps.c \ - im_slice.c \ - im_subsample.c \ - im_system.c \ - im_print.c \ - im_tbjoin.c \ - im_thresh.c \ - im_vips2mask.c \ - im_vips2ppm.c \ - vips_jpeg.c \ - vips_png.c \ - im_zoom.c -TARGET = conversion - diff --git a/win32/tmake/libsrc/convolution/Makefile b/win32/tmake/libsrc/convolution/Makefile deleted file mode 100644 index 2c5c76b0..00000000 --- a/win32/tmake/libsrc/convolution/Makefile +++ /dev/null @@ -1,202 +0,0 @@ -############################################################################# -# Makefile for building convolution -# Generated by tmake at 16:03, 2003/06/11 -# Project: convolution -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = rotmask.c \ - rw_mask.c \ - convol_dispatch.c \ - im_addgnoise.c \ - im_compass.c \ - im_conv.c \ - im_convf.c \ - im_convsep.c \ - im_convsepf.c \ - im_convsub.c \ - im_embed.c \ - im_fastcor.c \ - im_gaussmasks.c \ - im_gaussnoise.c \ - im_gradient.c \ - im_lindetect.c \ - im_logmasks.c \ - im_maxvalue.c \ - im_mpercent.c \ - im_rank.c \ - im_resize_linear.c \ - im_sharpen.c \ - im_shrink.c \ - im_spcor.c \ - im_stretch3.c \ - im_zerox.c -OBJECTS = rotmask.obj \ - rw_mask.obj \ - convol_dispatch.obj \ - im_addgnoise.obj \ - im_compass.obj \ - im_conv.obj \ - im_convf.obj \ - im_convsep.obj \ - im_convsepf.obj \ - im_convsub.obj \ - im_embed.obj \ - im_fastcor.obj \ - im_gaussmasks.obj \ - im_gaussnoise.obj \ - im_gradient.obj \ - im_lindetect.obj \ - im_logmasks.obj \ - im_maxvalue.obj \ - im_mpercent.obj \ - im_rank.obj \ - im_resize_linear.obj \ - im_sharpen.obj \ - im_shrink.obj \ - im_spcor.obj \ - im_stretch3.obj \ - im_zerox.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\convolution.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: convolution.pro - tmake convolution.pro -o Makefile - -dist: - $(ZIP) convolution.zip convolution.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del rotmask.obj - -del rw_mask.obj - -del convol_dispatch.obj - -del im_addgnoise.obj - -del im_compass.obj - -del im_conv.obj - -del im_convf.obj - -del im_convsep.obj - -del im_convsepf.obj - -del im_convsub.obj - -del im_embed.obj - -del im_fastcor.obj - -del im_gaussmasks.obj - -del im_gaussnoise.obj - -del im_gradient.obj - -del im_lindetect.obj - -del im_logmasks.obj - -del im_maxvalue.obj - -del im_mpercent.obj - -del im_rank.obj - -del im_resize_linear.obj - -del im_sharpen.obj - -del im_shrink.obj - -del im_spcor.obj - -del im_stretch3.obj - -del im_zerox.obj - -del $(TARGET) - -####### Compile - -rotmask.obj: rotmask.c - -rw_mask.obj: rw_mask.c - -convol_dispatch.obj: convol_dispatch.c - -im_addgnoise.obj: im_addgnoise.c - -im_compass.obj: im_compass.c - -im_conv.obj: im_conv.c - -im_convf.obj: im_convf.c - -im_convsep.obj: im_convsep.c - -im_convsepf.obj: im_convsepf.c - -im_convsub.obj: im_convsub.c - -im_embed.obj: im_embed.c - -im_fastcor.obj: im_fastcor.c - -im_gaussmasks.obj: im_gaussmasks.c - -im_gaussnoise.obj: im_gaussnoise.c - -im_gradient.obj: im_gradient.c - -im_lindetect.obj: im_lindetect.c - -im_logmasks.obj: im_logmasks.c - -im_maxvalue.obj: im_maxvalue.c - -im_mpercent.obj: im_mpercent.c - -im_rank.obj: im_rank.c - -im_resize_linear.obj: im_resize_linear.c - -im_sharpen.obj: im_sharpen.c - -im_shrink.obj: im_shrink.c - -im_spcor.obj: im_spcor.c - -im_stretch3.obj: im_stretch3.c - -im_zerox.obj: im_zerox.c - diff --git a/win32/tmake/libsrc/convolution/convolution.pro b/win32/tmake/libsrc/convolution/convolution.pro deleted file mode 100644 index d93463f4..00000000 --- a/win32/tmake/libsrc/convolution/convolution.pro +++ /dev/null @@ -1,45 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - rotmask.c \ - rw_mask.c \ - convol_dispatch.c \ - im_addgnoise.c \ - im_compass.c \ - im_conv.c \ - im_convf.c \ - im_convsep.c \ - im_convsepf.c \ - im_convsub.c \ - im_embed.c \ - im_fastcor.c \ - im_gaussmasks.c \ - im_gaussnoise.c \ - im_gradient.c \ - im_lindetect.c \ - im_logmasks.c \ - im_maxvalue.c \ - im_mpercent.c \ - im_rank.c \ - im_resize_linear.c \ - im_sharpen.c \ - im_shrink.c \ - im_spcor.c \ - im_stretch3.c \ - im_zerox.c -TARGET = convolution - diff --git a/win32/tmake/libsrc/freq_filt/Makefile b/win32/tmake/libsrc/freq_filt/Makefile deleted file mode 100644 index f519153e..00000000 --- a/win32/tmake/libsrc/freq_filt/Makefile +++ /dev/null @@ -1,132 +0,0 @@ -############################################################################# -# Makefile for building freq_filt -# Generated by tmake at 16:03, 2003/06/11 -# Project: freq_filt -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = fft_sp.c \ - fmask4th.c \ - fmaskcir.c \ - freq_dispatch.c \ - im_disp_ps.c \ - im_fractsurf.c \ - im_freq_mask.c \ - im_freqflt.c \ - im_fwfft.c \ - im_invfft.c \ - im_invfftr.c \ - im_rotquad.c -OBJECTS = fft_sp.obj \ - fmask4th.obj \ - fmaskcir.obj \ - freq_dispatch.obj \ - im_disp_ps.obj \ - im_fractsurf.obj \ - im_freq_mask.obj \ - im_freqflt.obj \ - im_fwfft.obj \ - im_invfft.obj \ - im_invfftr.obj \ - im_rotquad.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\freq_filt.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: freq_filt.pro - tmake freq_filt.pro -o Makefile - -dist: - $(ZIP) freq_filt.zip freq_filt.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del fft_sp.obj - -del fmask4th.obj - -del fmaskcir.obj - -del freq_dispatch.obj - -del im_disp_ps.obj - -del im_fractsurf.obj - -del im_freq_mask.obj - -del im_freqflt.obj - -del im_fwfft.obj - -del im_invfft.obj - -del im_invfftr.obj - -del im_rotquad.obj - -del $(TARGET) - -####### Compile - -fft_sp.obj: fft_sp.c - -fmask4th.obj: fmask4th.c - -fmaskcir.obj: fmaskcir.c - -freq_dispatch.obj: freq_dispatch.c - -im_disp_ps.obj: im_disp_ps.c - -im_fractsurf.obj: im_fractsurf.c - -im_freq_mask.obj: im_freq_mask.c - -im_freqflt.obj: im_freqflt.c - -im_fwfft.obj: im_fwfft.c - -im_invfft.obj: im_invfft.c - -im_invfftr.obj: im_invfftr.c - -im_rotquad.obj: im_rotquad.c - diff --git a/win32/tmake/libsrc/freq_filt/freq_filt.pro b/win32/tmake/libsrc/freq_filt/freq_filt.pro deleted file mode 100644 index 0b6fa30e..00000000 --- a/win32/tmake/libsrc/freq_filt/freq_filt.pro +++ /dev/null @@ -1,31 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - fft_sp.c \ - fmask4th.c \ - fmaskcir.c \ - freq_dispatch.c \ - im_disp_ps.c \ - im_fractsurf.c \ - im_freq_mask.c \ - im_freqflt.c \ - im_fwfft.c \ - im_invfft.c \ - im_invfftr.c \ - im_rotquad.c -TARGET = freq_filt - diff --git a/win32/tmake/libsrc/histograms_lut/Makefile b/win32/tmake/libsrc/histograms_lut/Makefile deleted file mode 100644 index c72093d8..00000000 --- a/win32/tmake/libsrc/histograms_lut/Makefile +++ /dev/null @@ -1,147 +0,0 @@ -############################################################################# -# Makefile for building histograms_lut -# Generated by tmake at 16:03, 2003/06/11 -# Project: histograms_lut -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = hist_dispatch.c \ - im_gammacorrect.c \ - im_heq.c \ - im_hist.c \ - im_histeq.c \ - im_histgr.c \ - im_histplot.c \ - im_histspec.c \ - im_hsp.c \ - im_identity.c \ - im_invertlut.c \ - im_lhisteq.c \ - im_maplut.c \ - im_stdif.c \ - tone.c -OBJECTS = hist_dispatch.obj \ - im_gammacorrect.obj \ - im_heq.obj \ - im_hist.obj \ - im_histeq.obj \ - im_histgr.obj \ - im_histplot.obj \ - im_histspec.obj \ - im_hsp.obj \ - im_identity.obj \ - im_invertlut.obj \ - im_lhisteq.obj \ - im_maplut.obj \ - im_stdif.obj \ - tone.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\histograms_lut.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: histograms_lut.pro - tmake histograms_lut.pro -o Makefile - -dist: - $(ZIP) histograms_lut.zip histograms_lut.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del hist_dispatch.obj - -del im_gammacorrect.obj - -del im_heq.obj - -del im_hist.obj - -del im_histeq.obj - -del im_histgr.obj - -del im_histplot.obj - -del im_histspec.obj - -del im_hsp.obj - -del im_identity.obj - -del im_invertlut.obj - -del im_lhisteq.obj - -del im_maplut.obj - -del im_stdif.obj - -del tone.obj - -del $(TARGET) - -####### Compile - -hist_dispatch.obj: hist_dispatch.c - -im_gammacorrect.obj: im_gammacorrect.c - -im_heq.obj: im_heq.c - -im_hist.obj: im_hist.c - -im_histeq.obj: im_histeq.c - -im_histgr.obj: im_histgr.c - -im_histplot.obj: im_histplot.c - -im_histspec.obj: im_histspec.c - -im_hsp.obj: im_hsp.c - -im_identity.obj: im_identity.c - -im_invertlut.obj: im_invertlut.c - -im_lhisteq.obj: im_lhisteq.c - -im_maplut.obj: im_maplut.c - -im_stdif.obj: im_stdif.c - -tone.obj: tone.c - diff --git a/win32/tmake/libsrc/histograms_lut/histograms_lut.pro b/win32/tmake/libsrc/histograms_lut/histograms_lut.pro deleted file mode 100644 index 98355189..00000000 --- a/win32/tmake/libsrc/histograms_lut/histograms_lut.pro +++ /dev/null @@ -1,34 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - hist_dispatch.c \ - im_gammacorrect.c \ - im_heq.c \ - im_hist.c \ - im_histeq.c \ - im_histgr.c \ - im_histnD.c \ - im_histplot.c \ - im_histspec.c \ - im_hsp.c \ - im_identity.c \ - im_invertlut.c \ - im_lhisteq.c \ - im_maplut.c \ - im_stdif.c \ - tone.c -TARGET = histograms_lut diff --git a/win32/tmake/libsrc/inplace/Makefile b/win32/tmake/libsrc/inplace/Makefile deleted file mode 100644 index d89859a2..00000000 --- a/win32/tmake/libsrc/inplace/Makefile +++ /dev/null @@ -1,122 +0,0 @@ -############################################################################# -# Makefile for building inplace -# Generated by tmake at 16:03, 2003/06/11 -# Project: inplace -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = im_circle.c \ - im_flood.c \ - im_insertplace.c \ - im_line.c \ - im_paintrect.c \ - im_plotmask.c \ - inplace_dispatch.c \ - line_draw.c \ - plot_point.c \ - smudge_area.c -OBJECTS = im_circle.obj \ - im_flood.obj \ - im_insertplace.obj \ - im_line.obj \ - im_paintrect.obj \ - im_plotmask.obj \ - inplace_dispatch.obj \ - line_draw.obj \ - plot_point.obj \ - smudge_area.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\inplace.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: inplace.pro - tmake inplace.pro -o Makefile - -dist: - $(ZIP) inplace.zip inplace.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del im_circle.obj - -del im_flood.obj - -del im_insertplace.obj - -del im_line.obj - -del im_paintrect.obj - -del im_plotmask.obj - -del inplace_dispatch.obj - -del line_draw.obj - -del plot_point.obj - -del smudge_area.obj - -del $(TARGET) - -####### Compile - -im_circle.obj: im_circle.c - -im_flood.obj: im_flood.c - -im_insertplace.obj: im_insertplace.c - -im_line.obj: im_line.c - -im_paintrect.obj: im_paintrect.c - -im_plotmask.obj: im_plotmask.c - -inplace_dispatch.obj: inplace_dispatch.c - -line_draw.obj: line_draw.c - -plot_point.obj: plot_point.c - -smudge_area.obj: smudge_area.c - diff --git a/win32/tmake/libsrc/inplace/inplace.pro b/win32/tmake/libsrc/inplace/inplace.pro deleted file mode 100644 index 4718cacd..00000000 --- a/win32/tmake/libsrc/inplace/inplace.pro +++ /dev/null @@ -1,28 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - im_circle.c \ - im_flood.c \ - im_insertplace.c \ - im_line.c \ - im_paintrect.c \ - im_plotmask.c \ - inplace_dispatch.c \ - line_draw.c \ - plot_point.c \ - smudge_area.c -TARGET = inplace diff --git a/win32/tmake/libsrc/iofuncs/Makefile b/win32/tmake/libsrc/iofuncs/Makefile deleted file mode 100644 index 322e9bd7..00000000 --- a/win32/tmake/libsrc/iofuncs/Makefile +++ /dev/null @@ -1,337 +0,0 @@ -############################################################################# -# Makefile for building iofuncs -# Generated by tmake at 16:03, 2003/06/11 -# Project: iofuncs -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = callback.c \ - debug.c \ - dispatch_types.c \ - error.c \ - error_exit.c \ - im_append_Hist.c \ - im_binfile.c \ - im_close.c \ - im_cp_Hist.c \ - im_cp_desc.c \ - im_crwrhd.c \ - im_debugim.c \ - im_demand_hint.c \ - im_desc_hd.c \ - im_generate.c \ - im_header.c \ - im_histlin.c \ - im_image.c \ - im_init.c \ - im_initdesc.c \ - im_inithd.c \ - im_iocheck.c \ - im_iterate.c \ - im_makerw.c \ - im_mapfile.c \ - im_openin.c \ - im_open.c \ - im_openout.c \ - im_partial.c \ - im_piocheck.c \ - im_prepare.c \ - im_printdesc.c \ - im_printhd.c \ - im_printlines.c \ - im_readhist.c \ - im_setbox.c \ - im_setbuf.c \ - im_setupout.c \ - im_unmapfile.c \ - im_updatehist.c \ - im_guess_prefix.c \ - im_wrapmany.c \ - im_wrapone.c \ - im_writeline.c \ - list.c \ - memory.c \ - package.c \ - predicate.c \ - region.c \ - rect.c \ - thread.c \ - threadgroup.c \ - time.c -OBJECTS = callback.obj \ - debug.obj \ - dispatch_types.obj \ - error.obj \ - error_exit.obj \ - im_append_Hist.obj \ - im_binfile.obj \ - im_close.obj \ - im_cp_Hist.obj \ - im_cp_desc.obj \ - im_crwrhd.obj \ - im_debugim.obj \ - im_demand_hint.obj \ - im_desc_hd.obj \ - im_generate.obj \ - im_header.obj \ - im_histlin.obj \ - im_image.obj \ - im_init.obj \ - im_initdesc.obj \ - im_inithd.obj \ - im_iocheck.obj \ - im_iterate.obj \ - im_makerw.obj \ - im_mapfile.obj \ - im_openin.obj \ - im_open.obj \ - im_openout.obj \ - im_partial.obj \ - im_piocheck.obj \ - im_prepare.obj \ - im_printdesc.obj \ - im_printhd.obj \ - im_printlines.obj \ - im_readhist.obj \ - im_setbox.obj \ - im_setbuf.obj \ - im_setupout.obj \ - im_unmapfile.obj \ - im_updatehist.obj \ - im_guess_prefix.obj \ - im_wrapmany.obj \ - im_wrapone.obj \ - im_writeline.obj \ - list.obj \ - memory.obj \ - package.obj \ - predicate.obj \ - region.obj \ - rect.obj \ - thread.obj \ - threadgroup.obj \ - time.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\iofuncs.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: iofuncs.pro - tmake iofuncs.pro -o Makefile - -dist: - $(ZIP) iofuncs.zip iofuncs.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del callback.obj - -del debug.obj - -del dispatch_types.obj - -del error.obj - -del error_exit.obj - -del im_append_Hist.obj - -del im_binfile.obj - -del im_close.obj - -del im_cp_Hist.obj - -del im_cp_desc.obj - -del im_crwrhd.obj - -del im_debugim.obj - -del im_demand_hint.obj - -del im_desc_hd.obj - -del im_generate.obj - -del im_header.obj - -del im_histlin.obj - -del im_image.obj - -del im_init.obj - -del im_initdesc.obj - -del im_inithd.obj - -del im_iocheck.obj - -del im_iterate.obj - -del im_makerw.obj - -del im_mapfile.obj - -del im_openin.obj - -del im_open.obj - -del im_openout.obj - -del im_partial.obj - -del im_piocheck.obj - -del im_prepare.obj - -del im_printdesc.obj - -del im_printhd.obj - -del im_printlines.obj - -del im_readhist.obj - -del im_setbox.obj - -del im_setbuf.obj - -del im_setupout.obj - -del im_unmapfile.obj - -del im_updatehist.obj - -del im_guess_prefix.obj - -del im_wrapmany.obj - -del im_wrapone.obj - -del im_writeline.obj - -del list.obj - -del memory.obj - -del package.obj - -del predicate.obj - -del region.obj - -del rect.obj - -del thread.obj - -del threadgroup.obj - -del time.obj - -del $(TARGET) - -####### Compile - -callback.obj: callback.c - -debug.obj: debug.c - -dispatch_types.obj: dispatch_types.c - -error.obj: error.c - -error_exit.obj: error_exit.c - -im_append_Hist.obj: im_append_Hist.c - -im_binfile.obj: im_binfile.c - -im_close.obj: im_close.c - -im_cp_Hist.obj: im_cp_Hist.c - -im_cp_desc.obj: im_cp_desc.c - -im_crwrhd.obj: im_crwrhd.c - -im_debugim.obj: im_debugim.c - -im_demand_hint.obj: im_demand_hint.c - -im_desc_hd.obj: im_desc_hd.c - -im_generate.obj: im_generate.c - -im_header.obj: im_header.c - -im_histlin.obj: im_histlin.c - -im_image.obj: im_image.c - -im_init.obj: im_init.c - -im_initdesc.obj: im_initdesc.c - -im_inithd.obj: im_inithd.c - -im_iocheck.obj: im_iocheck.c - -im_iterate.obj: im_iterate.c - -im_makerw.obj: im_makerw.c - -im_mapfile.obj: im_mapfile.c - -im_openin.obj: im_openin.c - -im_open.obj: im_open.c - -im_openout.obj: im_openout.c - -im_partial.obj: im_partial.c - -im_piocheck.obj: im_piocheck.c - -im_prepare.obj: im_prepare.c - -im_printdesc.obj: im_printdesc.c - -im_printhd.obj: im_printhd.c - -im_printlines.obj: im_printlines.c - -im_readhist.obj: im_readhist.c - -im_setbox.obj: im_setbox.c - -im_setbuf.obj: im_setbuf.c - -im_setupout.obj: im_setupout.c - -im_unmapfile.obj: im_unmapfile.c - -im_updatehist.obj: im_updatehist.c - -im_guess_prefix.obj: im_guess_prefix.c - -im_wrapmany.obj: im_wrapmany.c - -im_wrapone.obj: im_wrapone.c - -im_writeline.obj: im_writeline.c - -list.obj: list.c - -memory.obj: memory.c - -package.obj: package.c - -predicate.obj: predicate.c - -region.obj: region.c - -rect.obj: rect.c - -thread.obj: thread.c - -threadgroup.obj: threadgroup.c - -time.obj: time.c - diff --git a/win32/tmake/libsrc/iofuncs/iofuncs.pro b/win32/tmake/libsrc/iofuncs/iofuncs.pro deleted file mode 100644 index 9d758b8a..00000000 --- a/win32/tmake/libsrc/iofuncs/iofuncs.pro +++ /dev/null @@ -1,72 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - callback.c \ - debug.c \ - dispatch_types.c \ - error.c \ - error_exit.c \ - im_append_Hist.c \ - im_binfile.c \ - im_close.c \ - im_cp_Hist.c \ - im_cp_desc.c \ - im_crwrhd.c \ - im_debugim.c \ - im_demand_hint.c \ - im_desc_hd.c \ - im_generate.c \ - im_header.c \ - im_histlin.c \ - im_image.c \ - im_init.c \ - im_initdesc.c \ - im_inithd.c \ - im_iocheck.c \ - im_iterate.c \ - im_makerw.c \ - im_mapfile.c \ - im_openin.c \ - im_open.c \ - im_openout.c \ - im_partial.c \ - im_piocheck.c \ - im_prepare.c \ - im_printdesc.c \ - im_printhd.c \ - im_printlines.c \ - im_readhist.c \ - im_setbox.c \ - im_setbuf.c \ - im_setupout.c \ - im_unmapfile.c \ - im_updatehist.c \ - im_guess_prefix.c \ - im_wrapmany.c \ - im_wrapone.c \ - im_writeline.c \ - list.c \ - memory.c \ - package.c \ - predicate.c \ - region.c \ - rect.c \ - thread.c \ - threadgroup.c \ - time.c -TARGET = iofuncs - diff --git a/win32/tmake/libsrc/makefile_todo b/win32/tmake/libsrc/makefile_todo deleted file mode 100644 index 12fde75b..00000000 --- a/win32/tmake/libsrc/makefile_todo +++ /dev/null @@ -1,222 +0,0 @@ -############################################################################# -# Makefile for building targets in sub directories. -# Generated by tmake at 13:14, 2003/06/11 -# Project: todo -# Template: subdirs -############################################################################# - -MAKEFILE= Makefile -TMAKE = tmake - -SUBDIRS = acquire \ - arithmetic \ - boolean \ - colour \ - conversion \ - convolution \ - freq_filt \ - histograms_lut \ - inplace \ - iofuncs \ - matrix \ - morphology \ - mosaicing \ - other \ - relational \ - video \ - . - -all: $(SUBDIRS) vips - -acquire: FORCE - cd acquire - $(MAKE) - @cd .. - -arithmetic: FORCE - cd arithmetic - $(MAKE) - @cd .. - -boolean: FORCE - cd boolean - $(MAKE) - @cd .. - -colour: FORCE - cd colour - $(MAKE) - @cd .. - -conversion: FORCE - cd conversion - $(MAKE) - @cd .. - -convolution: FORCE - cd convolution - $(MAKE) - @cd .. - -freq_filt: FORCE - cd freq_filt - $(MAKE) - @cd .. - -histograms_lut: FORCE - cd histograms_lut - $(MAKE) - @cd .. - -inplace: FORCE - cd inplace - $(MAKE) - @cd .. - -iofuncs: FORCE - cd iofuncs - $(MAKE) - @cd .. - -matrix: FORCE - cd matrix - $(MAKE) - @cd .. - -morphology: FORCE - cd morphology - $(MAKE) - @cd .. - -mosaicing: FORCE - cd mosaicing - $(MAKE) - @cd .. - -other: FORCE - cd other - $(MAKE) - @cd .. - -relational: FORCE - cd relational - $(MAKE) - @cd .. - -video: FORCE - cd video - $(MAKE) - @cd .. - -vips: FORCE - $(MAKE) - - -tmake: makefile_todo - -makefile_todo: todo.pro - tmake todo.pro -o makefile_todo - -tmake_all: - cd acquire - $(TMAKE) acquire.pro -o $(MAKEFILE) - @cd .. - cd arithmetic - $(TMAKE) arithmetic.pro -o $(MAKEFILE) - @cd .. - cd boolean - $(TMAKE) boolean.pro -o $(MAKEFILE) - @cd .. - cd colour - $(TMAKE) colour.pro -o $(MAKEFILE) - @cd .. - cd conversion - $(TMAKE) conversion.pro -o $(MAKEFILE) - @cd .. - cd convolution - $(TMAKE) convolution.pro -o $(MAKEFILE) - @cd .. - cd freq_filt - $(TMAKE) freq_filt.pro -o $(MAKEFILE) - @cd .. - cd histograms_lut - $(TMAKE) histograms_lut.pro -o $(MAKEFILE) - @cd .. - cd inplace - $(TMAKE) inplace.pro -o $(MAKEFILE) - @cd .. - cd iofuncs - $(TMAKE) iofuncs.pro -o $(MAKEFILE) - @cd .. - cd matrix - $(TMAKE) matrix.pro -o $(MAKEFILE) - @cd .. - cd morphology - $(TMAKE) morphology.pro -o $(MAKEFILE) - @cd .. - cd mosaicing - $(TMAKE) mosaicing.pro -o $(MAKEFILE) - @cd .. - cd other - $(TMAKE) other.pro -o $(MAKEFILE) - @cd .. - cd relational - $(TMAKE) relational.pro -o $(MAKEFILE) - @cd .. - cd video - $(TMAKE) video.pro -o $(MAKEFILE) - @cd .. - $(TMAKE) vips.pro -o $(MAKEFILE) - -clean: - cd acquire - $(MAKE) clean - @cd .. - cd arithmetic - $(MAKE) clean - @cd .. - cd boolean - $(MAKE) clean - @cd .. - cd colour - $(MAKE) clean - @cd .. - cd conversion - $(MAKE) clean - @cd .. - cd convolution - $(MAKE) clean - @cd .. - cd freq_filt - $(MAKE) clean - @cd .. - cd histograms_lut - $(MAKE) clean - @cd .. - cd inplace - $(MAKE) clean - @cd .. - cd iofuncs - $(MAKE) clean - @cd .. - cd matrix - $(MAKE) clean - @cd .. - cd morphology - $(MAKE) clean - @cd .. - cd mosaicing - $(MAKE) clean - @cd .. - cd other - $(MAKE) clean - @cd .. - cd relational - $(MAKE) clean - @cd .. - cd video - $(MAKE) clean - @cd .. - $(MAKE) clean - -FORCE: diff --git a/win32/tmake/libsrc/matrix/Makefile b/win32/tmake/libsrc/matrix/Makefile deleted file mode 100644 index 9c7ab386..00000000 --- a/win32/tmake/libsrc/matrix/Makefile +++ /dev/null @@ -1,107 +0,0 @@ -############################################################################# -# Makefile for building matrix -# Generated by tmake at 16:03, 2003/06/11 -# Project: matrix -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = im_invmat.c \ - im_matcat.c \ - im_matinv.c \ - im_matmul.c \ - im_mattrn.c \ - matalloc.c \ - matrix_dispatch.c -OBJECTS = im_invmat.obj \ - im_matcat.obj \ - im_matinv.obj \ - im_matmul.obj \ - im_mattrn.obj \ - matalloc.obj \ - matrix_dispatch.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\matrix.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: matrix.pro - tmake matrix.pro -o Makefile - -dist: - $(ZIP) matrix.zip matrix.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del im_invmat.obj - -del im_matcat.obj - -del im_matinv.obj - -del im_matmul.obj - -del im_mattrn.obj - -del matalloc.obj - -del matrix_dispatch.obj - -del $(TARGET) - -####### Compile - -im_invmat.obj: im_invmat.c - -im_matcat.obj: im_matcat.c - -im_matinv.obj: im_matinv.c - -im_matmul.obj: im_matmul.c - -im_mattrn.obj: im_mattrn.c - -matalloc.obj: matalloc.c - -matrix_dispatch.obj: matrix_dispatch.c - diff --git a/win32/tmake/libsrc/matrix/matrix.pro b/win32/tmake/libsrc/matrix/matrix.pro deleted file mode 100644 index ba23c8e8..00000000 --- a/win32/tmake/libsrc/matrix/matrix.pro +++ /dev/null @@ -1,26 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - im_invmat.c \ - im_matcat.c \ - im_matinv.c \ - im_matmul.c \ - im_mattrn.c \ - matalloc.c \ - matrix_dispatch.c -TARGET = matrix - diff --git a/win32/tmake/libsrc/morphology/Makefile b/win32/tmake/libsrc/morphology/Makefile deleted file mode 100644 index 4dfb484b..00000000 --- a/win32/tmake/libsrc/morphology/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -############################################################################# -# Makefile for building morphology -# Generated by tmake at 16:03, 2003/06/11 -# Project: morphology -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = im_cntlines.c \ - im_dilate.c \ - im_erode.c \ - morph_dispatch.c \ - im_profile.c -OBJECTS = im_cntlines.obj \ - im_dilate.obj \ - im_erode.obj \ - morph_dispatch.obj \ - im_profile.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\morphology.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: morphology.pro - tmake morphology.pro -o Makefile - -dist: - $(ZIP) morphology.zip morphology.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del im_cntlines.obj - -del im_dilate.obj - -del im_erode.obj - -del morph_dispatch.obj - -del im_profile.obj - -del $(TARGET) - -####### Compile - -im_cntlines.obj: im_cntlines.c - -im_dilate.obj: im_dilate.c - -im_erode.obj: im_erode.c - -morph_dispatch.obj: morph_dispatch.c - -im_profile.obj: im_profile.c - diff --git a/win32/tmake/libsrc/morphology/morphology.pro b/win32/tmake/libsrc/morphology/morphology.pro deleted file mode 100644 index 1b177773..00000000 --- a/win32/tmake/libsrc/morphology/morphology.pro +++ /dev/null @@ -1,24 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - im_cntlines.c \ - im_dilate.c \ - im_erode.c \ - morph_dispatch.c \ - im_profile.c -TARGET = morphology - diff --git a/win32/tmake/libsrc/mosaicing/Makefile b/win32/tmake/libsrc/mosaicing/Makefile deleted file mode 100644 index 972d16b9..00000000 --- a/win32/tmake/libsrc/mosaicing/Makefile +++ /dev/null @@ -1,185 +0,0 @@ -############################################################################# -# Makefile for building mosaicing -# Generated by tmake at 16:03, 2003/06/11 -# Project: mosaicing -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h \ - merge.h \ - global_balance.h \ - mosaic.h -SOURCES = im_affine.c \ - match.c \ - mosaic1.c \ - mosaicing_dispatch.c \ - similarity.c \ - global_balance.c \ - im_avgdxdy.c \ - im_chkpair.c \ - im_clinear.c \ - im_improve.c \ - im_initialize.c \ - im_lrcalcon.c \ - im_lrmerge.c \ - im_lrmosaic.c \ - im_tbcalcon.c \ - im_tbmerge.c \ - im_remosaic.c \ - im_tbmosaic.c -OBJECTS = im_affine.obj \ - match.obj \ - mosaic1.obj \ - mosaicing_dispatch.obj \ - similarity.obj \ - global_balance.obj \ - im_avgdxdy.obj \ - im_chkpair.obj \ - im_clinear.obj \ - im_improve.obj \ - im_initialize.obj \ - im_lrcalcon.obj \ - im_lrmerge.obj \ - im_lrmosaic.obj \ - im_tbcalcon.obj \ - im_tbmerge.obj \ - im_remosaic.obj \ - im_tbmosaic.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\mosaicing.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: mosaicing.pro - tmake mosaicing.pro -o Makefile - -dist: - $(ZIP) mosaicing.zip mosaicing.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del im_affine.obj - -del match.obj - -del mosaic1.obj - -del mosaicing_dispatch.obj - -del similarity.obj - -del global_balance.obj - -del im_avgdxdy.obj - -del im_chkpair.obj - -del im_clinear.obj - -del im_improve.obj - -del im_initialize.obj - -del im_lrcalcon.obj - -del im_lrmerge.obj - -del im_lrmosaic.obj - -del im_tbcalcon.obj - -del im_tbmerge.obj - -del im_remosaic.obj - -del im_tbmosaic.obj - -del $(TARGET) - -####### Compile - -im_affine.obj: im_affine.c \ - merge.h - -match.obj: match.c \ - mosaic.h - -mosaic1.obj: mosaic1.c \ - mosaic.h \ - merge.h - -mosaicing_dispatch.obj: mosaicing_dispatch.c - -similarity.obj: similarity.c \ - merge.h - -global_balance.obj: global_balance.c \ - merge.h \ - global_balance.h - -im_avgdxdy.obj: im_avgdxdy.c \ - mosaic.h - -im_chkpair.obj: im_chkpair.c \ - mosaic.h - -im_clinear.obj: im_clinear.c \ - mosaic.h - -im_improve.obj: im_improve.c \ - mosaic.h - -im_initialize.obj: im_initialize.c \ - mosaic.h - -im_lrcalcon.obj: im_lrcalcon.c \ - mosaic.h - -im_lrmerge.obj: im_lrmerge.c \ - merge.h - -im_lrmosaic.obj: im_lrmosaic.c \ - mosaic.h - -im_tbcalcon.obj: im_tbcalcon.c \ - mosaic.h - -im_tbmerge.obj: im_tbmerge.c \ - merge.h - -im_remosaic.obj: im_remosaic.c \ - merge.h \ - global_balance.h - -im_tbmosaic.obj: im_tbmosaic.c \ - mosaic.h - diff --git a/win32/tmake/libsrc/mosaicing/mosaicing.pro b/win32/tmake/libsrc/mosaicing/mosaicing.pro deleted file mode 100644 index 207151c5..00000000 --- a/win32/tmake/libsrc/mosaicing/mosaicing.pro +++ /dev/null @@ -1,37 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - im_affine.c \ - match.c \ - mosaic1.c \ - mosaicing_dispatch.c \ - similarity.c \ - global_balance.c \ - im_avgdxdy.c \ - im_chkpair.c \ - im_clinear.c \ - im_improve.c \ - im_initialize.c \ - im_lrcalcon.c \ - im_lrmerge.c \ - im_lrmosaic.c \ - im_tbcalcon.c \ - im_tbmerge.c \ - im_remosaic.c \ - im_tbmosaic.c -TARGET = mosaicing - diff --git a/win32/tmake/libsrc/other/Makefile b/win32/tmake/libsrc/other/Makefile deleted file mode 100644 index bbda705a..00000000 --- a/win32/tmake/libsrc/other/Makefile +++ /dev/null @@ -1,127 +0,0 @@ -############################################################################# -# Makefile for building other -# Generated by tmake at 16:03, 2003/06/11 -# Project: other -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = cooc_funcs.c \ - glds_funcs.c \ - im_dif_std.c \ - im_eye.c \ - im_grey.c \ - im_meanstd.c \ - im_simcontr.c \ - im_sines.c \ - im_spatres.c \ - im_zone.c \ - other_dispatch.c -OBJECTS = cooc_funcs.obj \ - glds_funcs.obj \ - im_dif_std.obj \ - im_eye.obj \ - im_grey.obj \ - im_meanstd.obj \ - im_simcontr.obj \ - im_sines.obj \ - im_spatres.obj \ - im_zone.obj \ - other_dispatch.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\other.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: other.pro - tmake other.pro -o Makefile - -dist: - $(ZIP) other.zip other.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del cooc_funcs.obj - -del glds_funcs.obj - -del im_dif_std.obj - -del im_eye.obj - -del im_grey.obj - -del im_meanstd.obj - -del im_simcontr.obj - -del im_sines.obj - -del im_spatres.obj - -del im_zone.obj - -del other_dispatch.obj - -del $(TARGET) - -####### Compile - -cooc_funcs.obj: cooc_funcs.c - -glds_funcs.obj: glds_funcs.c - -im_dif_std.obj: im_dif_std.c - -im_eye.obj: im_eye.c - -im_grey.obj: im_grey.c - -im_meanstd.obj: im_meanstd.c - -im_simcontr.obj: im_simcontr.c - -im_sines.obj: im_sines.c - -im_spatres.obj: im_spatres.c - -im_zone.obj: im_zone.c - -other_dispatch.obj: other_dispatch.c - diff --git a/win32/tmake/libsrc/other/other.pro b/win32/tmake/libsrc/other/other.pro deleted file mode 100644 index c65ad353..00000000 --- a/win32/tmake/libsrc/other/other.pro +++ /dev/null @@ -1,30 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - cooc_funcs.c \ - glds_funcs.c \ - im_dif_std.c \ - im_eye.c \ - im_grey.c \ - im_meanstd.c \ - im_simcontr.c \ - im_sines.c \ - im_spatres.c \ - im_zone.c \ - other_dispatch.c -TARGET = other - diff --git a/win32/tmake/libsrc/relational/Makefile b/win32/tmake/libsrc/relational/Makefile deleted file mode 100644 index 73ae58a9..00000000 --- a/win32/tmake/libsrc/relational/Makefile +++ /dev/null @@ -1,92 +0,0 @@ -############################################################################# -# Makefile for building relational -# Generated by tmake at 16:03, 2003/06/11 -# Project: relational -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = im_ifthenelse.c \ - im_blend.c \ - relational.c \ - relational_dispatch.c -OBJECTS = im_ifthenelse.obj \ - im_blend.obj \ - relational.obj \ - relational_dispatch.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\relational.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: relational.pro - tmake relational.pro -o Makefile - -dist: - $(ZIP) relational.zip relational.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del im_ifthenelse.obj - -del im_blend.obj - -del relational.obj - -del relational_dispatch.obj - -del $(TARGET) - -####### Compile - -im_ifthenelse.obj: im_ifthenelse.c - -im_blend.obj: im_blend.c - -relational.obj: relational.c - -relational_dispatch.obj: relational_dispatch.c - diff --git a/win32/tmake/libsrc/relational/relational.pro b/win32/tmake/libsrc/relational/relational.pro deleted file mode 100644 index e1d477e3f..00000000 --- a/win32/tmake/libsrc/relational/relational.pro +++ /dev/null @@ -1,23 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - im_ifthenelse.c \ - im_blend.c \ - relational.c \ - relational_dispatch.c -TARGET = relational - diff --git a/win32/tmake/libsrc/todo.pro b/win32/tmake/libsrc/todo.pro deleted file mode 100644 index 83fcd569..00000000 --- a/win32/tmake/libsrc/todo.pro +++ /dev/null @@ -1,19 +0,0 @@ -TEMPLATE = subdirs -MAKE = nmake -SUBDIRS = \ - acquire \ - arithmetic \ - boolean \ - colour \ - conversion \ - convolution \ - freq_filt \ - histograms_lut \ - inplace \ - iofuncs \ - matrix \ - morphology \ - mosaicing \ - other \ - relational \ - video diff --git a/win32/tmake/libsrc/video/Makefile b/win32/tmake/libsrc/video/Makefile deleted file mode 100644 index 9615ae18..00000000 --- a/win32/tmake/libsrc/video/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -############################################################################# -# Makefile for building video -# Generated by tmake at 16:03, 2003/06/11 -# Project: video -# Template: lib -############################################################################# - -####### Compiler, tools and options - -CC = cl -CXX = cl -CFLAGS = -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -CXXFLAGS= -nologo -W3 -O1 -DHAVE_CONFIG_H -DNO_DEBUG -INCPATH = -I"..\.." -I"..\..\include" -I"$(QTDIR)\include" -LIB = lib /NOLOGO -MOC = moc -UIC = uic - -ZIP = zip -r -9 - -####### Files - -HEADERS = ..\..\config.h -SOURCES = video_dispatch.c \ - im_video_v4l1.c -OBJECTS = video_dispatch.obj \ - im_video_v4l1.obj -INTERFACES = -UICDECLS = -UICIMPLS = -SRCMOC = -OBJMOC = -DIST = -TARGET = ..\..\Release\video.lib -INTERFACE_DECL_PATH = . - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: video.pro - tmake video.pro -o Makefile - -dist: - $(ZIP) video.zip video.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES) - -clean: - -del video_dispatch.obj - -del im_video_v4l1.obj - -del $(TARGET) - -####### Compile - -video_dispatch.obj: video_dispatch.c - -im_video_v4l1.obj: im_video_v4l1.c - diff --git a/win32/tmake/libsrc/video/video.pro b/win32/tmake/libsrc/video/video.pro deleted file mode 100644 index cd428d8a..00000000 --- a/win32/tmake/libsrc/video/video.pro +++ /dev/null @@ -1,21 +0,0 @@ -TEMPLATE = lib -DIR_LIB = ../../lib -CONFIG = release staticlib -win32:CONFIG = windows -TMAKEFLAGS = -nologo -DEFINES = HAVE_CONFIG_H -INCLUDEPATH = ../.. ../../include -HEADERS = ../../config.h -win32:LIBS = \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DESTDIR = ../../Release -VERSION = 7.8.10 - -SOURCES = \ - video_dispatch.c \ - im_video_v4l1.c -TARGET = video - diff --git a/win32/tmake/libsrc/vips.pro b/win32/tmake/libsrc/vips.pro deleted file mode 100644 index 42f9e463..00000000 --- a/win32/tmake/libsrc/vips.pro +++ /dev/null @@ -1,21 +0,0 @@ -TEMPLATE = app -DIR_LIB = ../lib -CONFIG = release dll -win32:CONFIG += windows -TMAKEFLAGS = -nologo -INCLUDEPATH = .. ../include -HEADERS = ../config.h -SOURCES = dummy.c -DESTDIR = ../Release -unix:LIBS += \ - $$DESTDIR/*.a -win32:LIBS += \ - $$DESTDIR/*.lib \ - $$DIR_LIB/libjpeg.lib \ - $$DIR_LIB/libtiff.lib \ - $$DIR_LIB/libpng.lib \ - $$DIR_LIB/libz.lib -DEF_FILE = vips.def -TARGET = vips -VERSION = 7.8.10 -CLEAN = $$DESTDIR/vips.exp $$DESTDIR/vips.lib