sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

finish mosaicing rewrite

Browse Source
This commit is contained in:
John Cupitt 2014-05-29 09:35:17 +01:00
parent 8a38cb1946
commit e7743ddc3c
25 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -35,6 +35,7 @@
- added Travis CI config, thanks Lovell - added Travis CI config, thanks Lovell
- im_*merge(), im_*mosaic(), im_match*(), im_global_balance*(), im_remosaic(), - im_*merge(), im_*mosaic(), im_match*(), im_global_balance*(), im_remosaic(),
im_*mosaic1(), im_*merge1() redone as classes im_*mosaic1(), im_*merge1() redone as classes
- better filename tracking for globalbalance
6/3/14 started 7.38.6 6/3/14 started 7.38.6
- grey ramp minimum was wrong - grey ramp minimum was wrong

8
TODO
View File

@ -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. - can we use postbuild elsewhere? look at use of "preclose" / "written", etc.

3
libvips/deprecated/Makefile.am
View File

@ -10,6 +10,9 @@ libdeprecated_la_SOURCES = \
im_openslide2vips.c \ im_openslide2vips.c \
im_lab_morph.c \ im_lab_morph.c \
deprecated_dispatch.c \ deprecated_dispatch.c \
mosaicing_dispatch.c \
im_maxpos_subpel.c \
im_align_bands.c \
morph_dispatch.c \ morph_dispatch.c \
colour_dispatch.c \ colour_dispatch.c \
convol_dispatch.c \ convol_dispatch.c \

0
libvips/mosaicing/im_align_bands.c → libvips/deprecated/im_align_bands.c
View File

0
libvips/mosaicing/im_maxpos_subpel.c → libvips/deprecated/im_maxpos_subpel.c
View File

2
libvips/mosaicing/mosaicing_dispatch.c → libvips/deprecated/mosaicing_dispatch.c
View File

@ -41,8 +41,6 @@
#include <vips/internal.h> #include <vips/internal.h>
#include <vips/transform.h> #include <vips/transform.h>
#include "mosaic.h"
/* Merge args. /* Merge args.
*/ */
static im_arg_desc merge_args[] = { static im_arg_desc merge_args[] = {

6
libvips/mosaicing/Makefile.am
View File

@ -4,11 +4,8 @@ libmosaicing_la_SOURCES = \
mosaicing.c \ mosaicing.c \
merge.c \ merge.c \
mosaic.c \ mosaic.c \
\
im_align_bands.c \
match.c \ match.c \
mosaic1.c \ mosaic1.c \
mosaicing_dispatch.c \
global_balance.c \ global_balance.c \
im_avgdxdy.c \ im_avgdxdy.c \
im_chkpair.c \ im_chkpair.c \
@ -18,12 +15,11 @@ libmosaicing_la_SOURCES = \
im_lrcalcon.c \ im_lrcalcon.c \
im_lrmerge.c \ im_lrmerge.c \
im_lrmosaic.c \ im_lrmosaic.c \
im_maxpos_subpel.c \
im_tbcalcon.c \ im_tbcalcon.c \
im_tbmerge.c \ im_tbmerge.c \
im_remosaic.c \ im_remosaic.c \
im_tbmosaic.c \ im_tbmosaic.c \
global_balance.h \ global_balance.h \
mosaic.h pmosaicing.h
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@

2
libvips/mosaicing/global_balance.c
View File

@ -110,7 +110,7 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/transform.h> #include <vips/transform.h>
#include "mosaic.h" #include "pmosaicing.h"
#include "global_balance.h" #include "global_balance.h"
#define MAX_ITEMS (50) #define MAX_ITEMS (50)

2
libvips/mosaicing/im_avgdxdy.c
View File

@ -53,7 +53,7 @@
#include <vips/vips.h> #include <vips/vips.h>
#include "mosaic.h" #include "pmosaicing.h"
int int
im__avgdxdy( TIE_POINTS *points, int *dx, int *dy ) im__avgdxdy( TIE_POINTS *points, int *dx, int *dy )

2
libvips/mosaicing/im_chkpair.c
View File

@ -55,7 +55,7 @@
#include <vips/vips.h> #include <vips/vips.h>
#include "mosaic.h" #include "pmosaicing.h"
/** /**
* im_correl: * im_correl:

2
libvips/mosaicing/im_clinear.c
View File

@ -59,7 +59,7 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#include "mosaic.h" #include "pmosaicing.h"
int int
im__clinear( TIE_POINTS *points ) im__clinear( TIE_POINTS *points )

2
libvips/mosaicing/im_improve.c
View File

@ -57,7 +57,7 @@
#include <vips/vips.h> #include <vips/vips.h>
#include "mosaic.h" #include "pmosaicing.h"
static void static void
copypoints( TIE_POINTS *pnew, TIE_POINTS *pold ) copypoints( TIE_POINTS *pnew, TIE_POINTS *pold )

2
libvips/mosaicing/im_initialize.c
View File

@ -35,7 +35,7 @@
#include <vips/vips.h> #include <vips/vips.h>
#include "mosaic.h" #include "pmosaicing.h"
int int
im__initialize( TIE_POINTS *points ) im__initialize( TIE_POINTS *points )

2
libvips/mosaicing/im_lrcalcon.c
View File

@ -87,7 +87,7 @@
#include <vips/vips.h> #include <vips/vips.h>
#include "mosaic.h" #include "pmosaicing.h"
/* A position and contrast. /* A position and contrast.
*/ */

2
libvips/mosaicing/im_lrmerge.c
View File

@ -132,7 +132,7 @@
#include <vips/transform.h> #include <vips/transform.h>
#include <vips/internal.h> #include <vips/internal.h>
#include "mosaic.h" #include "pmosaicing.h"
/* Blend luts. Shared between all lr and tb blends. /* Blend luts. Shared between all lr and tb blends.
*/ */

2
libvips/mosaicing/im_lrmosaic.c
View File

@ -64,7 +64,7 @@
#include <vips/vips.h> #include <vips/vips.h>
#include "mosaic.h" #include "pmosaicing.h"
#ifdef DEBUG #ifdef DEBUG
static void static void

2
libvips/mosaicing/im_remosaic.c
View File

@ -53,7 +53,7 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/transform.h> #include <vips/transform.h>
#include "mosaic.h" #include "pmosaicing.h"
#include "global_balance.h" #include "global_balance.h"
typedef struct { typedef struct {

2
libvips/mosaicing/im_tbcalcon.c
View File

@ -75,7 +75,7 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#include "mosaic.h" #include "pmosaicing.h"
int int
im__tbcalcon( IMAGE *ref, TIE_POINTS *points ) im__tbcalcon( IMAGE *ref, TIE_POINTS *points )

2
libvips/mosaicing/im_tbmerge.c
View File

@ -114,7 +114,7 @@
#include <vips/transform.h> #include <vips/transform.h>
#include <vips/internal.h> #include <vips/internal.h>
#include "mosaic.h" #include "pmosaicing.h"
/* Return the position of the first non-zero pel from the top. /* Return the position of the first non-zero pel from the top.
*/ */

2
libvips/mosaicing/im_tbmosaic.c
View File

@ -65,7 +65,7 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#include "mosaic.h" #include "pmosaicing.h"
int int
im__find_tboverlap( IMAGE *ref_in, IMAGE *sec_in, IMAGE *out, im__find_tboverlap( IMAGE *ref_in, IMAGE *sec_in, IMAGE *out,

2
libvips/mosaicing/match.c
View File

@ -38,7 +38,7 @@
#include <vips/vips.h> #include <vips/vips.h>
#include "mosaic.h" #include "pmosaicing.h"
/* Given a pair of points, return scale, angle, dx, dy to resample the 2nd /* Given a pair of points, return scale, angle, dx, dy to resample the 2nd
* image with. * image with.

2
libvips/mosaicing/mosaic.c
View File

@ -45,7 +45,7 @@
#include <vips/vips.h> #include <vips/vips.h>
#include "mosaic.h" #include "pmosaicing.h"
typedef struct { typedef struct {
VipsOperation parent_instance; VipsOperation parent_instance;

2
libvips/mosaicing/mosaic1.c
View File

@ -56,7 +56,7 @@
#include <vips/buf.h> #include <vips/buf.h>
#include <vips/transform.h> #include <vips/transform.h>
#include "mosaic.h" #include "pmosaicing.h"
/* /*
#define DEBUG #define DEBUG

0
libvips/mosaicing/mosaic.h → libvips/mosaicing/pmosaicing.h
View File

12
po/POTFILES.in
View File

@ -251,15 +251,15 @@ libvips/mosaicing/im_tbmerge.c
libvips/mosaicing/im_lrcalcon.c libvips/mosaicing/im_lrcalcon.c
libvips/mosaicing/im_clinear.c libvips/mosaicing/im_clinear.c
libvips/mosaicing/im_remosaic.c libvips/mosaicing/im_remosaic.c
libvips/mosaicing/im_maxpos_subpel.c
libvips/mosaicing/im_chkpair.c libvips/mosaicing/im_chkpair.c
libvips/mosaicing/im_initialize.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/mosaic1.c
libvips/mosaicing/mosaic.c
libvips/mosaicing/im_lrmerge.c libvips/mosaicing/im_lrmerge.c
libvips/mosaicing/im_lrmosaic.c libvips/mosaicing/im_lrmosaic.c
libvips/mosaicing/im_improve.c libvips/mosaicing/im_improve.c
libvips/mosaicing/mosaicing_dispatch.c
libvips/mosaicing/match.c libvips/mosaicing/match.c
libvips/mosaicing/global_balance.c libvips/mosaicing/global_balance.c
libvips/resample/interpolate.c libvips/resample/interpolate.c
@ -280,7 +280,9 @@ tools/vipsthumbnail.c
libvipsCC/VDisplay.cc libvipsCC/VDisplay.cc
libvipsCC/VError.cc libvipsCC/VError.cc
libvipsCC/VImage.cc libvipsCC/VImage.cc
libvipsCC/vipsc++.cc
libvipsCC/VMask.cc libvipsCC/VMask.cc
libvips/cimg/dummy2.cc
libvips/arithmetic/unaryconst.h libvips/arithmetic/unaryconst.h
libvips/arithmetic/nary.h libvips/arithmetic/nary.h
libvips/arithmetic/binary.h libvips/arithmetic/binary.h
@ -291,6 +293,7 @@ libvips/arithmetic/statistic.h
libvipsCC/include/vips/VDisplay.h libvipsCC/include/vips/VDisplay.h
libvipsCC/include/vips/VError.h libvipsCC/include/vips/VError.h
libvipsCC/include/vips/VImage.h libvipsCC/include/vips/VImage.h
libvipsCC/include/vips/vipsc++.h
libvipsCC/include/vips/vipscpp.h libvipsCC/include/vips/vipscpp.h
libvipsCC/include/vips/VMask.h libvipsCC/include/vips/VMask.h
libvips/cimg/CImg.h libvips/cimg/CImg.h
@ -375,8 +378,7 @@ libvips/iofuncs/vipsmarshal.h
libvips/iofuncs/base64.h libvips/iofuncs/base64.h
libvips/iofuncs/sink.h libvips/iofuncs/sink.h
libvips/morphology/pmorphology.h libvips/morphology/pmorphology.h
libvips/mosaicing/merge.h libvips/mosaicing/pmosaicing.h
libvips/mosaicing/mosaic.h
libvips/mosaicing/global_balance.h libvips/mosaicing/global_balance.h
libvips/resample/presample.h libvips/resample/presample.h
libvips/resample/templates.h libvips/resample/templates.h