diff --git a/ChangeLog b/ChangeLog index 0855dc48..75de4804 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ - added openslide support (Benjamin Gilbert) - allow new-style load/save options in filenames to vips_image_new_from_file() etc. +- VipsFormat is deprecated 12/10/11 started 7.26.6 - NOCACHE was not being set correctly on OS X causing performance diff --git a/TODO b/TODO index 153abbfc..a793ce6f 100644 --- a/TODO +++ b/TODO @@ -2,12 +2,8 @@ - test rad read/write -- rad save should auto pack to CODING RAD - - test matio load -- radiance to go still - - saverawfd should be renamed saveraw_fd, cf. pngsave_buffer - remove uses of vips_image_pio_output(), this is done for you by generate @@ -33,10 +29,6 @@ -- make the old format/vips.c into a stub as well? - - move format/* to deprecated - diff --git a/configure.in b/configure.in index 19be989a..01dcbfdf 100644 --- a/configure.in +++ b/configure.in @@ -698,7 +698,6 @@ AC_OUTPUT([ libvips/conversion/Makefile libvips/convolution/Makefile libvips/deprecated/Makefile - libvips/format/Makefile libvips/foreign/Makefile libvips/freq_filt/Makefile libvips/histograms_lut/Makefile diff --git a/libvips/Makefile.am b/libvips/Makefile.am index 2007ad5f..fe89add4 100644 --- a/libvips/Makefile.am +++ b/libvips/Makefile.am @@ -19,7 +19,6 @@ SUBDIRS = \ deprecated \ convolution \ $(C_COMPILE_DIR) \ - format \ freq_filt \ histograms_lut \ inplace \ @@ -52,7 +51,6 @@ libvips_la_LIBADD = \ convolution/libconvolution.la \ deprecated/libdeprecated.la \ $(C_LIB) \ - format/libformat.la \ foreign/libforeign.la \ freq_filt/libfreq_filt.la \ histograms_lut/libhistograms_lut.la \ diff --git a/libvips/deprecated/Makefile.am b/libvips/deprecated/Makefile.am index 99540401..e3cb662a 100644 --- a/libvips/deprecated/Makefile.am +++ b/libvips/deprecated/Makefile.am @@ -43,6 +43,26 @@ libdeprecated_la_SOURCES = \ im_matmul.c \ im_mattrn.c \ matalloc.c \ - mask_dispatch.c + mask_dispatch.c \ + fits.c \ + format.c \ + format_dispatch.c \ + im_analyze2vips.c \ + im_csv2vips.c \ + im_exr2vips.c \ + im_jpeg2vips.c \ + im_magick2vips.c \ + im_png2vips.c \ + im_ppm2vips.c \ + im_tiff2vips.c \ + im_tile_cache.c \ + im_vips2csv.c \ + im_vips2jpeg.c \ + im_vips2png.c \ + im_vips2ppm.c \ + im_vips2tiff.c \ + matlab.c \ + radiance.c \ + raw.c INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ diff --git a/libvips/format/fits.c b/libvips/deprecated/fits.c similarity index 100% rename from libvips/format/fits.c rename to libvips/deprecated/fits.c diff --git a/libvips/format/format.c b/libvips/deprecated/format.c similarity index 100% rename from libvips/format/format.c rename to libvips/deprecated/format.c diff --git a/libvips/format/format_dispatch.c b/libvips/deprecated/format_dispatch.c similarity index 100% rename from libvips/format/format_dispatch.c rename to libvips/deprecated/format_dispatch.c diff --git a/libvips/format/im_analyze2vips.c b/libvips/deprecated/im_analyze2vips.c similarity index 100% rename from libvips/format/im_analyze2vips.c rename to libvips/deprecated/im_analyze2vips.c diff --git a/libvips/format/im_csv2vips.c b/libvips/deprecated/im_csv2vips.c similarity index 100% rename from libvips/format/im_csv2vips.c rename to libvips/deprecated/im_csv2vips.c diff --git a/libvips/format/im_exr2vips.c b/libvips/deprecated/im_exr2vips.c similarity index 100% rename from libvips/format/im_exr2vips.c rename to libvips/deprecated/im_exr2vips.c diff --git a/libvips/format/im_jpeg2vips.c b/libvips/deprecated/im_jpeg2vips.c similarity index 100% rename from libvips/format/im_jpeg2vips.c rename to libvips/deprecated/im_jpeg2vips.c diff --git a/libvips/format/im_magick2vips.c b/libvips/deprecated/im_magick2vips.c similarity index 100% rename from libvips/format/im_magick2vips.c rename to libvips/deprecated/im_magick2vips.c diff --git a/libvips/format/im_png2vips.c b/libvips/deprecated/im_png2vips.c similarity index 100% rename from libvips/format/im_png2vips.c rename to libvips/deprecated/im_png2vips.c diff --git a/libvips/format/im_ppm2vips.c b/libvips/deprecated/im_ppm2vips.c similarity index 100% rename from libvips/format/im_ppm2vips.c rename to libvips/deprecated/im_ppm2vips.c diff --git a/libvips/format/im_tiff2vips.c b/libvips/deprecated/im_tiff2vips.c similarity index 100% rename from libvips/format/im_tiff2vips.c rename to libvips/deprecated/im_tiff2vips.c diff --git a/libvips/format/im_tile_cache.c b/libvips/deprecated/im_tile_cache.c similarity index 100% rename from libvips/format/im_tile_cache.c rename to libvips/deprecated/im_tile_cache.c diff --git a/libvips/format/im_vips2csv.c b/libvips/deprecated/im_vips2csv.c similarity index 100% rename from libvips/format/im_vips2csv.c rename to libvips/deprecated/im_vips2csv.c diff --git a/libvips/format/im_vips2jpeg.c b/libvips/deprecated/im_vips2jpeg.c similarity index 100% rename from libvips/format/im_vips2jpeg.c rename to libvips/deprecated/im_vips2jpeg.c diff --git a/libvips/format/im_vips2png.c b/libvips/deprecated/im_vips2png.c similarity index 100% rename from libvips/format/im_vips2png.c rename to libvips/deprecated/im_vips2png.c diff --git a/libvips/format/im_vips2ppm.c b/libvips/deprecated/im_vips2ppm.c similarity index 100% rename from libvips/format/im_vips2ppm.c rename to libvips/deprecated/im_vips2ppm.c diff --git a/libvips/format/im_vips2tiff.c b/libvips/deprecated/im_vips2tiff.c similarity index 100% rename from libvips/format/im_vips2tiff.c rename to libvips/deprecated/im_vips2tiff.c diff --git a/libvips/format/matlab.c b/libvips/deprecated/matlab.c similarity index 100% rename from libvips/format/matlab.c rename to libvips/deprecated/matlab.c diff --git a/libvips/format/radiance.c b/libvips/deprecated/radiance.c similarity index 100% rename from libvips/format/radiance.c rename to libvips/deprecated/radiance.c diff --git a/libvips/format/raw.c b/libvips/deprecated/raw.c similarity index 100% rename from libvips/format/raw.c rename to libvips/deprecated/raw.c diff --git a/libvips/format/Makefile.am b/libvips/format/Makefile.am deleted file mode 100644 index e0d0be47..00000000 --- a/libvips/format/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -noinst_LTLIBRARIES = libformat.la - -libformat_la_SOURCES = \ - format.c \ - raw.c \ - format_dispatch.c \ - im_analyze2vips.c \ - im_csv2vips.c \ - im_exr2vips.c \ - im_jpeg2vips.c \ - im_magick2vips.c \ - im_png2vips.c \ - im_ppm2vips.c \ - im_tiff2vips.c \ - im_tile_cache.c \ - im_vips2csv.c \ - im_vips2jpeg.c \ - im_vips2png.c \ - im_vips2ppm.c \ - im_vips2tiff.c \ - matlab.c \ - fits.c \ - radiance.c - -INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@