Mercurial > hg > wm
diff Meerwald/wavelet.h @ 8:f83ef905a63d
fixing many warnings
increase capacity for coordinates in bruyn
fix some uninit. variables
author | Peter Meerwald <pmeerw@cosy.sbg.ac.at> |
---|---|
date | Tue, 22 Apr 2008 13:36:05 +0200 |
parents | be303a3f5ea8 |
children |
line wrap: on
line diff
--- a/Meerwald/wavelet.h Wed Apr 16 15:55:52 2008 +0200 +++ b/Meerwald/wavelet.h Tue Apr 22 13:36:05 2008 +0200 @@ -5,10 +5,10 @@ extern char dbgstr[1000]; /* this are internal functions - don't use 'em! */ -extern void out_dbg_str(const char *str); -extern void start_trace(void); -extern void stop_trace(void); -extern void flush_trace_file(void); +void out_dbg_str(const char *str); +void start_trace(void); +void stop_trace(void); +void flush_trace_file(void); /* public functions / macros */ #define StartTrace @@ -158,47 +158,47 @@ /* functions: */ -extern IntImage new_intimage(int width, int height); -extern IntImage load_intimage(char *file, int max_val); -extern void free_intimage(IntImage img); +IntImage new_intimage(int width, int height); +IntImage load_intimage(char *file, int max_val); +void free_intimage(IntImage img); -extern void clear_intimage(IntImage img); -extern void copy_into_intimage(IntImage img1,IntImage img2,int x,int y); -extern void copy_part_of_intimage(IntImage img1,IntImage img2,int x,int y); +void clear_intimage(IntImage img); +void copy_into_intimage(IntImage img1,IntImage img2,int x,int y); +void copy_part_of_intimage(IntImage img1,IntImage img2,int x,int y); -extern Image new_image(int width, int height); -extern void free_image(Image img); -extern void clear_image(Image img); -extern void copy_into_image(Image img1,Image img2,int x,int y); -extern void scale_image(Image img,int maximum); -extern void copy_part_of_image(Image img1,Image img2,int x,int y); +Image new_image(int width, int height); +void free_image(Image img); +void clear_image(Image img); +void copy_into_image(Image img1,Image img2,int x,int y); +void scale_image(Image img,int maximum); +void copy_part_of_image(Image img1,Image img2,int x,int y); -extern void copy_part_of_image_into_image( +void copy_part_of_image_into_image( Image dest_img, int dest_x, int dest_y, Image src_img, int src_x, int src_y, int width, int height); -extern int string_to_pixel(char *str, Pixel *p); +int string_to_pixel(char *str, Pixel *p); -extern Image load_image(char *file, int max_val); -extern int save_image_P5(char *file, Image img); +Image load_image(char *file, int max_val); +int save_image_P5(char *file, Image img); -extern Image intimage_to_image(IntImage i); -extern IntImage image_to_intimage(Image i); +Image intimage_to_image(IntImage i); +IntImage image_to_intimage(Image i); -extern Image_tree new_image_tree(); -extern void free_image_tree(Image_tree t); +Image_tree new_image_tree(); +void free_image_tree(Image_tree t); -extern Image get_difference_image(Image image1, Image image2); +Image get_difference_image(Image image1, Image image2); -extern void get_image_infos(Image image, Image_info info); +void get_image_infos(Image image, Image_info info); -extern void get_intimage_infos(IntImage image, IntPixel *min, IntPixel *max, Pixel *avg, Pixel *var); +void get_intimage_infos(IntImage image, IntPixel *min, IntPixel *max, Pixel *avg, Pixel *var); -extern void init_zigzag(Zigzag_data zz, int width, int height); -extern void next_zigzag(Zigzag_data zz); -extern Image get_absolute_image_scaled(Image img); +void init_zigzag(Zigzag_data zz, int width, int height); +void next_zigzag(Zigzag_data zz); +Image get_absolute_image_scaled(Image img); /* common macros */ @@ -221,33 +221,33 @@ int len; } *Filter; -extern Filter new_filter(int size); +Filter new_filter(int size); -extern int filter_cutoff(Image in, int in_start, int in_len, int in_step, +int filter_cutoff(Image in, int in_start, int in_len, int in_step, Image out, int out_start, int out_len, int out_step, Filter f); -extern int filter_inv_cutoff(Image in, int in_start, int in_len, int in_step, +int filter_inv_cutoff(Image in, int in_start, int in_len, int in_step, Image out, int out_start, int out_len, int out_step, Filter f); -extern int filter_periodical(Image in, int in_start, int in_len, int in_step, +int filter_periodical(Image in, int in_start, int in_len, int in_step, Image out, int out_start, int out_len, int out_step, Filter f); -extern int filter_inv_periodical(Image in, int in_start, int in_len, int in_step, +int filter_inv_periodical(Image in, int in_start, int in_len, int in_step, Image out, int out_start, int out_len, int out_step, Filter f); -extern int filter_mirror(Image in, int in_start, int in_len, int in_step, +int filter_mirror(Image in, int in_start, int in_len, int in_step, Image out, int out_start, int out_len, int out_step, Filter f); -extern int filter_inv_mirror(Image in, int in_start, int in_len, int in_step, +int filter_inv_mirror(Image in, int in_start, int in_len, int in_step, Image out, int out_start, int out_len, int out_step, Filter f); -extern Pixel get_filter_center(Filter f); +Pixel get_filter_center(Filter f); enum FilterGHType { FTOrtho, FTBiOrtho, FTOther}; @@ -263,7 +263,7 @@ } *AllFilters; -extern AllFilters load_filters(char *name); +AllFilters load_filters(char *name); typedef struct SegmentsStruct { int width,height; /* segment width & height*/ @@ -276,59 +276,32 @@ shanon,weak_l,weak_lq,compression_number,compression_numberq, compression_area,compression_areaq,sdiscrepancy,discrepancy,concentration}; -extern Image_tree wavelettransform(Image original,int level,FilterGH *flt,enum FilterMethod method); -extern Image_tree wavelettransform_wp(Image original,int level,FilterGH *flt,enum FilterMethod method); +Image_tree wavelettransform(Image original,int level,FilterGH *flt,enum FilterMethod method); +Image_tree wavelettransform_wp(Image original,int level,FilterGH *flt,enum FilterMethod method); -extern Image_tree best_basis(Image original,int level,FilterGH *flt, +Image_tree best_basis(Image original,int level,FilterGH *flt, enum FilterMethod method,enum Information_Cost cost,double epsilon); -extern Image_tree best_level(Image original,int maxlevel,int *bestlevel,FilterGH *flt,enum FilterMethod method, - enum Information_Cost cost,double epsilon); - -extern Image build_image(Image_tree quadtree,int width,int height); - -extern Image inv_transform(Image_tree quadtree,FilterGH *flt, - enum FilterMethod method); - -extern Image inv_transform_wp(Image_tree quadtree,FilterGH *flt, - enum FilterMethod method); - -extern int rec_double(Image_tree dtree,int level,FilterGH *flt,enum FilterMethod method,enum Information_Cost cost,double epsilon); - -extern Image_tree decompose_to_level(Image original,int level,FilterGH *flt,enum FilterMethod method); - -extern decompose_all(Image_tree tree,int maxlevel,FilterGH *flt,enum FilterMethod method, +Image_tree best_level(Image original,int maxlevel,int *bestlevel,FilterGH *flt,enum FilterMethod method, enum Information_Cost cost,double epsilon); -extern int find_deepest_level(int width,int height); - - /*Selective methods*/ -extern int selectiv_tiling1(Image img,Segments seg,int filternumber,char *file, - enum Information_Cost cost,double epsilon); -extern Image inv_selectiv_tiling1(char *file); +Image build_image(Image_tree quadtree,int width,int height); -extern int selectiv_tiling2(Image img,Segments seg,int filternumber,char *file, - enum Information_Cost cost,double epsilon); -extern Image inv_selectiv_tiling2(char *file); +Image inv_transform(Image_tree quadtree,FilterGH *flt, + enum FilterMethod method); -extern int selectiv_quant1(Image img,IntImage area,int filternumber,char *file, - enum Information_Cost cost,double epsilon); -extern Image inv_selectiv_quant1(char *file); +Image inv_transform_wp(Image_tree quadtree,FilterGH *flt, + enum FilterMethod method); -extern int selectiv_quant2(Image img,IntImage area,int filternumber,char *file, - enum Information_Cost cost,double epsilon); -extern Image inv_selectiv_quant2(char *file); +int rec_double(Image_tree dtree,int level,FilterGH *flt,enum FilterMethod method,enum Information_Cost cost,double epsilon); + +Image_tree decompose_to_level(Image original,int level,FilterGH *flt,enum FilterMethod method); -extern int selectiv_quant3(Image img,IntImage area,int filternumber,char *file, - enum Information_Cost cost,double epsilon); -extern Image inv_selectiv_quant3(char *file); +int decompose_all(Image_tree tree,int maxlevel,FilterGH *flt,enum FilterMethod method, + enum Information_Cost cost,double epsilon); -extern smooth_block(Image img,int x,int y, int width,int height); +int find_deepest_level(int width,int height); -extern compute_map(Image_tree tree,IntImage map); - -extern int *pixelarray_to_intarray(Pixel *pdata,int size); -extern Pixel *intarray_to_pixelarray(int *idata,int size); #define WAVELET_H #endif