From e7743ddc3c8c3e6a393b849e9e88456f41b4924e Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Thu, 29 May 2014 09:35:17 +0100 Subject: [PATCH] finish mosaicing rewrite --- ChangeLog | 1 + TODO | 8 -------- libvips/deprecated/Makefile.am | 3 +++ libvips/{mosaicing => deprecated}/im_align_bands.c | 0 libvips/{mosaicing => deprecated}/im_maxpos_subpel.c | 0 .../{mosaicing => deprecated}/mosaicing_dispatch.c | 2 -- libvips/mosaicing/Makefile.am | 6 +----- libvips/mosaicing/global_balance.c | 2 +- libvips/mosaicing/im_avgdxdy.c | 2 +- libvips/mosaicing/im_chkpair.c | 2 +- libvips/mosaicing/im_clinear.c | 2 +- libvips/mosaicing/im_improve.c | 2 +- libvips/mosaicing/im_initialize.c | 2 +- libvips/mosaicing/im_lrcalcon.c | 2 +- libvips/mosaicing/im_lrmerge.c | 2 +- libvips/mosaicing/im_lrmosaic.c | 2 +- libvips/mosaicing/im_remosaic.c | 2 +- libvips/mosaicing/im_tbcalcon.c | 2 +- libvips/mosaicing/im_tbmerge.c | 2 +- libvips/mosaicing/im_tbmosaic.c | 2 +- libvips/mosaicing/match.c | 2 +- libvips/mosaicing/mosaic.c | 2 +- libvips/mosaicing/mosaic1.c | 2 +- libvips/mosaicing/{mosaic.h => pmosaicing.h} | 0 po/POTFILES.in | 12 +++++++----- 25 files changed, 28 insertions(+), 36 deletions(-) rename libvips/{mosaicing => deprecated}/im_align_bands.c (100%) rename libvips/{mosaicing => deprecated}/im_maxpos_subpel.c (100%) rename libvips/{mosaicing => deprecated}/mosaicing_dispatch.c (99%) rename libvips/mosaicing/{mosaic.h => pmosaicing.h} (100%) diff --git a/ChangeLog b/ChangeLog index c3c4e43d..4adacb75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ - added Travis CI config, thanks Lovell - im_*merge(), im_*mosaic(), im_match*(), im_global_balance*(), im_remosaic(), im_*mosaic1(), im_*merge1() redone as classes +- better filename tracking for globalbalance 6/3/14 started 7.38.6 - grey ramp minimum was wrong diff --git a/TODO b/TODO index e447a10e..911a9746 100644 --- a/TODO +++ b/TODO @@ -1,12 +1,4 @@ -- more mosaicing? - - im_lrmosaic1(), im_tbmosaic1() done - im_lrmerge1(), im_tbmerge1() done - im_correl - im_align_bands() - im_maxpos_subpel() - - can we use postbuild elsewhere? look at use of "preclose" / "written", etc. diff --git a/libvips/deprecated/Makefile.am b/libvips/deprecated/Makefile.am index c28e0d8d..b163bf87 100644 --- a/libvips/deprecated/Makefile.am +++ b/libvips/deprecated/Makefile.am @@ -10,6 +10,9 @@ libdeprecated_la_SOURCES = \ im_openslide2vips.c \ im_lab_morph.c \ deprecated_dispatch.c \ + mosaicing_dispatch.c \ + im_maxpos_subpel.c \ + im_align_bands.c \ morph_dispatch.c \ colour_dispatch.c \ convol_dispatch.c \ diff --git a/libvips/mosaicing/im_align_bands.c b/libvips/deprecated/im_align_bands.c similarity index 100% rename from libvips/mosaicing/im_align_bands.c rename to libvips/deprecated/im_align_bands.c diff --git a/libvips/mosaicing/im_maxpos_subpel.c b/libvips/deprecated/im_maxpos_subpel.c similarity index 100% rename from libvips/mosaicing/im_maxpos_subpel.c rename to libvips/deprecated/im_maxpos_subpel.c diff --git a/libvips/mosaicing/mosaicing_dispatch.c b/libvips/deprecated/mosaicing_dispatch.c similarity index 99% rename from libvips/mosaicing/mosaicing_dispatch.c rename to libvips/deprecated/mosaicing_dispatch.c index df724b22..919a4749 100644 --- a/libvips/mosaicing/mosaicing_dispatch.c +++ b/libvips/deprecated/mosaicing_dispatch.c @@ -41,8 +41,6 @@ #include #include -#include "mosaic.h" - /* Merge args. */ static im_arg_desc merge_args[] = { diff --git a/libvips/mosaicing/Makefile.am b/libvips/mosaicing/Makefile.am index f53085c5..35f23916 100644 --- a/libvips/mosaicing/Makefile.am +++ b/libvips/mosaicing/Makefile.am @@ -4,11 +4,8 @@ libmosaicing_la_SOURCES = \ mosaicing.c \ merge.c \ mosaic.c \ - \ - im_align_bands.c \ match.c \ mosaic1.c \ - mosaicing_dispatch.c \ global_balance.c \ im_avgdxdy.c \ im_chkpair.c \ @@ -18,12 +15,11 @@ libmosaicing_la_SOURCES = \ im_lrcalcon.c \ im_lrmerge.c \ im_lrmosaic.c \ - im_maxpos_subpel.c \ im_tbcalcon.c \ im_tbmerge.c \ im_remosaic.c \ im_tbmosaic.c \ global_balance.h \ - mosaic.h + pmosaicing.h AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ diff --git a/libvips/mosaicing/global_balance.c b/libvips/mosaicing/global_balance.c index e1c3884d..02906e8f 100644 --- a/libvips/mosaicing/global_balance.c +++ b/libvips/mosaicing/global_balance.c @@ -110,7 +110,7 @@ #include #include -#include "mosaic.h" +#include "pmosaicing.h" #include "global_balance.h" #define MAX_ITEMS (50) diff --git a/libvips/mosaicing/im_avgdxdy.c b/libvips/mosaicing/im_avgdxdy.c index d709942d..ff4fc63c 100644 --- a/libvips/mosaicing/im_avgdxdy.c +++ b/libvips/mosaicing/im_avgdxdy.c @@ -53,7 +53,7 @@ #include -#include "mosaic.h" +#include "pmosaicing.h" int im__avgdxdy( TIE_POINTS *points, int *dx, int *dy ) diff --git a/libvips/mosaicing/im_chkpair.c b/libvips/mosaicing/im_chkpair.c index ab107ed7..aaa57a1b 100644 --- a/libvips/mosaicing/im_chkpair.c +++ b/libvips/mosaicing/im_chkpair.c @@ -55,7 +55,7 @@ #include -#include "mosaic.h" +#include "pmosaicing.h" /** * im_correl: diff --git a/libvips/mosaicing/im_clinear.c b/libvips/mosaicing/im_clinear.c index f94bfc2c..e53618e3 100644 --- a/libvips/mosaicing/im_clinear.c +++ b/libvips/mosaicing/im_clinear.c @@ -59,7 +59,7 @@ #include #include -#include "mosaic.h" +#include "pmosaicing.h" int im__clinear( TIE_POINTS *points ) diff --git a/libvips/mosaicing/im_improve.c b/libvips/mosaicing/im_improve.c index 69009237..5ca54d45 100644 --- a/libvips/mosaicing/im_improve.c +++ b/libvips/mosaicing/im_improve.c @@ -57,7 +57,7 @@ #include -#include "mosaic.h" +#include "pmosaicing.h" static void copypoints( TIE_POINTS *pnew, TIE_POINTS *pold ) diff --git a/libvips/mosaicing/im_initialize.c b/libvips/mosaicing/im_initialize.c index e0794ca3..d4eda738 100644 --- a/libvips/mosaicing/im_initialize.c +++ b/libvips/mosaicing/im_initialize.c @@ -35,7 +35,7 @@ #include -#include "mosaic.h" +#include "pmosaicing.h" int im__initialize( TIE_POINTS *points ) diff --git a/libvips/mosaicing/im_lrcalcon.c b/libvips/mosaicing/im_lrcalcon.c index 50ae88e5..4b8aa587 100644 --- a/libvips/mosaicing/im_lrcalcon.c +++ b/libvips/mosaicing/im_lrcalcon.c @@ -87,7 +87,7 @@ #include -#include "mosaic.h" +#include "pmosaicing.h" /* A position and contrast. */ diff --git a/libvips/mosaicing/im_lrmerge.c b/libvips/mosaicing/im_lrmerge.c index 090aec4b..f48be53c 100644 --- a/libvips/mosaicing/im_lrmerge.c +++ b/libvips/mosaicing/im_lrmerge.c @@ -132,7 +132,7 @@ #include #include -#include "mosaic.h" +#include "pmosaicing.h" /* Blend luts. Shared between all lr and tb blends. */ diff --git a/libvips/mosaicing/im_lrmosaic.c b/libvips/mosaicing/im_lrmosaic.c index 9ef9f297..b502ce7d 100644 --- a/libvips/mosaicing/im_lrmosaic.c +++ b/libvips/mosaicing/im_lrmosaic.c @@ -64,7 +64,7 @@ #include -#include "mosaic.h" +#include "pmosaicing.h" #ifdef DEBUG static void diff --git a/libvips/mosaicing/im_remosaic.c b/libvips/mosaicing/im_remosaic.c index 21ba024b..8d8729e0 100644 --- a/libvips/mosaicing/im_remosaic.c +++ b/libvips/mosaicing/im_remosaic.c @@ -53,7 +53,7 @@ #include #include -#include "mosaic.h" +#include "pmosaicing.h" #include "global_balance.h" typedef struct { diff --git a/libvips/mosaicing/im_tbcalcon.c b/libvips/mosaicing/im_tbcalcon.c index 0ab8e91b..2d4d445f 100644 --- a/libvips/mosaicing/im_tbcalcon.c +++ b/libvips/mosaicing/im_tbcalcon.c @@ -75,7 +75,7 @@ #include #include -#include "mosaic.h" +#include "pmosaicing.h" int im__tbcalcon( IMAGE *ref, TIE_POINTS *points ) diff --git a/libvips/mosaicing/im_tbmerge.c b/libvips/mosaicing/im_tbmerge.c index 448d0505..eab53e18 100644 --- a/libvips/mosaicing/im_tbmerge.c +++ b/libvips/mosaicing/im_tbmerge.c @@ -114,7 +114,7 @@ #include #include -#include "mosaic.h" +#include "pmosaicing.h" /* Return the position of the first non-zero pel from the top. */ diff --git a/libvips/mosaicing/im_tbmosaic.c b/libvips/mosaicing/im_tbmosaic.c index 29d83bcd..5ebcddb1 100644 --- a/libvips/mosaicing/im_tbmosaic.c +++ b/libvips/mosaicing/im_tbmosaic.c @@ -65,7 +65,7 @@ #include #include -#include "mosaic.h" +#include "pmosaicing.h" int im__find_tboverlap( IMAGE *ref_in, IMAGE *sec_in, IMAGE *out, diff --git a/libvips/mosaicing/match.c b/libvips/mosaicing/match.c index 218c9806..5d0e7640 100644 --- a/libvips/mosaicing/match.c +++ b/libvips/mosaicing/match.c @@ -38,7 +38,7 @@ #include -#include "mosaic.h" +#include "pmosaicing.h" /* Given a pair of points, return scale, angle, dx, dy to resample the 2nd * image with. diff --git a/libvips/mosaicing/mosaic.c b/libvips/mosaicing/mosaic.c index 962f6f6b..8454589a 100644 --- a/libvips/mosaicing/mosaic.c +++ b/libvips/mosaicing/mosaic.c @@ -45,7 +45,7 @@ #include -#include "mosaic.h" +#include "pmosaicing.h" typedef struct { VipsOperation parent_instance; diff --git a/libvips/mosaicing/mosaic1.c b/libvips/mosaicing/mosaic1.c index 534aef3a..794dacfd 100644 --- a/libvips/mosaicing/mosaic1.c +++ b/libvips/mosaicing/mosaic1.c @@ -56,7 +56,7 @@ #include #include -#include "mosaic.h" +#include "pmosaicing.h" /* #define DEBUG diff --git a/libvips/mosaicing/mosaic.h b/libvips/mosaicing/pmosaicing.h similarity index 100% rename from libvips/mosaicing/mosaic.h rename to libvips/mosaicing/pmosaicing.h diff --git a/po/POTFILES.in b/po/POTFILES.in index cb6c3a31..3d1ab458 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -251,15 +251,15 @@ libvips/mosaicing/im_tbmerge.c libvips/mosaicing/im_lrcalcon.c libvips/mosaicing/im_clinear.c libvips/mosaicing/im_remosaic.c -libvips/mosaicing/im_maxpos_subpel.c libvips/mosaicing/im_chkpair.c libvips/mosaicing/im_initialize.c -libvips/mosaicing/im_align_bands.c +libvips/mosaicing/merge.c +libvips/mosaicing/mosaicing.c libvips/mosaicing/mosaic1.c +libvips/mosaicing/mosaic.c libvips/mosaicing/im_lrmerge.c libvips/mosaicing/im_lrmosaic.c libvips/mosaicing/im_improve.c -libvips/mosaicing/mosaicing_dispatch.c libvips/mosaicing/match.c libvips/mosaicing/global_balance.c libvips/resample/interpolate.c @@ -280,7 +280,9 @@ tools/vipsthumbnail.c libvipsCC/VDisplay.cc libvipsCC/VError.cc libvipsCC/VImage.cc +libvipsCC/vipsc++.cc libvipsCC/VMask.cc +libvips/cimg/dummy2.cc libvips/arithmetic/unaryconst.h libvips/arithmetic/nary.h libvips/arithmetic/binary.h @@ -291,6 +293,7 @@ libvips/arithmetic/statistic.h libvipsCC/include/vips/VDisplay.h libvipsCC/include/vips/VError.h libvipsCC/include/vips/VImage.h +libvipsCC/include/vips/vipsc++.h libvipsCC/include/vips/vipscpp.h libvipsCC/include/vips/VMask.h libvips/cimg/CImg.h @@ -375,8 +378,7 @@ libvips/iofuncs/vipsmarshal.h libvips/iofuncs/base64.h libvips/iofuncs/sink.h libvips/morphology/pmorphology.h -libvips/mosaicing/merge.h -libvips/mosaicing/mosaic.h +libvips/mosaicing/pmosaicing.h libvips/mosaicing/global_balance.h libvips/resample/presample.h libvips/resample/templates.h