finish mosaicing rewrite
This commit is contained in:
John Cupitt
parent
8a38cb1946
commit
e7743ddc3c
|
|
@ -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
|
||||
|
|
|
|||
8
TODO
8
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.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -41,8 +41,6 @@
|
|||
#include <vips/internal.h>
|
||||
#include <vips/transform.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
|
||||
/* Merge args.
|
||||
*/
|
||||
static im_arg_desc merge_args[] = {
|
||||
|
|
@ -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@
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/transform.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
#include "global_balance.h"
|
||||
|
||||
#define MAX_ITEMS (50)
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
|
||||
int
|
||||
im__avgdxdy( TIE_POINTS *points, int *dx, int *dy )
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
|
||||
/**
|
||||
* im_correl:
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
|
||||
int
|
||||
im__clinear( TIE_POINTS *points )
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
|
||||
static void
|
||||
copypoints( TIE_POINTS *pnew, TIE_POINTS *pold )
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
|
||||
int
|
||||
im__initialize( TIE_POINTS *points )
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
|
||||
/* A position and contrast.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@
|
|||
#include <vips/transform.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
|
||||
/* Blend luts. Shared between all lr and tb blends.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
|
||||
#ifdef DEBUG
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/transform.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
#include "global_balance.h"
|
||||
|
||||
typedef struct {
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
|
||||
int
|
||||
im__tbcalcon( IMAGE *ref, TIE_POINTS *points )
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@
|
|||
#include <vips/transform.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
|
||||
/* Return the position of the first non-zero pel from the top.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
|
||||
int
|
||||
im__find_tboverlap( IMAGE *ref_in, IMAGE *sec_in, IMAGE *out,
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
|
||||
/* Given a pair of points, return scale, angle, dx, dy to resample the 2nd
|
||||
* image with.
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
|
||||
typedef struct {
|
||||
VipsOperation parent_instance;
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
#include <vips/buf.h>
|
||||
#include <vips/transform.h>
|
||||
|
||||
#include "mosaic.h"
|
||||
#include "pmosaicing.h"
|
||||
|
||||
/*
|
||||
#define DEBUG
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue