This commit is contained in:
John Cupitt 2009-07-06 08:12:37 +00:00
parent 9b3a0d6919
commit 19bacc7c81
2 changed files with 25 additions and 23 deletions

6
TODO
View File

@ -1,5 +1,11 @@
- look at gtk-doc? installed now - look at gtk-doc? installed now
- try the new liboil thing:
http://www.schleef.org/orc/
pick something like abs and time it
- gbandjoin in Python seems to be broken - gbandjoin in Python seems to be broken
a = VImage.VImage.gbandjoin ([a, a, a]) a = VImage.VImage.gbandjoin ([a, a, a])

View File

@ -1,12 +1,10 @@
/*!\file mosaic.h /* @(#) Local definitions used by the mosaicing program
* \brief Local definitions used by the mosaicing program. * @(#) If IM_MAXPOINTS change please ensure that it is still a multiple of
* * @(#) AREAS or else AREAS must change as well. Initial setup is for
* If IM_MAXPOINTS change please ensure that it is still a multiple of * @(#) IM_MAXPOINTS = 60, AREAS = 3.
* AREAS or else AREAS must change as well. Initial setup is for * @(#)
* IM_MAXPOINTS = 60, AREAS = 3.
*
* Copyright: 1990, 1991 N. Dessipris * Copyright: 1990, 1991 N. Dessipris
* @Author: Nicos Dessipris, K Martinez, J Cupitt * Author: Nicos Dessipris
* Written on: 07/11/1989 * Written on: 07/11/1989
* Modified on : 29/11/1989 * Modified on : 29/11/1989
*/ */
@ -39,35 +37,33 @@
#define IM_MAXPOINTS (60) /* IM_MAXPOINTS % AREAS must be zero */ #define IM_MAXPOINTS (60) /* IM_MAXPOINTS % AREAS must be zero */
#define AREAS (3) #define AREAS (3)
/**
* mosaic struct used to define all the parameters
*/
typedef struct {
char *reference; /**< filename of reference image*/
char *secondary; /**< filename of secondary image*/
int deltax; /**< initial estimate of displacement */
int deltay; /**< initial estimate of displacement */
int nopoints; /**< must be multiple of AREAS and <= IM_MAXPOINTS */
int halfcorsize; /**< half the correlation area size: recommended 5 */
int halfareasize; /**< recommended 8 */
/** x, y_reference and contrast found by im_calcon() typedef struct {
char *reference; /* filename of reference */
char *secondary; /* filename of secondary */
int deltax; /* initial estimate of displacement */
int deltay; /* initial estimate of displacement */
int nopoints; /* must be multiple of AREAS and <= IM_MAXPOINTS */
int halfcorsize; /* recommended 5 */
int halfareasize; /* recommended 8 */
/* x, y_reference and contrast found by im_calcon()
*/ */
int x_reference[IM_MAXPOINTS], y_reference[IM_MAXPOINTS]; int x_reference[IM_MAXPOINTS], y_reference[IM_MAXPOINTS];
int contrast[IM_MAXPOINTS]; int contrast[IM_MAXPOINTS];
/** x, y_secondary and correlation set by im_chkpair() /* x, y_secondary and correlation set by im_chkpair()
*/ */
int x_secondary[IM_MAXPOINTS], y_secondary[IM_MAXPOINTS]; int x_secondary[IM_MAXPOINTS], y_secondary[IM_MAXPOINTS];
/** returns the corrected best correlation /* returns the corrected best correlation
* as detected in 2*halfareasize+1 * as detected in 2*halfareasize+1
* centered at point (x2, y2) and using * centered at point (x2, y2) and using
* correlation area 2*halfareasize+1 * correlation area 2*halfareasize+1
*/ */
double correlation[IM_MAXPOINTS]; double correlation[IM_MAXPOINTS];
/** Coefficients calculated by im_clinear() /* Coefficients calculated by im_clinear()
*/ */
double l_scale, l_angle, l_deltax, l_deltay; double l_scale, l_angle, l_deltax, l_deltay;