diff --git a/TODO b/TODO index 1eceae39..12477fec 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,3 @@ -- VipsFormat.3 man page should list all formats, since eg. radiance does not - have a separate im_rad2vips page - - also matlab read - wrap im_gauss_mask_line or whatever it's called in C++/Python? diff --git a/man/Makefile.am b/man/Makefile.am index ab45f72e..5f3ceed4 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -517,6 +517,7 @@ man_MANS = \ im_vips2mimejpeg.3 \ im_vips2png.3 \ im_vips2ppm.3 \ + im_vips2raw.3 \ im_vips2tiff.3 \ im_warn.3 \ im_wrapmany.3 \ diff --git a/man/VipsFormat.3 b/man/VipsFormat.3 index 9293ef1b..593ce48d 100644 --- a/man/VipsFormat.3 +++ b/man/VipsFormat.3 @@ -84,18 +84,20 @@ first on .B im_open(3) and delay loading pixels until asked. If you leave this NULL, vips will just use the -.B load +.B load() function. .B load() Load the image from the file into the IMAGE. You can leave this function NULL if you only have a .B save() -method implemented. +method implemented. Load options may be embedded in the filename, see the +loaders below. .B save() Write from the IMAGE to the file in this format. You can leave this function -NULL if you only have a load method implemented. +NULL if you only have a load method implemented. Save options may be embedded +in the filename, see the savers below. .B get_flags() A function which examines the file and sets various flags to indicate @@ -137,6 +139,31 @@ error, it returns non-zero and sets an error message. 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 SUPPORTED FORMATS + +See the following manpages for details on each of the converters and the +options they implement. + +.B im_analyze2vips(3) +.B im_csv2vips(3) +.B im_exr2vips(3) +.B im_jpeg2vips(3) +.B im_magick2vips(3) +.B im_png2vips(3) +.B im_ppm2vips(3) +.B im_tiff2vips(3) +.B im_vips2csv(3) +.B im_vips2jpeg(3) +.B im_vips2png(3) +.B im_vips2ppm(3) +.B im_vips2tiff(3) + +You can also load Matlab .mat files and load or save Radiance HDR files. See +.B im_binfile(3) +and +.B im_raw2vips(3) +for RAW file read. + .SH RETURN VALUE The functions return 0 success and -1 on error. .SH SEE ALSO diff --git a/man/im_raw2vips.3 b/man/im_raw2vips.3 index e50d822a..13a80525 100644 --- a/man/im_raw2vips.3 +++ b/man/im_raw2vips.3 @@ -1,6 +1,6 @@ .TH IM_RAW2VIPS 3 "4 August 2005" .SH NAME -im_raw2vips \- wrap a raw binary file inside an IMAGE descriptor +im_raw2vips, im_vips2raw \- wrap a raw binary file inside an IMAGE descriptor .SH SYNOPSIS .B #include @@ -10,6 +10,11 @@ im_raw2vips( const char *filename, IMAGE *out, .br int width, int height, int bpp, int offset ) +int +.br +im_vips2raw( IMAGE *in, int fd ) + + .SH DESCRIPTION .B im_raw2vips(3) mmaps the file named, setting image @@ -22,6 +27,10 @@ Use functions like .B im_copy_morph(3) to set the pixel type, byte ordering and so on. +.B im_vips2raw(3) +writes the pixels in the IMAGE to the file descriptor. It's handy for writing +writers for other formats. + .SH RETURN VALUE The functions return NULL on error. .SH SEE ALSO diff --git a/man/im_vips2raw.3 b/man/im_vips2raw.3 new file mode 100644 index 00000000..a3d5b7b1 --- /dev/null +++ b/man/im_vips2raw.3 @@ -0,0 +1 @@ +.so man3/im_raw2vips.3