callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make gimp-composite functions the default.

Browse Source 
* app/composite/gimp-composite.c (gimp_composite_init): make gimp-composite
  functions the default.

* app/composite/make-installer.py: changed option --n_pixels to --n-pixels
This commit is contained in:
Helvetix Victorinox
2003-08-17 21:19:58 +00:00
parent c2c65b192b
commit 1b33a15e03
3 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2003-08-17 Helvetix Victorinox <helvetix@gimp.org>
* app/composite/gimp-composite.c (gimp_composite_init): make gimp-composite
functions the default.
* app/composite/make-installer.py: changed option --n_pixels to --n-pixels
2003-08-17 Manish Singh <yosh@gimp.org> 2003-08-17 Manish Singh <yosh@gimp.org>
* tools/pdbgen/app.pl: reorg, fix reverse logic for parasite utf8 * tools/pdbgen/app.pl: reorg, fix reverse logic for parasite utf8

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

@ -177,7 +177,9 @@ struct {
char announce_function; char announce_function;
} gimp_composite_debug; } gimp_composite_debug;
struct GimpCompositeOptions gimp_composite_options; struct GimpCompositeOptions gimp_composite_options = {
GIMP_COMPOSITE_OPTION_USE
};
char *gimp_composite_function_name[GIMP_COMPOSITE_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N][GIMP_PIXELFORMAT_N]; char *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 *);
@ -303,41 +305,42 @@ gimp_composite_init (void)
if ((p = g_getenv ("GIMP_COMPOSITE"))) if ((p = g_getenv ("GIMP_COMPOSITE")))
{ {
gimp_composite_options.bits = strtoul(p, NULL, 16); gimp_composite_options.bits = strtoul(p, NULL, 16);
g_printerr ("gimp_composite_options: %08lx\n", gimp_composite_options.bits);
if (gimp_composite_options.bits & GIMP_COMPOSITE_OPTION_USE) {
g_printerr ("gimp_composite: yes\n");
}
} }
g_printerr ("gimp_composite: use=%s, verbose=%s\n",
(gimp_composite_options.bits & GIMP_COMPOSITE_OPTION_USE) ? "yes" : "no",
(gimp_composite_options.bits & GIMP_COMPOSITE_OPTION_VERBOSE) ? "yes" : "no");
if (! (gimp_composite_options.bits & GIMP_COMPOSITE_OPTION_INITIALISED)) if (! (gimp_composite_options.bits & GIMP_COMPOSITE_OPTION_INITIALISED))
{ {
gimp_composite_generic_install(); gimp_composite_generic_install();
g_printerr ("gimp-composite:");
#ifdef ARCH_X86 #ifdef ARCH_X86
#ifdef USE_MMX /* USE_MMX here means "use cpu optimisations" XXX */ #ifdef USE_MMX /* USE_MMX here means "use cpu optimisations" XXX */
if (cpu_accel() & CPU_ACCEL_X86_MMX) { if (cpu_accel() & CPU_ACCEL_X86_MMX) {
g_printerr ("gimp-composite: installing mmx optimisations\n"); g_printerr (" mmx");
gimp_composite_mmx_install(); gimp_composite_mmx_install();
} }
if (cpu_accel() & CPU_ACCEL_X86_SSE) { if (cpu_accel() & CPU_ACCEL_X86_SSE) {
g_printerr ("gimp-composite: installing sse optimisations\n"); g_printerr (" sse");
gimp_composite_sse_install(); gimp_composite_sse_install();
} }
#if 0 #if 0
if (cpu_accel() & CPU_ACCEL_X86_MMXEXT) { if (cpu_accel() & CPU_ACCEL_X86_MMXEXT) {
g_printerr ("gimp-composite: installing mmxext optimisations\n"); g_printerr (" mmxext");
gimp_composite_mmxext_install(); gimp_composite_mmxext_install();
} }
#endif #endif
#if 0 #if 0
if (cpu_accel() & CPU_ACCEL_X86_SSE2) { if (cpu_accel() & CPU_ACCEL_X86_SSE2) {
g_printerr ("gimp-composite: installing sse2 optimisations\n"); g_printerr (" sse2");
gimp_composite_sse2_install(); gimp_composite_sse2_install();
} }
#endif #endif
#if 0 #if 0
if (cpu_accel() & CPU_ACCEL_X86_3DNOW) { if (cpu_accel() & CPU_ACCEL_X86_3DNOW) {
g_printerr ("gimp-composite: installing 3dnow optimisations\n"); g_printerr (" 3dnow");
gimp_composite_3dnow_install(); gimp_composite_3dnow_install();
} }
#endif #endif
@ -345,12 +348,19 @@ gimp_composite_init (void)
#ifdef ARCH_PPC #ifdef ARCH_PPC
#if 0 #if 0
if (cpu_accel() & CPU_ACCEL_PPC_ALTIVEC) { if (cpu_accel() & CPU_ACCEL_PPC_ALTIVEC) {
g_printerr ("gimp-composite: installing altivec optimisations\n"); g_printerr (" altivec");
gimp_composite_altivec_install(); gimp_composite_altivec_install();
} }
#endif #endif
#endif #endif
#ifdef ARCH_SPARC
#if 0
g_printerr (" vis");
gimp_composite_vis_install();
#endif #endif
#endif
#endif
g_printerr ("\n");
gimp_composite_options.bits |= GIMP_COMPOSITE_OPTION_INITIALISED; gimp_composite_options.bits |= GIMP_COMPOSITE_OPTION_INITIALISED;
} }

6
app/composite/make-installer.py
View File

@ -480,15 +480,15 @@ def gimp_composite_cfile(fpout, name, function_table, requirements=[]):
########################################### ###########################################
op = optparse.OptionParser(version="$Revision$") op = optparse.OptionParser(version="$Revision$")
op.add_option('-f', '--file', action='store', type='string', dest='file', default=None, op.add_option('-f', '--file', action='store', type='string', dest='file', default=None,
help='the input object file') help='the input object file')
op.add_option('-t', '--test', action='store_true', dest='test', default=False, op.add_option('-t', '--test', action='store_true', dest='test', default=False,
help='generate regression testing code') help='generate regression testing code')
op.add_option('-i', '--iterations', action='store', type='int', dest='iterations', default=1, op.add_option('-i', '--iterations', action='store', type='int', dest='iterations', default=1,
help='number of iterations in regression tests') help='number of iterations in regression tests')
op.add_option('-n', '--n_pixels', action='store', type="int", dest='n_pixels', default=512*512+1, op.add_option('-n', '--n-pixels', action='store', type="int", dest='n_pixels', default=512*512+1,
help='number of pixels in each regression test iteration') help='number of pixels in each regression test iteration')
op.add_option('-r', '--requires', action='append', type='string', dest='requires', default=[], op.add_option('-r', '--requires', action='append', type='string', dest='requires', default=[],
help='cpp #if conditionals') help='cpp #if conditionals')
options, args = op.parse_args() options, args = op.parse_args()