dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cosmetics. 

2003-09-18  Sven Neumann  <sven@gimp.org>

	* app/composite/gimp-composite.[ch]: cosmetics.
This commit is contained in:
Sven Neumann 2003-09-18 12:18:02 +00:00 committed by Sven Neumann
parent 8010bf3cf2
commit 8c34627a76
3 changed files with 65 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2003-09-18 Sven Neumann <sven@gimp.org>
* app/composite/gimp-composite.[ch]: cosmetics.
2003-09-18 Sven Neumann <sven@gimp.org> 2003-09-18 Sven Neumann <sven@gimp.org>
* app/vectors/gimpvectors-export.c (gimp_vectors_export): always * app/vectors/gimpvectors-export.c (gimp_vectors_export): always

98
app/composite/gimp-composite.c
View File

@ -175,15 +175,17 @@ struct GimpCompositeOperationEffects gimp_composite_operation_effects[] =
{ FALSE, FALSE, FALSE }, /* GIMP_CONVERT */ { FALSE, FALSE, FALSE }, /* GIMP_CONVERT */
}; };
struct { struct
char announce_function; {
gchar announce_function;
} gimp_composite_debug; } gimp_composite_debug;
struct GimpCompositeOptions gimp_composite_options = { struct GimpCompositeOptions gimp_composite_options =
{
GIMP_COMPOSITE_OPTION_USE GIMP_COMPOSITE_OPTION_USE
}; };
char *gimp_composite_function_name[GIMP_COMPOSITE_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N]; gchar * gimp_composite_function_name[GIMP_COMPOSITE_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N];
void (*gimp_composite_function[GIMP_COMPOSITE_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N])(GimpCompositeContext *); void (*gimp_composite_function[GIMP_COMPOSITE_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N])(GimpCompositeContext *);
void void
@ -204,6 +206,7 @@ gimp_composite_dispatch (GimpCompositeContext *ctx)
gimp_composite_pixelformat_astext(ctx->pixelformat_D), gimp_composite_pixelformat_astext(ctx->pixelformat_D),
function); function);
} }
(*function) (ctx); (*function) (ctx);
} }
else else
@ -229,50 +232,51 @@ gimp_composite_context_print (GimpCompositeContext *ctx)
ctx->n_pixels); ctx->n_pixels);
} }
char * const gchar *
gimp_composite_mode_astext (GimpCompositeOperation op) gimp_composite_mode_astext (GimpCompositeOperation op)
{ {
switch (op) { switch (op)
case GIMP_COMPOSITE_NORMAL: return ("GIMP_COMPOSITE_NORMAL"); {
case GIMP_COMPOSITE_DISSOLVE: return ("GIMP_COMPOSITE_DISSOLVE"); case GIMP_COMPOSITE_NORMAL: return ("GIMP_COMPOSITE_NORMAL");
case GIMP_COMPOSITE_BEHIND: return ("GIMP_COMPOSITE_BEHIND"); case GIMP_COMPOSITE_DISSOLVE: return ("GIMP_COMPOSITE_DISSOLVE");
case GIMP_COMPOSITE_MULTIPLY: return ("GIMP_COMPOSITE_MULTIPLY"); case GIMP_COMPOSITE_BEHIND: return ("GIMP_COMPOSITE_BEHIND");
case GIMP_COMPOSITE_SCREEN: return ("GIMP_COMPOSITE_SCREEN"); case GIMP_COMPOSITE_MULTIPLY: return ("GIMP_COMPOSITE_MULTIPLY");
case GIMP_COMPOSITE_OVERLAY: return ("GIMP_COMPOSITE_OVERLAY"); case GIMP_COMPOSITE_SCREEN: return ("GIMP_COMPOSITE_SCREEN");
case GIMP_COMPOSITE_DIFFERENCE: return ("GIMP_COMPOSITE_DIFFERENCE"); case GIMP_COMPOSITE_OVERLAY: return ("GIMP_COMPOSITE_OVERLAY");
case GIMP_COMPOSITE_ADDITION: return ("GIMP_COMPOSITE_ADDITION"); case GIMP_COMPOSITE_DIFFERENCE: return ("GIMP_COMPOSITE_DIFFERENCE");
case GIMP_COMPOSITE_SUBTRACT: return ("GIMP_COMPOSITE_SUBTRACT"); case GIMP_COMPOSITE_ADDITION: return ("GIMP_COMPOSITE_ADDITION");
case GIMP_COMPOSITE_DARKEN: return ("GIMP_COMPOSITE_DARKEN"); case GIMP_COMPOSITE_SUBTRACT: return ("GIMP_COMPOSITE_SUBTRACT");
case GIMP_COMPOSITE_LIGHTEN: return ("GIMP_COMPOSITE_LIGHTEN"); case GIMP_COMPOSITE_DARKEN: return ("GIMP_COMPOSITE_DARKEN");
case GIMP_COMPOSITE_HUE: return ("GIMP_COMPOSITE_HUE"); case GIMP_COMPOSITE_LIGHTEN: return ("GIMP_COMPOSITE_LIGHTEN");
case GIMP_COMPOSITE_SATURATION: return ("GIMP_COMPOSITE_SATURATION"); case GIMP_COMPOSITE_HUE: return ("GIMP_COMPOSITE_HUE");
case GIMP_COMPOSITE_COLOR_ONLY: return ("GIMP_COMPOSITE_COLOR_ONLY"); case GIMP_COMPOSITE_SATURATION: return ("GIMP_COMPOSITE_SATURATION");
case GIMP_COMPOSITE_VALUE: return ("GIMP_COMPOSITE_VALUE"); case GIMP_COMPOSITE_COLOR_ONLY: return ("GIMP_COMPOSITE_COLOR_ONLY");
case GIMP_COMPOSITE_DIVIDE: return ("GIMP_COMPOSITE_DIVIDE"); case GIMP_COMPOSITE_VALUE: return ("GIMP_COMPOSITE_VALUE");
case GIMP_COMPOSITE_DODGE: return ("GIMP_COMPOSITE_DODGE"); case GIMP_COMPOSITE_DIVIDE: return ("GIMP_COMPOSITE_DIVIDE");
case GIMP_COMPOSITE_BURN: return ("GIMP_COMPOSITE_BURN"); case GIMP_COMPOSITE_DODGE: return ("GIMP_COMPOSITE_DODGE");
case GIMP_COMPOSITE_HARDLIGHT: return ("GIMP_COMPOSITE_HARDLIGHT"); case GIMP_COMPOSITE_BURN: return ("GIMP_COMPOSITE_BURN");
case GIMP_COMPOSITE_SOFTLIGHT: return ("GIMP_COMPOSITE_SOFTLIGHT"); case GIMP_COMPOSITE_HARDLIGHT: return ("GIMP_COMPOSITE_HARDLIGHT");
case GIMP_COMPOSITE_GRAIN_EXTRACT: return ("GIMP_COMPOSITE_GRAIN_EXTRACT"); case GIMP_COMPOSITE_SOFTLIGHT: return ("GIMP_COMPOSITE_SOFTLIGHT");
case GIMP_COMPOSITE_GRAIN_MERGE: return ("GIMP_COMPOSITE_GRAIN_MERGE"); case GIMP_COMPOSITE_GRAIN_EXTRACT: return ("GIMP_COMPOSITE_GRAIN_EXTRACT");
case GIMP_COMPOSITE_COLOR_ERASE: return ("GIMP_COMPOSITE_COLOR_ERASE"); case GIMP_COMPOSITE_GRAIN_MERGE: return ("GIMP_COMPOSITE_GRAIN_MERGE");
case GIMP_COMPOSITE_ERASE: return ("GIMP_COMPOSITE_ERASE"); case GIMP_COMPOSITE_COLOR_ERASE: return ("GIMP_COMPOSITE_COLOR_ERASE");
case GIMP_COMPOSITE_REPLACE: return ("GIMP_COMPOSITE_REPLACE"); case GIMP_COMPOSITE_ERASE: return ("GIMP_COMPOSITE_ERASE");
case GIMP_COMPOSITE_ANTI_ERASE: return ("GIMP_COMPOSITE_ANTI_ERASE"); case GIMP_COMPOSITE_REPLACE: return ("GIMP_COMPOSITE_REPLACE");
case GIMP_COMPOSITE_BLEND: return ("GIMP_COMPOSITE_BLEND"); case GIMP_COMPOSITE_ANTI_ERASE: return ("GIMP_COMPOSITE_ANTI_ERASE");
case GIMP_COMPOSITE_SHADE: return ("GIMP_COMPOSITE_SHADE"); case GIMP_COMPOSITE_BLEND: return ("GIMP_COMPOSITE_BLEND");
case GIMP_COMPOSITE_SWAP: return ("GIMP_COMPOSITE_SWAP"); case GIMP_COMPOSITE_SHADE: return ("GIMP_COMPOSITE_SHADE");
case GIMP_COMPOSITE_SCALE: return ("GIMP_COMPOSITE_SCALE"); case GIMP_COMPOSITE_SWAP: return ("GIMP_COMPOSITE_SWAP");
case GIMP_COMPOSITE_CONVERT: return ("GIMP_COMPOSITE_CONVERT"); case GIMP_COMPOSITE_SCALE: return ("GIMP_COMPOSITE_SCALE");
case GIMP_COMPOSITE_XOR: return ("GIMP_COMPOSITE_XOR"); case GIMP_COMPOSITE_CONVERT: return ("GIMP_COMPOSITE_CONVERT");
default: case GIMP_COMPOSITE_XOR: return ("GIMP_COMPOSITE_XOR");
break; default:
} break;
}
return ("bad mode"); return ("bad mode");
} }
char * const gchar *
gimp_composite_pixelformat_astext (GimpPixelFormat f) gimp_composite_pixelformat_astext (GimpPixelFormat f)
{ {
switch (f) { switch (f) {
@ -307,7 +311,6 @@ void
gimp_composite_init (void) gimp_composite_init (void)
{ {
const gchar *p; const gchar *p;
guint32 cpu;
if ((p = g_getenv ("GIMP_COMPOSITE"))) if ((p = g_getenv ("GIMP_COMPOSITE")))
{ {
@ -318,11 +321,11 @@ gimp_composite_init (void)
(gimp_composite_options.bits & GIMP_COMPOSITE_OPTION_USE) ? "yes" : "no", (gimp_composite_options.bits & GIMP_COMPOSITE_OPTION_USE) ? "yes" : "no",
(gimp_composite_options.bits & GIMP_COMPOSITE_OPTION_VERBOSE) ? "yes" : "no"); (gimp_composite_options.bits & GIMP_COMPOSITE_OPTION_VERBOSE) ? "yes" : "no");
gimp_composite_generic_install(); gimp_composite_generic_install ();
if (! (gimp_composite_options.bits & GIMP_COMPOSITE_OPTION_INITIALISED)) if (! (gimp_composite_options.bits & GIMP_COMPOSITE_OPTION_INITIALISED))
{ {
cpu = cpu_accel(); guint32 cpu = cpu_accel ();
#ifdef ARCH_X86 #ifdef ARCH_X86
if (cpu & CPU_ACCEL_X86_MMX) if (cpu & CPU_ACCEL_X86_MMX)
@ -332,7 +335,7 @@ gimp_composite_init (void)
gimp_composite_mmx_install (); gimp_composite_mmx_install ();
} }
#if 1 #if 1
if (cpu & CPU_ACCEL_X86_SSE || cpu_accel() & CPU_ACCEL_X86_MMXEXT) if (cpu & CPU_ACCEL_X86_SSE || cpu & CPU_ACCEL_X86_MMXEXT)
{ {
extern void gimp_composite_sse_install (void); extern void gimp_composite_sse_install (void);
g_printerr (" +sse"); g_printerr (" +sse");
@ -372,5 +375,6 @@ gimp_composite_init (void)
gimp_composite_options.bits |= GIMP_COMPOSITE_OPTION_INITIALISED; gimp_composite_options.bits |= GIMP_COMPOSITE_OPTION_INITIALISED;
} }
g_printerr ("\n");
g_printerr ("\n");
} }

12
app/composite/gimp-composite.h
View File

@ -148,14 +148,14 @@ struct GimpCompositeOptions {
extern struct GimpCompositeOptions gimp_composite_options; extern struct GimpCompositeOptions gimp_composite_options;
extern void gimp_composite_dispatch(GimpCompositeContext *); void gimp_composite_init (void);
extern void gimp_composite_init(void); void gimp_composite_dispatch (GimpCompositeContext *);
extern void gimp_composite_context_print(GimpCompositeContext *); void gimp_composite_context_print (GimpCompositeContext *);
extern char *gimp_composite_mode_astext(GimpCompositeOperation); const gchar * gimp_composite_mode_astext (GimpCompositeOperation);
extern char *gimp_composite_pixelformat_astext(GimpPixelFormat); const gchar * gimp_composite_pixelformat_astext (GimpPixelFormat);
extern char *gimp_composite_function_name[GIMP_COMPOSITE_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N]; extern gchar *gimp_composite_function_name[GIMP_COMPOSITE_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N];
extern void (*gimp_composite_function[GIMP_COMPOSITE_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N])(GimpCompositeContext *); extern void (*gimp_composite_function[GIMP_COMPOSITE_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N])(GimpCompositeContext *);
#endif /* __GIMP_COMPOSITE_H__ */ #endif /* __GIMP_COMPOSITE_H__ */