Simplify phase/rotation correlation dependency.

This commit is contained in:
iabdalkader 2020-11-22 23:46:58 +02:00
parent aab594f2d0
commit e76acbf2f3
7 changed files with 7 additions and 35 deletions

View File

@ -30,12 +30,8 @@
//#define IMLIB_ENABLE_ROTATION_CORR
// Enable phasecorrelate()
#if defined(IMLIB_ENABLE_ROTATION_CORR)
//#define IMLIB_ENABLE_FIND_DISPLACEMENT
// rotation_corr() is required by phasecorrelate()
#if defined(IMLIB_ENABLE_FIND_DISPLACEMENT)\
&& !defined(IMLIB_ENABLE_ROTATION_CORR)
#define IMLIB_ENABLE_ROTATION_CORR
#endif
// Enable get_similarity()

View File

@ -69,12 +69,8 @@
//#define IMLIB_ENABLE_ROTATION_CORR
// Enable phasecorrelate()
#if defined(IMLIB_ENABLE_ROTATION_CORR)
//#define IMLIB_ENABLE_FIND_DISPLACEMENT
// rotation_corr() is required by phasecorrelate()
#if defined(IMLIB_ENABLE_FIND_DISPLACEMENT)\
&& !defined(IMLIB_ENABLE_ROTATION_CORR)
#define IMLIB_ENABLE_ROTATION_CORR
#endif
// Enable get_similarity()

View File

@ -72,12 +72,8 @@
#define IMLIB_ENABLE_ROTATION_CORR
// Enable phasecorrelate()
#if defined(IMLIB_ENABLE_ROTATION_CORR)
#define IMLIB_ENABLE_FIND_DISPLACEMENT
// rotation_corr() is required by phasecorrelate()
#if defined(IMLIB_ENABLE_FIND_DISPLACEMENT)\
&& !defined(IMLIB_ENABLE_ROTATION_CORR)
#define IMLIB_ENABLE_ROTATION_CORR
#endif
// Enable get_similarity()

View File

@ -72,12 +72,8 @@
#define IMLIB_ENABLE_ROTATION_CORR
// Enable phasecorrelate()
#if defined(IMLIB_ENABLE_ROTATION_CORR)
#define IMLIB_ENABLE_FIND_DISPLACEMENT
// rotation_corr() is required by phasecorrelate()
#if defined(IMLIB_ENABLE_FIND_DISPLACEMENT)\
&& !defined(IMLIB_ENABLE_ROTATION_CORR)
#define IMLIB_ENABLE_ROTATION_CORR
#endif
// Enable get_similarity()

View File

@ -72,12 +72,8 @@
#define IMLIB_ENABLE_ROTATION_CORR
// Enable phasecorrelate()
#if defined(IMLIB_ENABLE_ROTATION_CORR)
#define IMLIB_ENABLE_FIND_DISPLACEMENT
// rotation_corr() is required by phasecorrelate()
#if defined(IMLIB_ENABLE_FIND_DISPLACEMENT)\
&& !defined(IMLIB_ENABLE_ROTATION_CORR)
#define IMLIB_ENABLE_ROTATION_CORR
#endif
// Enable get_similarity()

View File

@ -72,12 +72,8 @@
#define IMLIB_ENABLE_ROTATION_CORR
// Enable phasecorrelate()
#if defined(IMLIB_ENABLE_ROTATION_CORR)
#define IMLIB_ENABLE_FIND_DISPLACEMENT
// rotation_corr() is required by phasecorrelate()
#if defined(IMLIB_ENABLE_FIND_DISPLACEMENT)\
&& !defined(IMLIB_ENABLE_ROTATION_CORR)
#define IMLIB_ENABLE_ROTATION_CORR
#endif
// Enable get_similarity()

View File

@ -72,12 +72,8 @@
#define IMLIB_ENABLE_ROTATION_CORR
// Enable phasecorrelate()
#if defined(IMLIB_ENABLE_ROTATION_CORR)
#define IMLIB_ENABLE_FIND_DISPLACEMENT
// rotation_corr() is required by phasecorrelate()
#if defined(IMLIB_ENABLE_FIND_DISPLACEMENT)\
&& !defined(IMLIB_ENABLE_ROTATION_CORR)
#define IMLIB_ENABLE_ROTATION_CORR
#endif
// Enable get_similarity()