From 116749bc7e14e0585ad09bf91ab63175bbe40bf8 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 13 Feb 2015 13:26:02 +0100 Subject: Drop unused, exported functions --- flam3.h | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) (limited to 'flam3.h') diff --git a/flam3.h b/flam3.h index 12b8baf..1874410 100644 --- a/flam3.h +++ b/flam3.h @@ -24,9 +24,7 @@ #include #include "xorshift.h" -#define EXPORT - -EXPORT char *flam3_version(); +char *flam3_version(); #define flam3_palette_random (-1) #define flam3_palette_interpolated (-2) @@ -533,8 +531,8 @@ void flam3_copyx(flam3_genome *dest, flam3_genome *src, int num_std, int num_fin void flam3_copy_params(flam3_xform *dest, flam3_xform *src, int varn); void flam3_delete_motion_elements(flam3_xform *xf); -EXPORT int flam3_xform_preview(flam3_genome *cp, int xi, double range, int numvals, int depth, double *result, randctx *rc); -EXPORT unsigned short* flam3_create_xform_distrib(flam3_genome *cp); +int flam3_xform_preview(flam3_genome *cp, int xi, double range, int numvals, int depth, double *result, randctx *rc); +unsigned short* flam3_create_xform_distrib(flam3_genome *cp); int flam3_create_chaos_distrib(flam3_genome *cp, int xi, unsigned short *xform_distrib); int flam3_check_unity_chaos(flam3_genome *cp); void clear_cp(flam3_genome *cp, int def_flag); @@ -544,39 +542,39 @@ void clear_cp(flam3_genome *cp, int def_flag); (samples[2], samples[3]) as starting color coordinate, perform fuse iterations and throw them away, then perform nsamples iterations and save them in the samples array */ -EXPORT int flam3_iterate(flam3_genome *cp, int n, int fuse, const double4 in, double4 *samples, unsigned short *xform_distrib, randctx *rc); +int flam3_iterate(flam3_genome *cp, int n, int fuse, const double4 in, double4 *samples, unsigned short *xform_distrib, randctx *rc); void apply_motion_parameters(flam3_xform *xf, flam3_xform *addto, double blend); /* genomes is array ngenomes long, with times set and in ascending order. interpolate to the requested time and return in result */ -EXPORT void flam3_interpolate(flam3_genome *genomes, int ngenomes, double time, double stagger, flam3_genome *result); +void flam3_interpolate(flam3_genome *genomes, int ngenomes, double time, double stagger, flam3_genome *result); /* print genome to given file with extra_attributes if not NULL */ -EXPORT void flam3_print(FILE *f, flam3_genome *g, char *extra_attributes, int print_edits); +void flam3_print(FILE *f, flam3_genome *g, char *extra_attributes, int print_edits); void flam3_print_xform(FILE *f, flam3_xform *x, int final_flag, int numstd, double *chaos_row, int motion_flag); -EXPORT char *flam3_print_to_string(flam3_genome *cp); +char *flam3_print_to_string(flam3_genome *cp); /* ivars is a list of variations to use, or flam3_variation_random */ /* ivars_n is the number of values in ivars to select from. */ /* sym is either a symmetry group or 0 meaning random or no symmetry */ /* spec_xforms specifies the number of xforms to use, setting to 0 makes the number random. */ -EXPORT void flam3_random(flam3_genome *g, int *ivars, int ivars_n, int sym, int spec_xforms); +void flam3_random(flam3_genome *g, int *ivars, int ivars_n, int sym, int spec_xforms); void add_to_action(char *action, char *addtoaction); -EXPORT void flam3_mutate(flam3_genome *cp, int mutate_mode, int *ivars, int ivars_n, int sym, double speed, randctx *rc, char *action); -EXPORT void flam3_cross(flam3_genome *cp0, flam3_genome *cp1, flam3_genome *out, int cross_mode, randctx *rc, char *action); +void flam3_mutate(flam3_genome *cp, int mutate_mode, int *ivars, int ivars_n, int sym, double speed, randctx *rc, char *action); +void flam3_cross(flam3_genome *cp0, flam3_genome *cp1, flam3_genome *out, int cross_mode, randctx *rc, char *action); /* return NULL in case of error */ -EXPORT flam3_genome *flam3_parse_xml2(char *s, char *fn, int default_flag, int *ncps); +flam3_genome *flam3_parse_xml2(char *s, char *fn, int default_flag, int *ncps); flam3_genome *flam3_parse_from_file(FILE *f, char *fn, int default_flag, int *ncps); void flam3_add_symmetry(flam3_genome *g, int sym); void flam3_improve_colors(flam3_genome *g, int ntries, int change_palette, int color_resolution); -EXPORT int flam3_colorhist(flam3_genome *cp, int num_batches, randctx *rc, double *hist); -EXPORT int flam3_estimate_bounding_box(flam3_genome *g, double eps, int nsamples, +int flam3_colorhist(flam3_genome *cp, int num_batches, randctx *rc, double *hist); +int flam3_estimate_bounding_box(flam3_genome *g, double eps, int nsamples, double *bmin, double *bmax, randctx *rc); void flam3_rotate(flam3_genome *g, double angle, int interp_type); /* angle in degrees */ @@ -585,7 +583,7 @@ double flam3_lyapunov(flam3_genome *g, int ntries); void flam3_apply_template(flam3_genome *cp, flam3_genome *templ); -EXPORT int flam3_count_nthreads(void); +int flam3_count_nthreads(void); typedef struct { // double temporal_filter_radius; @@ -611,10 +609,9 @@ typedef struct { /* out is pixel array. pixels are rgb or rgba if nchan is 3 or 4. */ -EXPORT int flam3_render(flam3_frame *f, void *out, int field, int nchan, int transp, stat_struct *stats); +int flam3_render(flam3_frame *f, void *out, int field, int nchan, int transp, stat_struct *stats); -EXPORT double flam3_render_memory_required(flam3_frame *f); -EXPORT int flam3_make_strip(flam3_genome *cp, int nstrips, int stripnum); +double flam3_render_memory_required(flam3_frame *f); void rotate_by(double *p, double *center, double by); @@ -627,11 +624,11 @@ double flam3_random_isaac_01(randctx *); double flam3_random_isaac_11(randctx *); int flam3_random_isaac_bit(randctx *); -EXPORT void flam3_init_frame(flam3_frame *f); +void flam3_init_frame(flam3_frame *f); /* External memory helpers */ -EXPORT void *flam3_malloc(size_t size); -EXPORT void flam3_free(void *ptr); +void *flam3_malloc(size_t size); +void flam3_free(void *ptr); void flam3_srandom(); -- cgit v1.2.3