diff options
| author | Erik Reckase <e.reckase@gmail.com> | 2011-08-24 03:55:09 +0000 |
|---|---|---|
| committer | Scott Draves <spot@draves.org> | 2015-02-15 12:20:15 -0500 |
| commit | 026dba70a78090b9ce26506fd432c7ae88e10fed (patch) | |
| tree | a95f4c0af0609ae3828856da66bb614c3dad3589 | |
| parent | 16b94f925733a5e6107eb314429d2f834e59eeff (diff) | |
| download | pucket-026dba70a78090b9ce26506fd432c7ae88e10fed.tar.gz pucket-026dba70a78090b9ce26506fd432c7ae88e10fed.tar.bz2 pucket-026dba70a78090b9ce26506fd432c7ae88e10fed.zip | |
moved #defines from filters.h to flam3.h so that they can be used by external programs
git-svn-id: https://flam3.googlecode.com/svn/trunk@162 77852712-ef1d-11de-8684-7d64432d61a3
| -rw-r--r-- | src/filters.h | 21 | ||||
| -rw-r--r-- | src/flam3.h | 23 |
2 files changed, 23 insertions, 21 deletions
diff --git a/src/filters.h b/src/filters.h index 980bb8b..c7c18a2 100644 --- a/src/filters.h +++ b/src/filters.h @@ -23,27 +23,6 @@ #define DE_THRESH 100 -/* Spatial filter kernels */ -#define flam3_gaussian_kernel 0 -#define flam3_hermite_kernel 1 -#define flam3_box_kernel 2 -#define flam3_triangle_kernel 3 -#define flam3_bell_kernel 4 -#define flam3_b_spline_kernel 5 -#define flam3_lanczos3_kernel 6 -#define flam3_lanczos2_kernel 7 -#define flam3_mitchell_kernel 8 -#define flam3_blackman_kernel 9 -#define flam3_catrom_kernel 10 -#define flam3_hamming_kernel 11 -#define flam3_hanning_kernel 12 -#define flam3_quadratic_kernel 13 - -/* Temporal filters */ -#define flam3_temporal_box 0 -#define flam3_temporal_gaussian 1 -#define flam3_temporal_exp 2 - typedef struct { int max_filtered_counts; int max_filter_index; diff --git a/src/flam3.h b/src/flam3.h index 44e6d29..f46e09e 100644 --- a/src/flam3.h +++ b/src/flam3.h @@ -665,4 +665,27 @@ flam3_genome *sheep_edge(flam3_genome *cp, double blend, int seqflag, double sta #define CROSS_INTERPOLATE 1 #define CROSS_ALTERNATE 2 +/* Filters */ +/* Spatial filter kernels */ +#define flam3_gaussian_kernel 0 +#define flam3_hermite_kernel 1 +#define flam3_box_kernel 2 +#define flam3_triangle_kernel 3 +#define flam3_bell_kernel 4 +#define flam3_b_spline_kernel 5 +#define flam3_lanczos3_kernel 6 +#define flam3_lanczos2_kernel 7 +#define flam3_mitchell_kernel 8 +#define flam3_blackman_kernel 9 +#define flam3_catrom_kernel 10 +#define flam3_hamming_kernel 11 +#define flam3_hanning_kernel 12 +#define flam3_quadratic_kernel 13 + +/* Temporal filters */ +#define flam3_temporal_box 0 +#define flam3_temporal_gaussian 1 +#define flam3_temporal_exp 2 + + #endif |