From 9f150e3063d94a1b0b31e70b2ce436fb6d2f3584 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Fri, 3 Jan 2014 17:19:45 +0000 Subject: [PATCH] rename freq_filt package as freqfilt --- TODO | 8 +++++--- configure.ac | 2 +- libvips/Makefile.am | 4 ++-- libvips/{freq_filt => freqfilt}/Makefile.am | 4 ++-- libvips/{freq_filt => freqfilt}/freq_dispatch.c | 0 libvips/{freq_filt => freqfilt}/freqfilt.c | 0 libvips/{freq_filt => freqfilt}/fwfft.c | 0 libvips/{freq_filt => freqfilt}/im_disp_ps.c | 0 libvips/{freq_filt => freqfilt}/im_fractsurf.c | 0 libvips/{freq_filt => freqfilt}/im_freq_mask.c | 0 libvips/{freq_filt => freqfilt}/im_freqflt.c | 0 libvips/{freq_filt => freqfilt}/im_phasecor_fft.c | 0 libvips/{freq_filt => freqfilt}/invfft.c | 0 libvips/{freq_filt => freqfilt}/pfreqfilt.h | 0 libvips/include/vips/Makefile.am | 2 +- libvips/include/vips/{freq_filt.h => freqfilt.h} | 6 +++--- libvips/include/vips/vips.h | 2 +- 17 files changed, 15 insertions(+), 13 deletions(-) rename libvips/{freq_filt => freqfilt}/Makefile.am (78%) rename libvips/{freq_filt => freqfilt}/freq_dispatch.c (100%) rename libvips/{freq_filt => freqfilt}/freqfilt.c (100%) rename libvips/{freq_filt => freqfilt}/fwfft.c (100%) rename libvips/{freq_filt => freqfilt}/im_disp_ps.c (100%) rename libvips/{freq_filt => freqfilt}/im_fractsurf.c (100%) rename libvips/{freq_filt => freqfilt}/im_freq_mask.c (100%) rename libvips/{freq_filt => freqfilt}/im_freqflt.c (100%) rename libvips/{freq_filt => freqfilt}/im_phasecor_fft.c (100%) rename libvips/{freq_filt => freqfilt}/invfft.c (100%) rename libvips/{freq_filt => freqfilt}/pfreqfilt.h (100%) rename libvips/include/vips/{freq_filt.h => freqfilt.h} (95%) diff --git a/TODO b/TODO index c9480da7..02706ba7 100644 --- a/TODO +++ b/TODO @@ -5,10 +5,12 @@ VIPS:ERROR:buffer.c:390:vips_buffer_new: assertion failed: (!buffer->cache) Aborted (core dumped) -- still need to do gaussian band filter +- im_freq_mask.c can almost be deprecated .. just im_freqfilt() to do now I + think + + + -- VipsMaskType needs to be renamed back to the vips7 name and deprecated, - remove compat macros from freq_flt.h - new_heart.ws fails with libvips master diff --git a/configure.ac b/configure.ac index 880fda10..75d4f5ed 100644 --- a/configure.ac +++ b/configure.ac @@ -706,7 +706,7 @@ AC_OUTPUT([ libvips/convolution/Makefile libvips/deprecated/Makefile libvips/foreign/Makefile - libvips/freq_filt/Makefile + libvips/freqfilt/Makefile libvips/histogram/Makefile libvips/inplace/Makefile libvips/iofuncs/Makefile diff --git a/libvips/Makefile.am b/libvips/Makefile.am index a6f7b56a..d0240d68 100644 --- a/libvips/Makefile.am +++ b/libvips/Makefile.am @@ -19,7 +19,7 @@ SUBDIRS = \ deprecated \ convolution \ $(C_COMPILE_DIR) \ - freq_filt \ + freqfilt \ histogram \ inplace \ iofuncs \ @@ -52,7 +52,7 @@ libvips_la_LIBADD = \ deprecated/libdeprecated.la \ $(C_LIB) \ foreign/libforeign.la \ - freq_filt/libfreq_filt.la \ + freqfilt/libfreqfilt.la \ histogram/libhistogram.la \ inplace/libinplace.la \ iofuncs/libiofuncs.la \ diff --git a/libvips/freq_filt/Makefile.am b/libvips/freqfilt/Makefile.am similarity index 78% rename from libvips/freq_filt/Makefile.am rename to libvips/freqfilt/Makefile.am index 50acf718..c3d75aa8 100644 --- a/libvips/freq_filt/Makefile.am +++ b/libvips/freqfilt/Makefile.am @@ -1,6 +1,6 @@ -noinst_LTLIBRARIES = libfreq_filt.la +noinst_LTLIBRARIES = libfreqfilt.la -libfreq_filt_la_SOURCES = \ +libfreqfilt_la_SOURCES = \ freqfilt.c \ pfreqfilt.h \ fwfft.c \ diff --git a/libvips/freq_filt/freq_dispatch.c b/libvips/freqfilt/freq_dispatch.c similarity index 100% rename from libvips/freq_filt/freq_dispatch.c rename to libvips/freqfilt/freq_dispatch.c diff --git a/libvips/freq_filt/freqfilt.c b/libvips/freqfilt/freqfilt.c similarity index 100% rename from libvips/freq_filt/freqfilt.c rename to libvips/freqfilt/freqfilt.c diff --git a/libvips/freq_filt/fwfft.c b/libvips/freqfilt/fwfft.c similarity index 100% rename from libvips/freq_filt/fwfft.c rename to libvips/freqfilt/fwfft.c diff --git a/libvips/freq_filt/im_disp_ps.c b/libvips/freqfilt/im_disp_ps.c similarity index 100% rename from libvips/freq_filt/im_disp_ps.c rename to libvips/freqfilt/im_disp_ps.c diff --git a/libvips/freq_filt/im_fractsurf.c b/libvips/freqfilt/im_fractsurf.c similarity index 100% rename from libvips/freq_filt/im_fractsurf.c rename to libvips/freqfilt/im_fractsurf.c diff --git a/libvips/freq_filt/im_freq_mask.c b/libvips/freqfilt/im_freq_mask.c similarity index 100% rename from libvips/freq_filt/im_freq_mask.c rename to libvips/freqfilt/im_freq_mask.c diff --git a/libvips/freq_filt/im_freqflt.c b/libvips/freqfilt/im_freqflt.c similarity index 100% rename from libvips/freq_filt/im_freqflt.c rename to libvips/freqfilt/im_freqflt.c diff --git a/libvips/freq_filt/im_phasecor_fft.c b/libvips/freqfilt/im_phasecor_fft.c similarity index 100% rename from libvips/freq_filt/im_phasecor_fft.c rename to libvips/freqfilt/im_phasecor_fft.c diff --git a/libvips/freq_filt/invfft.c b/libvips/freqfilt/invfft.c similarity index 100% rename from libvips/freq_filt/invfft.c rename to libvips/freqfilt/invfft.c diff --git a/libvips/freq_filt/pfreqfilt.h b/libvips/freqfilt/pfreqfilt.h similarity index 100% rename from libvips/freq_filt/pfreqfilt.h rename to libvips/freqfilt/pfreqfilt.h diff --git a/libvips/include/vips/Makefile.am b/libvips/include/vips/Makefile.am index c36e6e67..6ced549d 100644 --- a/libvips/include/vips/Makefile.am +++ b/libvips/include/vips/Makefile.am @@ -20,7 +20,7 @@ pkginclude_HEADERS = \ generate.h \ header.h \ histogram.h \ - freq_filt.h \ + freqfilt.h \ image.h \ interpolate.h \ intl.h \ diff --git a/libvips/include/vips/freq_filt.h b/libvips/include/vips/freqfilt.h similarity index 95% rename from libvips/include/vips/freq_filt.h rename to libvips/include/vips/freqfilt.h index dfd97907..101e5bf8 100644 --- a/libvips/include/vips/freq_filt.h +++ b/libvips/include/vips/freqfilt.h @@ -31,8 +31,8 @@ */ -#ifndef IM_FREQ_H -#define IM_FREQ_H +#ifndef VIPS_FREQFILT_H +#define VIPS_FREQFILT_H #ifdef __cplusplus extern "C" { @@ -53,4 +53,4 @@ int im_fractsurf( VipsImage *out, int size, double frd ); } #endif /*__cplusplus*/ -#endif /*IM_FREQ_H*/ +#endif /*VIPS_FREQFILT_H*/ diff --git a/libvips/include/vips/vips.h b/libvips/include/vips/vips.h index 69a5e111..68575935 100644 --- a/libvips/include/vips/vips.h +++ b/libvips/include/vips/vips.h @@ -131,7 +131,7 @@ extern "C" { #include #include #include -#include +#include #include #include #include