kwo pushed a commit to branch master. http://git.enlightenment.org/legacy/imlib2_loaders.git/commit/?id=5b2d34394d139f8a20c82b36862fa0d68da6a113
commit 5b2d34394d139f8a20c82b36862fa0d68da6a113 Author: Kim Woelders <k...@woelders.dk> Date: Fri Apr 6 05:52:13 2018 +0200 Use headers for funcion prototypes --- src/modules/loaders/Makefile.am | 10 ++++++---- src/modules/loaders/loader_ani.c | 9 ++------- src/modules/loaders/loader_common.h | 14 ++++++++++++++ src/modules/loaders/loader_eet.c | 8 +------- src/modules/loaders/loader_ico.c | 8 ++------ src/modules/loaders/loader_xcf.c | 27 ++------------------------- src/modules/loaders/loader_xcf.h | 21 +++++++++++++++++++++ src/modules/loaders/loader_xcf_pixelfuncs.c | 22 ++++++++++++---------- 8 files changed, 60 insertions(+), 59 deletions(-) diff --git a/src/modules/loaders/Makefile.am b/src/modules/loaders/Makefile.am index a5cbcf0..00626f8 100644 --- a/src/modules/loaders/Makefile.am +++ b/src/modules/loaders/Makefile.am @@ -23,23 +23,25 @@ $(EET_L) \ $(ICO_L) \ $(XCF_L) -eet_la_SOURCES = loader_eet.c common.h image.h +EXTRA_DIST = color_values.h common.h image.h loader_common.h + +eet_la_SOURCES = loader_eet.c eet_la_CPPFLAGS = @EET_CFLAGS@ eet_la_LDFLAGS = -module -avoid-version eet_la_LIBADD = @EET_LIBS@ eet_la_LIBTOOLFLAGS = --tag=disable-static -xcf_la_SOURCES = loader_xcf.c loader_xcf_pixelfuncs.c image.h common.h color_values.h +xcf_la_SOURCES = loader_xcf.c loader_xcf_pixelfuncs.c loader_xcf.h xcf_la_LDFLAGS = -module -avoid-version xcf_la_LIBADD = xcf_la_LIBTOOLFLAGS = --tag=disable-static -ico_la_SOURCES = loader_ico.c common.h image.h +ico_la_SOURCES = loader_ico.c ico_la_LDFLAGS = -module -avoid-version ico_la_LIBADD = ico_la_LIBTOOLFLAGS = --tag=disable-static -ani_la_SOURCES = loader_ani.c common.h image.h +ani_la_SOURCES = loader_ani.c ani_la_LDFLAGS = -module -avoid-version ani_la_LIBADD = ani_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/loaders/loader_ani.c b/src/modules/loaders/loader_ani.c index 796fea7..629ef9d 100644 --- a/src/modules/loaders/loader_ani.c +++ b/src/modules/loaders/loader_ani.c @@ -27,14 +27,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # include <config.h> #endif -#include "common.h" #include <stdio.h> #include <string.h> #include <X11/Xlib.h> #include <X11/extensions/XShm.h> #include <X11/Xutil.h> -#include "image.h" -#include "color_values.h" + +#include "loader_common.h" /* #define ANI_DBG */ @@ -84,10 +83,6 @@ typedef struct _MsAni static void ani_cleanup (MsAni *ani); -char load(ImlibImage *im, ImlibProgressFunction progress,char progress_granularity, char immediate_load); -char save(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity); -void formats(ImlibLoader *l); - static int ani_read_int8 (FILE *fp, diff --git a/src/modules/loaders/loader_common.h b/src/modules/loaders/loader_common.h new file mode 100644 index 0000000..35f71e0 --- /dev/null +++ b/src/modules/loaders/loader_common.h @@ -0,0 +1,14 @@ +#ifndef __LOADER_COMMON_H +#define __LOADER_COMMON_H 1 + +#include "config.h" +#include "common.h" +#include "image.h" + +char load(ImlibImage * im, ImlibProgressFunction progress, + char progress_granularity, char immediate_load); +char save(ImlibImage * im, ImlibProgressFunction progress, + char progress_granularity); +void formats(ImlibLoader * l); + +#endif /* __LOADER_COMMON_H */ diff --git a/src/modules/loaders/loader_eet.c b/src/modules/loaders/loader_eet.c index 8f079e8..8897488 100644 --- a/src/modules/loaders/loader_eet.c +++ b/src/modules/loaders/loader_eet.c @@ -2,18 +2,12 @@ # include <config.h> #endif -#include "common.h" #include <string.h> #include <X11/Xlib.h> #include <X11/extensions/XShm.h> #include <X11/Xutil.h> -#include "image.h" -char load (ImlibImage *im, ImlibProgressFunction progress, - char progress_granularity, char immediate_load); -char save (ImlibImage *im, ImlibProgressFunction progress, - char progress_granularity); -void formats (ImlibLoader *l); +#include "loader_common.h" #define SWAP32(x) (x) = \ ((((x) & 0x000000ff ) << 24) |\ diff --git a/src/modules/loaders/loader_ico.c b/src/modules/loaders/loader_ico.c index 04f6479..563ded7 100644 --- a/src/modules/loaders/loader_ico.c +++ b/src/modules/loaders/loader_ico.c @@ -27,13 +27,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # include <config.h> #endif -#include "common.h" #include <string.h> #include <X11/Xlib.h> #include <X11/extensions/XShm.h> #include <X11/Xutil.h> -#include "image.h" + #include "color_values.h" +#include "loader_common.h" /* #define ICO_DBG */ @@ -120,10 +120,6 @@ static void ico_read_data(MsIcon *ico, int icon_num); static void ico_load (MsIcon *ico); static int ico_to_imlib (MsIcon *ico, ImlibImage *im); -char load(ImlibImage *im, ImlibProgressFunction progress,char progress_granularity, char immediate_load); -char save(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity); -void formats(ImlibLoader *l); - static int ico_read_int32 (FILE *fp, diff --git a/src/modules/loaders/loader_xcf.c b/src/modules/loaders/loader_xcf.c index e69a24b..ec2dd6d 100644 --- a/src/modules/loaders/loader_xcf.c +++ b/src/modules/loaders/loader_xcf.c @@ -46,7 +46,6 @@ */ - #ifdef HAVE_CONFIG_H # include <config.h> #endif @@ -57,9 +56,9 @@ #include <netinet/in.h> #include <X11/Xlib.h> -#include "common.h" -#include "image.h" #include "color_values.h" +#include "loader_common.h" +#include "loader_xcf.h" /* #define XCF_DBG */ @@ -274,10 +273,6 @@ _image; /* ------------------------------------------------------------------------- prototypes ------------ */ -char load(ImlibImage *im, ImlibProgressFunction progress,char progress_granularity, char immediate_load); -char save(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity); -void formats(ImlibLoader *l); - /* stuff that was adapted from xcf.c */ static void xcf_seek_pos (int pos); @@ -315,24 +310,6 @@ static char xcf_file_init(char* filename); static void xcf_cleanup(void); static void xcf_to_imlib(ImlibImage *im); -/* Stuff for layer merging: -*/ -extern void combine_pixels_normal (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); -extern void combine_pixels_add (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); -extern void combine_pixels_sub (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); -extern void combine_pixels_diff (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); -extern void combine_pixels_darken (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); -extern void combine_pixels_lighten (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); -extern void combine_pixels_mult (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); -extern void combine_pixels_div (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); -extern void combine_pixels_screen (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); -extern void combine_pixels_overlay (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); -extern void combine_pixels_hue (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); -extern void combine_pixels_sat (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); -extern void combine_pixels_val (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); -extern void combine_pixels_col (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); -extern void combine_pixels_diss (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); - /* ---------------------------------------------------------------------------- globals ------------ */ diff --git a/src/modules/loaders/loader_xcf.h b/src/modules/loaders/loader_xcf.h new file mode 100644 index 0000000..ae16f3b --- /dev/null +++ b/src/modules/loaders/loader_xcf.h @@ -0,0 +1,21 @@ +#ifndef LOADER_XCF_H +#define LOADER_XCF_H + +/* Stuff for layer merging: */ +extern void combine_pixels_normal (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); +extern void combine_pixels_add (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); +extern void combine_pixels_sub (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); +extern void combine_pixels_diff (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); +extern void combine_pixels_darken (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); +extern void combine_pixels_lighten (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); +extern void combine_pixels_mult (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); +extern void combine_pixels_div (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); +extern void combine_pixels_screen (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); +extern void combine_pixels_overlay (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); +extern void combine_pixels_hue (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); +extern void combine_pixels_sat (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); +extern void combine_pixels_val (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); +extern void combine_pixels_col (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); +extern void combine_pixels_diss (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y); + +#endif /* LOADER_XCF_H */ diff --git a/src/modules/loaders/loader_xcf_pixelfuncs.c b/src/modules/loaders/loader_xcf_pixelfuncs.c index 93a9a61..cae217a 100644 --- a/src/modules/loaders/loader_xcf_pixelfuncs.c +++ b/src/modules/loaders/loader_xcf_pixelfuncs.c @@ -30,6 +30,7 @@ #include "common.h" #include "image.h" #include "color_values.h" +#include "loader_xcf.h" #ifdef XCF_DBG #define D(s) \ @@ -54,7 +55,7 @@ #define INT_MULT(a,b,t) ((t) = (a) * (b) + 0x80, ((((t) >> 8) + (t)) >> 8)) #define LINEAR(x,y,w) ((w*y + x)*4) -void +static void rgb_to_hls (DATA8 *red, DATA8 *green, DATA8 *blue) { int r, g, b; @@ -114,7 +115,7 @@ rgb_to_hls (DATA8 *red, DATA8 *green, DATA8 *blue) } -DATA8 +static DATA8 gimp_hls_value (double n1, double n2, double hue) { double value; @@ -136,7 +137,7 @@ gimp_hls_value (double n1, double n2, double hue) } -void +static void hls_to_rgb (DATA8 *hue, DATA8 *lightness, DATA8 *saturation) { double h, l, s; @@ -170,7 +171,7 @@ hls_to_rgb (DATA8 *hue, DATA8 *lightness, DATA8 *saturation) } -void +static void rgb_to_hsv (DATA8 *red, DATA8 *green, DATA8 *blue) { int r, g, b; @@ -226,7 +227,7 @@ rgb_to_hsv (DATA8 *red, DATA8 *green, DATA8 *blue) *blue = v; } -void +static void hsv_to_rgb (DATA8 *hue, DATA8 *saturation, DATA8 *value) { double h, s, v; @@ -291,10 +292,11 @@ hsv_to_rgb (DATA8 *hue, DATA8 *saturation, DATA8 *value) } /* translate negative destinations */ -void _clip(int * src_tl_x, int * src_tl_y, - int * src_br_x, int * src_br_y, - int * dest_x, int * dest_y, - int dest_w, int dest_h) +static void +_clip(int * src_tl_x, int * src_tl_y, + int * src_br_x, int * src_br_y, + int * dest_x, int * dest_y, + int dest_w, int dest_h) { if (*dest_x + *src_br_x >= dest_w) { *src_br_x -= (*dest_x + *src_br_x) - dest_w; } @@ -613,7 +615,7 @@ combine_pixels_overlay (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_ } -void +static void combine_pixels_hsv (DATA8* src, int src_w, int src_h, DATA8* dest, int dest_w, int dest_h, int dest_x, int dest_y, int mode) { int x, y, s_idx, d_idx; --