Commit Graph

135 Commits

Author SHA1 Message Date
Sven Neumann 085f7ebb19 fixed gtk-doc comment.
2003-12-16  Sven Neumann  <sven@gimp.org>

	* app/composite/gimp-composite.c (gimp_composite_init): fixed
	gtk-doc comment.

	* plug-ins/script-fu/scripts/3d-outline.scm: use enums.

2003-12-16  Sven Neumann  <sven@gimp.org>

	* app/Makefile.am: link against libgimpthumb.

	* app/app-sections.txt: updated.

	* app/app-docs.sgml
	* libgimpbase/libgimpbase-docs.sgml
	* libgimpcolor/libgimpcolor-docs.sgml
	* libgimpmath/libgimpmath-docs.sgml
	* libgimpmodule/libgimpmodule-docs.sgml
	* libgimpthumb/libgimpthumb-docs.sgml
	* libgimpwidgets/libgimpwidgets-docs.sgml: updated XInclude
	namespace URL.
2003-12-16 13:12:32 +00:00
Manish Singh a2bf099117 Makefile.am app/composite/Makefile.am comestics.
2003-12-12  Manish Singh  <yosh@gimp.org>

        * Makefile.am
        * app/composite/Makefile.am
        * themes/Default/images/Makefile.am: comestics.

        * app/gui/color-notebook.c (color_notebook_new): no need to cast to		G_OBJECT for g_signal_connect.

        * plug-ins/common/mkgen.pl
        * plug-ins/common/plugin-defs.pl: properly handle the libgimpoldpreview
        stuff.

        * plug-ins/common/Makefile.am: regenerated.

        * plug-ins/common/decompose.c: cbrt() is in C99, so check for that
        in addition to GNU libc.
2003-12-13 03:59:41 +00:00
Hans Breuer 1baa2d4581 [ I've postponed my reservations against pangoft2/fontconfig/freetype2
2003-12-12  Hans Breuer  <hans@breuer.org>

	[
	 I've postponed my reservations against pangoft2/fontconfig/freetype2
	 usage, so The Gimp should now build with msvc without patching it.
	]

	* app/makefile.msc app/text/makefile.msc : use $(PANGOFT2_CFLAGS) etc.

	* libgimpthumb/makefile.msc : (new file)
	* makefile.msc : added libgimpthumb

	* libgimpthumb/gimpthumbnail.c : include gimpwin32-io.h
	* libgimpthumb/gimpthumb-utils.c : don't compare size pointer
	with GIMP_THUMB_SIZE_FAIL but *size

	* plug-ins/makefile.msc : handle libgimpoldpreview

	* plug-ins/common/decompose.c : define cbrt() if not __GLIBC__

	* plug-ins/common/winclipboard.c : make it compile without gimpcompat.h

	* plug-ins/imagemap/imagemap_csim_lex.c : its a generated file
	but still win32/msvc has no unistd.h

	* plug-ins/pygimp/makefile.msc : (new file) to use the binary you
	need to patch glib, see bug #98737

	* plug-ins/libgimpoldpreview.c : use <libgimp/gimp.h> instead of "gimp.h"

	* **/Makefile.am : added makefile.msc to EXTRA_DIST
2003-12-13 01:35:19 +00:00
Helvetix Victorinox 11903e3078 Changed the existing command line option, --no-mmx to --no-cpu-accel and
* app/composite/gimp-composite.c:
* app/composite/gimp-composite.h:
* app/main.c:
* app/base/base.c:

Changed the existing command line option, --no-mmx to
--no-cpu-accel and propogated the changes necessary to use that
flag to turn OFF the use of CPU extensions using only the generic
implementations in app/composite/gimp-composite-generic.c

Nota Bene: All of the previous gimp 1.2 code is still available
and is is enabled by setting the GIMP_COMPOSITE environment
variable to zero (GIMP_COMPOSITE=0x0).  This causes only the 1.2
code to be used and is helpful for regression testing of the newer
gimp-composite code.  Whether using the new code, or the old code
there should be absolutely no visible differences.

The newly renamed option --no-cpu-accel retains its previous
semantic meaning with the old 1.2 code--turning OFF MMX
optimisations.
2003-11-30 17:29:37 +00:00
Helvetix Victorinox d4ff99217b Repaired an oversight on the application of hue/color/saturation/value on
* app/composite/gimp-composite-generic.c: Repaired an oversight on
  the application of hue/color/saturation/value on non-rgb images.
  Fixes bug #127669
2003-11-25 04:51:31 +00:00
Hans Breuer b23682bf8e still unacceptable patched to compile without FT2, see bug #113681
2003-11-16  Hans Breuer  <hans@breuer.org>

	* app/text/*.c : still unacceptable patched to compile
	without FT2, see bug #113681

	* **makefile.msc : updated

	* app/config/gimpconfig-dump.c : include gimpwin32-io.h

	* app/plug-in/plug-ins.c : don't depend on g_print handling
	%s with NULL pointers, it doesn't anymore with glib cvs at
	least not on win32

	* app/widgets/gimppropwidgets.c
	  libgimpbase/gimputils.c
	  libgimpwidgets/gimpmemsizeentry.c :
	sorry about the mess, need to work-around a stupi not able
	to cast from guint64 to double

	* app/widgets/gimppropwidgets.c (gimp_prop_memsize_entry_new) :
	avoid 'overflow in floating-point constant arithmetic' by disabling
	an imho alays questionable g_return_val_if_fail() for _MSC_VER only

	* libgimpmodule/gimpmodule.def : sorted

	* libgimpwidgets/gimpfileselection.c : removed unused S_ISDIR
	definition

	* app/gui/themes.c : filenames in rc files need to be escaped
2003-11-16 21:20:14 +00:00
Sven Neumann 8e8c2176bf removed test-composite.
2003-11-01  Sven Neumann  <sven@gimp.org>

        * app/composite/Makefile.am (EXTRA_PROGRAMS): removed
        test-composite.
2003-11-01 19:51:22 +00:00
Helvetix Victorinox 78215a79ff Added functions to print the pixels in their various formats.
* app/composite/gimp-composite-regression.c: Added functions to
  print the pixels in their various formats.

* app/composite/gimp-composite-{mmx,sse,sse2}.c: Removed the dodge
  optimisation because it has the same problem that the divide
  optimisation has.

* app/composite/make-install.py: When generating tests, use a
  pixel field of random values.
2003-10-25 06:39:00 +00:00
Helvetix Victorinox a7476d123b Incorrectly reported the inverse of whether not the 3dNow instruction set
* app/composite/gimp-composite-3dnow.c:
  Incorrectly reported the inverse of whether not the 3dNow instruction set is
	supported by the current CPU.

* app/composite/gimp-composite-{mmx,sse}.c:
  Removed linkage of gimp_composite_divide_*.  Something is
  inexplicably broken, and this will get people working again
  while I debug.  This should close bug #125101.
2003-10-23 22:35:06 +00:00
Dave Neary fb471dabe0 app/base/color-balance.c app/base/hue-saturation.c
2003-10-16  Dave Neary  <bolsh@gimp.org>

        * app/base/color-balance.c
        * app/base/hue-saturation.c
        * app/composite/gimp-composite-generic.c
        * app/paint-funcs/paint-funcs-generic.h
        * app/tools/gimphuesaturationtool.c
        * libgimpcolor/gimpcolorspace.[ch]: Changed all occurrences of
        gimp_rgb_to_hls_int and gimp_hls_to_rgb_int to
        gimp_rgb_to_hsl_int and gimp_hsl_to_rgb_int respectively. This
        closes bug #124661.
2003-10-16 19:17:08 +00:00
Sven Neumann 0eb7e92a15 don't use gtk-doc style comments here.
2003-10-14  Sven Neumann  <sven@gimp.org>

	* app/composite/gimp-composite.h: don't use gtk-doc style comments
	here.
2003-10-14 17:34:05 +00:00
Helvetix Victorinox 487324b39a app/composite/gimp-composite-generic.c Tweaked a few more documentation
* app/composite/gimp-composite-generic.c
* app/composite/gimp-composite.c:
  Tweaked a few more documentation comments.
2003-10-14 16:00:19 +00:00
Helvetix Victorinox 39790c8801 Updated/improved/organised documentation comments.
* app/composite/gimp-composite-generic.c:
* app/composite/gimp-composite.[ch]: Updated/improved/organised
  documentation comments.
2003-10-13 18:49:38 +00:00
Sven Neumann 350f98824c fixed dependencies for test-config.
2003-10-12  Sven Neumann  <sven@gimp.org>

	* app/config/Makefile.am: fixed dependencies for test-config.

	* app/config/gimpconfigwriter.[ch]: code cleanup and documentation.

	* app/composite/gimp-composite-generic.[ch]: made prototype for
	gimp_composite_color_any_any_any_generic() match the implementation.

	* app/composite/gimp-composite.c: fixed some issues with the
	comment templates.
2003-10-12 16:46:50 +00:00
Helvetix Victorinox 7b7b3c3f0c app/composite/gimp-composite.h app/composite/gimp-composite-generic.h
*	app/composite/gimp-composite.h
* app/composite/gimp-composite-generic.h
* app/composite/gimp-composite-regression.h: Reformatted to include
  argument names in function prototypes.

* app/composite/gimp-composite.c
* app/composite/gimp-composite-generic.c
* app/composite/gimp-composite-regression.c: Added gtk-doc templates for functions.

* app/composite/make-install.py: migrated to new (trimmer) code and
  removed dead code.  Some beautification for generated code.

* app/composite/gimp-composite-{mmx,sse,sse2,3dnow,altivec,vis,generic}.{c,h}:
  All init() functions are also a run-time check and now expected to
  return TRUE/FALSE if the particular set of compositing functions can
  be used.

* app/composite/gimp-composite.c: No longer has to determine if
  the particular set of compositing functions can be used.

* app/composite/gimp-composite-{mmx,sse,sse2,3dnow,altivec,vis}-{install,test}.c:
  Regenerated

* app/composite/test-composite.c: Deprecated, removed.  All tests are automatically
  generated and the code is in app/composite/gimp-composite-{mmx,sse,sse2,3dnow,altivec,vis}-test.c:

* app/composite/Makefile.am: removed unused references to test-composite.c
2003-10-12 00:10:21 +00:00
Sven Neumann 6dd668f90a really check for CPU_ACCEL_X86_SSE.
2003-10-07  Sven Neumann  <sven@gimp.org>

	* app/composite/gimp-composite-sse2.c (gimp_composite_sse2_init):
	really check for CPU_ACCEL_X86_SSE.

	* libgimp/gimp.def: added new symbols.
2003-10-06 23:56:43 +00:00
Helvetix Victorinox 7752bf9eef migrated to new (trimmer) code and removed dead code. Some beautification
* app/composite/make-install.py: migrated to new (trimmer) code and
  removed dead code.  Some beautification for generated code.

* app/composite/gimp-composite-{mmx,sse,sse2,3dnow,altivec,vis,generic}.{c,h}:
  All init() functions are also a run-time check and now expected to
  return TRUE/FALSE if the particular set of compositing functions can
  be used.

* app/composite/gimp-composite.c: No longer has to determine if
  the particular set of compositing functions can be used.

* app/composite/gimp-composite-{mmx,sse,sse2,3dnow,altivec,vis}-{install,test}.c:
  Regenerated

* app/composite/test-composite.c: Deprecated, removed.  All tests are automatically
  generated and the code is in app/composite/gimp-composite-{mmx,sse,sse2,3dnow,altivec,vis}-test.c:

* app/composite/Makefile.am: removed unused references to test-composite.c
2003-10-06 02:46:15 +00:00
Sven Neumann 81e190dc3d added missing file.
2003-10-05  Sven Neumann  <sven@gimp.org>

	* app/composite/Makefile.am: added missing file.
2003-10-05 19:42:59 +00:00
Sven Neumann 768b34b1ff app/composite/gimp-composite-altivec.c app/composite/gimp-composite-mmx.c
2003-10-01  Sven Neumann  <sven@gimp.org>

	* app/composite/gimp-composite-altivec.c
	* app/composite/gimp-composite-mmx.c
	* app/composite/gimp-composite-sse.c
	* app/composite/gimp-composite-sse2.c
	* app/composite/gimp-composite-vis.c: moved includes out of the
	#if __GNUC__ >= 3 to make the code compile on other compilers.

	* app/composite/gimp-composite-3dnow.[ch]: added the same stubs here
	for symmetry.
2003-10-01 19:07:57 +00:00
Sven Neumann 7675b4ba33 added missing code snippets to make it compile on PPC.
2003-10-01  Sven Neumann  <sven@gimp.org>

	* app/composite/gimp-composite-altivec.c: added missing code
	snippets to make it compile on PPC.

	* plug-ins/common/destripe.c: avoid division by zero (bug #123592).
	Also made the plug-in remember the state of the history toggle and
	other cleanup. The filter result still looks wrong though...
2003-10-01 11:10:56 +00:00
Sven Neumann 06a21943d0 improved readability of this code by introducing a local GimpImage*
2003-09-27  Sven Neumann  <sven@gimp.org>

	* app/gui/info-window.c (info_window_update): improved readability
	of this code by introducing a local GimpImage* variable.

	* app/composite/gimp-composite-regression.c: use a matching format
	string for an u_long variable (should probably use gulong instead).

	* app/composite/make-installer.py: output a short note about what
	tests are going to be run.

	* app/composite/gimp-composite-3dnow-test.c
	* app/composite/gimp-composite-altivec-test.c
	* app/composite/gimp-composite-mmx-test.c
	* app/composite/gimp-composite-sse-test.c
	* app/composite/gimp-composite-sse2-test.c
	* app/composite/gimp-composite-vis-test.c: regenerated.
2003-09-27 12:59:22 +00:00
Helvetix Victorinox 545c19854a app/composite/gimp-composite-altivec-test.c
* app/composite/gimp-composite-altivec-test.c
* app/composite/gimp-composite-mmx-test.c
* app/composite/gimp-composite-mmx-installer.c
* app/composite/gimp-composite-sse-test.c
* app/composite/gimp-composite-sse-installer.c
* app/composite/gimp-composite-sse2-test.c
* app/composite/gimp-composite-sse2-installer.c
* app/composite/gimp-composite-vis-test.c
* app/composite/gimp-composite-vis-installer.c:
  Regenerated.

* app/composite/gimp-composite-altivec.[ch]
* app/composite/gimp-composite-mmx.[ch]
* app/composite/gimp-composite-sse.[ch]
* app/composite/gimp-composite-sse2.[ch]
* app/composite/gimp-composite-vis.[ch]
* app/composite/make-installer.py:
  Make it such that when a test is run on the wrong kind of
  machine, don't fail without an explanation.
2003-09-27 03:11:46 +00:00
Helvetix Victorinox 5c3f28232e Replaced the improper use of the pminub instruction with the macro which
* app/composite/gimp-composite-mmx.c
  (gimp_composite_difference_rgba8_rgba8_rgba8_mmx): Replaced the
  improper use of the pminub instruction with the macro which does the
  same using only mmx instructions.
2003-09-20 04:05:41 +00:00
Sven Neumann 8c34627a76 cosmetics.
2003-09-18  Sven Neumann  <sven@gimp.org>

	* app/composite/gimp-composite.[ch]: cosmetics.
2003-09-18 12:18:02 +00:00
Helvetix Victorinox 9c64fde3d1 Regenerated.
* app/composite/gimp-composite-{mmx,sse,sse2,altivec,vis}.c: Regenerated.

* app/composite/gimp-composite-regression.[ch]: Ensure all ints
  are now unsigned longs.

* app/composite/gimp-composite-sse2.c (gimp_composite_addition_rgba8_rgba8_rgba8_sse2):
  Enclosed the troublesome (rather dense) asm construct in
  __OPTIMIZE__ in which case the compiler can successfully
  allocate enough registers to load up the asm()
2003-09-17 05:43:28 +00:00
Helvetix Victorinox c8a23c4588 Removed code that caused gcc to complain can't find a register in class
* app/composite/gimp-composite-sse2.c: Removed code that caused
  gcc to complain can't find a register in class `GENERAL_REGS' To
  be revisited later.
2003-09-16 15:53:50 +00:00
Sven Neumann 555038debf app/composite/gimp-composite-generic.c app/composite/gimp-composite-mmx.c
2003-09-16  Sven Neumann  <sven@gimp.org>

	* app/composite/gimp-composite-generic.c
	* app/composite/gimp-composite-mmx.c
	* app/composite/gimp-composite-sse.c
	* app/composite/gimp-composite-sse2.c
	* app/config/gimpconfig-deserialize.c
	* app/config/gimpconfig-path.c
	* app/config/gimpconfig-serialize.c
	* app/core/cpercep.c
	* app/core/gimpunit.c
	* app/gui/palette-import-dialog.c
	* app/gui/plug-in-menus.c
	* app/paint-funcs/paint-funcs-generic.h
	* app/paint-funcs/paint-funcs.c
	* app/pdb/procedural_db.c
	* app/text/gimptextlayout-render.c
	* app/tools/gimpfuzzyselecttool.c
	* app/widgets/gimpcursor.c: some trivial code cleanups: avoid
	casts that discard const qualifiers and avoid useless comparisons
	on unsigned variables. Also reordered qualifiers in function
	declarations (static comes before const).
2003-09-16 13:12:50 +00:00
Helvetix Victorinox 930d261569 gimp-composite-mmx-{test,installer}.c
* gimp-composite-mmx-{test,installer}.c

* gimp-composite-sse-{test,installer}.c

* gimp-composite-sse2-{test,installer}.c

* make-installer.py: sort test output by mode name

* gimp-composite-sse2.[ch]: New compositing mode implementations
  darken
  difference
  grain_extract
  lighten

* gimp-composite-x86.h: added

* gimp-composite-{sse,mmx,sse2}.[ch]: Tightening declarations of clobbered registers.
2003-09-16 02:24:03 +00:00
Helvetix Victorinox e0a4244985 Removed clobbered register declaration in an attempt to get this to
* app/composite/gimp-composite-sse2.c (gimp_composite_swap_rgba8_rgba8_rgba8_sse2):
  Removed clobbered register declaration in an attempt to get this
  to compile with gcc 3.2.3
2003-09-14 16:37:31 +00:00
Helvetix Victorinox aa196f4ebb regenerated with new functions.
* gimp-composite-sse2-installer.c, gimp-composite-sse2-test.c:
  regenerated with new functions.

* gimp-composite-sse.c, gimp-composite-sse2.c:
  Distinguish between 64bit and 128bit constants with a little
  faux hungarian notation.

* gimp-composite-sse2.[ch]: Added implementations of
  addition_rgba8_rgba8_rgba8, subtract_rgba8_rgba8_rgba8, and
  swap_rgba8_rgba8_rgba8

* gimp-composite-generic.c:
  Some formating beautification
2003-09-14 00:45:26 +00:00
Helvetix Victorinox e76b755640 Added a proper implementation of the BEHIND drawing mode. This should fix
* app/composite/gimp-composite-generic.[ch]: Added a proper
  implementation of the BEHIND drawing mode.  This should fix bug
  #121889

* app/composite/gimp-composite-generic-installer.c: regenerated
2003-09-12 21:33:09 +00:00
Helvetix Victorinox 0b53610c8b Convert "unsigned long" to guint32 in preparation for 64bit machinery.
* app/composite/gimp-composite-mmx.c
  app/composite/gimp-composite-sse.c
  app/composite/gimp-composite-sse2.c:
  Convert "unsigned long" to guint32 in preparation for 64bit
  machinery.
2003-09-06 23:56:05 +00:00
Helvetix Victorinox d16097c2fb Fixed another bug in initialising the compositing context for the special
* app/paint-funcs/paint-funcs.c (initial_sub_region): Fixed
  another bug in initialising the compositing context for the
  special case of dissolve mode.  A further attempt to fix bug
  #121438.

* app/composite/gimp-composite-generic.c
  (gimp_composite_dissolve_any_any_any_generic): Fixed bug in
  calculating whether the destination has an alpha channel (or
  not).
2003-09-05 14:49:14 +00:00
Manish Singh d2c709b378 #define ARCH_X86 on x86-64 too.
2003-09-04  Manish Singh  <yosh@gimp.org>

        * configure.in: #define ARCH_X86 on x86-64 too.

        * app/composite/gimp-composite-sse2.c: dererference pointers outside
        of asm() construct.

        Now this stuff builds on x86-64, but fails some of the tests. Need
        to fix it later.
2003-09-04 17:34:57 +00:00
Sven Neumann fa4eeb56b6 app/paint-funcs/paint-funcs-generic.h (dissolve_pixels) fixed a bug in the
2003-09-03  Sven Neumann  <sven@gimp.org>

	* app/paint-funcs/paint-funcs-generic.h (dissolve_pixels)
	* app/composite/gimp-composite-generic.c
	(gimp_composite_dissolve_any_any_any_generic): fixed a bug in the
	dissolve algorithm (bug #121305).
2003-09-03 16:27:36 +00:00
Helvetix Victorinox 66dc32259a Turn on SSE, SSE2, and 3dnow instruction sets.
* app/composite/gimp-composite.c (gimp_composite_init): Turn on
  SSE, SSE2, and 3dnow instruction sets.

* app/paint-funcs/paint-funcs.c (initial_sub_region): Fixed
  uninitialised data in the special case for dissolve.
  This is the cause of Bug #121213.
2003-09-03 03:49:12 +00:00
Helvetix Victorinox a2b9b16968 app/composite/gimp-composite-mmx.c Dereference all pointers from *outside*
* app/composite/gimp-composite-mmx.c
* app/composite/gimp-composite-sse.c: Dereference all pointers
  from *outside* of asm() construct.

* app/paint-funcs/paint-funcs.c: Fixed bug where dissolve opacity
  was incorrectly set, and dissolve mask was garbage. This should
  fix Bug #121213
2003-09-02 01:12:09 +00:00
Helvetix Victorinox 7fdddadb0d app/composite/gimp-composite-mmx.c Replaced all memory references in asm()
* app/composite/gimp-composite-mmx.c
* app/composite/gimp-composite-sse.c: Replaced all memory
  references in asm() constructs to references to "input" parameters
  to the asm().  This should take care of any name mangling issues
  (see bug #120893)

  Beautified more code to conform to the gimp style guidelines.

  No longer doing pointer math in assembly.  This should ease some
  of the issues of compiling on 64bit machines.

* app/composite/gimp-composite-sse-installer.c
* app/composite/gimp-composite-sse-test.c: Removed reference to
  gimp_composite_overlay_* because this code is suspect.
2003-09-01 20:26:37 +00:00
Tor Lillqvist cd31cdd7eb Update.
2003-09-01  Tor Lillqvist  <tml@iki.fi>

	* README.win32: Update.

	* app/composite/gimp-composite-mmx.c: For some reason the gcc&gas
	combination used on Win32 wants identifiers prefixed with
	underscores in the asm sequences.

	* plug-ins/common/ps.c (ps_open): [Win32] Don't write the gs
	executable name into the indirect command line file. Do write the
	quoted form of the filename to it.
	(my_shell_quote): New funcion. Use instead of g_shell_quote() on
	Windows, as g_shell_quote() always uses single quotes, which don't
	mean anything to the Windows shell (or C runtime startup
	code). (This might be argued to be a bug in GLib, maybe
	g_shell_quote should behave differently accoring to platform.)

	* etc/gimprc.win32: Remove, generate with gimpconfig-dump.

	* */makefile.mingw.in: Remove, unmaintained.
2003-09-01 00:13:08 +00:00
Michael Natterer 1ce3055058 added missing g_rand_free().
2003-08-27  Michael Natterer  <mitch@gimp.org>

	* app/composite/gimp-composite-generic.c
	(gimp_composite_generic_init): added missing g_rand_free().

	* app/widgets/gimpitemfactory.[ch]: fixed all leaks in
	gimp_item_factory_translate_func(). Added
	item_factory->translation_trash for the pathological cases. Free
	the trash after each call to gtk_item_factory_create_item().
2003-08-27 00:02:04 +00:00
Sven Neumann 50e63f0caa libgimpbase/Makefile.am (EXTRA_DIST) removed gimpversion.h.in.
2003-08-27  Sven Neumann  <sven@gimp.org>

	* libgimpbase/Makefile.am (EXTRA_DIST)
	* libgimpbase/makefile.msc (EXTRA_DIST): removed gimpversion.h.in.

	* app/composite/Makefile.am (libappcomposite_a_built_sources):
	removed gimp-composite-*-installer.h.
2003-08-26 22:56:30 +00:00
Helvetix Victorinox dd16b8b17b New function to initialise a GimpCompositeContext
* app/composite/gimp-composite-regression.[ch]: New function to
  initialise a GimpCompositeContext

* Makefile.am: do not generate the test form of
  gimp-composite-generic.c

* app/composite/gimp-composite-generic-test.c: unused, removed.

* app/composite/make-installer.py app/composite/*-test.c: New
  tests were broken because the byte-for-byte checks checked the
  same buffer against itself.
2003-08-22 05:54:01 +00:00
Helvetix Victorinox 9d405b607c Regenerated installers and testers.
* app/composite/: Regenerated installers and testers.

* app/composite/make-install.py: increased tests of pixels to 1024*1024+1

* app/composite/gimp-composite-mmx.c (gimp_composite_overlay_rgba8_rgba8_rgba_mmx):
  Backed out of the current build.  Although the unit tests all
  pass, the emperical evidence is that something is wrong with it.
2003-08-20 02:55:46 +00:00
Helvetix Victorinox 1b232ec01b Removed wayward printf() of a debugging message.
* Removed wayward printf() of a debugging message.
2003-08-19 23:32:35 +00:00
Helvetix Victorinox 4cae0f19ce Various beautifications, dead code removal, comment clean-up.
* app/composite:
  Various beautifications, dead code removal, comment clean-up.
2003-08-18 15:05:22 +00:00
Sven Neumann e5be1ae62c cleaned up whitespace.
2003-08-18  Sven Neumann  <sven@gimp.org>

	* app/composite/Makefile.am: cleaned up whitespace.
2003-08-18 11:13:44 +00:00
Manish Singh f4c812998b shut up cvs 2003-08-18 05:42:23 +00:00
Helvetix Victorinox 3059aad4bf Added app/composite/gimp-composite-3dnow-test.c
Added	app/composite/gimp-composite-sse2-test.c
2003-08-18 02:10:28 +00:00
Helvetix Victorinox c4bf8739c2 Removed 'test' target 2003-08-18 02:01:45 +00:00
Helvetix Victorinox 7d1f8a9686 retired and removed.
* app/composite/gimp-composite-dispatch.[ch]: retired and removed.

* app/composite/Makefile.am: The 'test' target now builds and runs
  all the tests in TESTS

  Fixed typos of mismatched parenthesis in 'regenerate' target

* app/composite/Makefile.am: TESTS now include ss2 and 3dnow
  instruction sets.

* app/composite/make-gimp-composite-dispatch.py: retired and removed.

* app/composite/gimp-composite.c: call the installers of all the
  various instruction sets supplied by x86 type processors.

* app/base/base.c (base_init): Call gimp_composite_init() *before*
  paint_funcs_setup() (preparation for retiring
  app/paint-funcs/paint-funcs.c)

* app/composite/gimp-composite-sse2.[ch]
* app/composite/gimp-composite-3dnow.[ch]
* app/composite/gimp-composite-sse2-installer.c
* app/composite/gimp-composite-3dnow-installer.c:
  Added

* app/composite/make-installer.py: generate regression test
  programmes that take the command line arguments --iterations and
  --n-pixels for the number of iterations of a set of tests, and the
  number of pixels to use in each test, respectively.

  Conditionally compile tests in order to build and run tests on
  machines that can actually perform the tests.

  Failing a regression test now causes remaining tests to be
  skipped and a non-zero exit code by the programme.
2003-08-18 01:47:10 +00:00
Helvetix Victorinox 1b33a15e03 make gimp-composite functions the default.
* 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 21:19:58 +00:00
Helvetix Victorinox c86d82f076 regnerated
* app/composite/gimp-composite-{mmx,sse,altivec,vis}-{installer,test}.c:
  regnerated

* app/composite/gimp-composite-sse.c
  (gimp_composite_overlay_rgba8_rgba8_rgba8_sse): fixed (rewrote)

* app/composite/make-installer.py:
  command line option --iterations to set the number of iterations for a test.
  command line option --n_ixels to set the number of pixels for a test.

* app/composite/gimp-composite-mmx.c
  (gimp_composite_grain_merge_rgba8_rgba8_rgba8_mmx): fixed (rewrote)
  (gimp_composite_overlay_rgba8_rgba8_rgba8_mmx): fixed (rewrote)
  (gimp_composite_value_rgba8_rgba8_rgba8_mmx):
	  new testing shows it to be broken (temporarily removed from use)
2003-08-17 19:01:24 +00:00
Helvetix Victorinox 75f1f8161f app/composite/gimp-composite-vis.c Use ARCH_SPARC and USE_VIS to
* app/composite/gimp-composite-vis.c
* app/composite/Makefile.am: Use ARCH_SPARC and USE_VIS to
	conditionally compile VIS optimisations.
2003-08-15 17:10:36 +00:00
Helvetix Victorinox b23e3899b0 named gimp_composite_vis_init()
* app/composite/gimp-composite-vis.c: named gimp_composite_vis_init()
2003-08-15 16:19:09 +00:00
Helvetix Victorinox 0af62f01bf generate smaller tables and less code. Now takes real command line
* app/composite/make-installer.py: generate smaller tables and
  less code.  Now takes real command line options:
  options:
    --version                        show program's version number and exit
    -h, --help                       show this help message and exit
    -f FILE, --file=FILE             the input object file
    -t, --test                       generate regression testing code
    -r REQUIRES, --requires=REQUIRES cpp #if conditionals

  See Makefile.am for how I use these options to generate the code.

* app/composite/gimp-composite-altivec-{installer,test}.c:
* app/composite/gimp-composite-generic-{installer,test}.c:
* app/composite/gimp-composite-mmx-{installer,test}.c
* app/composite/gimp-composite-sse-{installer,test}.c:
* app/composite/gimp-composite-vis-{installer,test}.c: regenerated
  with smaller tables and less ode.
2003-08-15 04:31:18 +00:00
Helvetix Victorinox 3fa1239dc9 app/composite/gimp-composite-mmx-installer.c
* app/composite/gimp-composite-mmx-installer.c
* app/composite/gimp-composite-sse-installer.c:
* app/composite/gimp-composite-sse.c:
  Conditional compilation matching the conditional compilation in
  gimp-composite-{mmx,sse}.c
2003-08-14 18:28:28 +00:00
Helvetix Victorinox 33e22c8fbc composite/ modularisation of the automatic compositing function "wiring"
* composite/ modularisation of the automatic compositing function
  "wiring" to construct the table of compositing functions at
  run-time instead of compile time.

  The environment variable GIMP_COMPOSITE is a hexadecimal number
  representing a bit-field used to set/reset options in the
  gimp-composite code.

* gimp-composite-altivec.[ch]: added
* gimp-composite-altivec-installer.[ch]: added
* gimp-composite-vis.[ch]: added
* gimp-composite-vis-installer.[ch]: added
* gimp-composite-mmx-installer.[ch]: added
* gimp-composite-sse-installer.[ch]: added
* gimp-composite-altivec-test.[ch]: added
* gimp-composite-vis-test.[ch]: added
* gimp-composite-mmx-test.[ch]: added
* gimp-composite-sse-test.[ch]: added
* make-installer.py: Added meta programme for generating code to
  1) construct a table of compositing functions indexed by
  operation, and the pixel formats of the sources and destination,
  and 2) generating code for regression testing of these compositing
  functions against the same functions in gimp-composite-generic.c

* gimp-composite-mmx.c (xxxgimp_composite_overlay_rgba8_rgba8_rgba8_mmx):
  removing from the current set of optimisations because it appears
  to be broken.

* Makefile.am: modified regression testing targets to now build
  gimp-composite-*-test where * is any of generic, mmx, sse,
  altivec, and vis.

* gimp-composite.c: moved in initialisation code
  gimp_composite_init() from gimp-composite-dispatch.c

* gimp-composite.c: removed gimp_composite_unsupported().

* gimp-composite.c: use cpu_accel() to determine at run-time which
  set of optimisations are to be used.

* gimp-composite.c: conditionally compile code for ARCH_X86.

* make-gimp-composite-dispatch.c: retired.  See make-installer.py

* gimp-composite-mmx.c (op_overlay): namespace cleanup, op_overlay()
  and all of the constant values are now static

* gimp-composite-mmx.c, gimp-composite-sse.c: fixed bug with the
  alpha mask being the address of the alpha mask, not the mask
  itself.

* app/paint-funcs/paint-funcs.c: Check gimp_composite_options.use
  to see if we should use the new code or the old code.
2003-08-14 07:43:34 +00:00
Raphael Quinet 106ce6fa04 added missing header file, should fix bug #119204.
2003-08-07  Raphael Quinet  <quinet@gamers.org>

	* app/composite/Makefile.am (test_composite_SOURCES): added
	missing header file, should fix bug #119204.
2003-08-07 13:15:18 +00:00
Helvetix Victorinox 0aad627dbe Made the explicit target "regenerate" to regenerate the source files using
* app/composite/Makefile.am:
Made the explicit target "regenerate" to regenerate the source
files using the Python meta-generator.

* app/composite/gimp-composite-mmx.c
* app/composite/gimp-composite-mmx.h
* app/composite/gimp-composite-sse.c
* app/composite/gimp-composite-sse.h:
Now bounded by the conditional "#if __GNUC__ >= 3".  This is a
coarse fix to enable app/composite to build on a wider variety of
platforms.  Ideally, this will be refined to encompass different
versions of the compiler(s) supporting inline assembly code.
2003-07-29 02:54:09 +00:00
Hans Breuer b70d6c3317 renamed GimpOrientationType with Compat postfix to avoid name clashing
2003-07-26  Hans Breuer  <hans@breuer.org>

	* libgimp/gimpcompat.h : renamed GimpOrientationType
	with Compat postfix to avoid name clashing when using
	this header together with libgimp/gimpenums.h

	* app/composite/makefile.msc : (new file)
	  **/makefile.msc : updated

	* libgimp/gimp.c : use static defined _tile<widht|height>
	in this file instead of function call

	* libgimp/gimp.def libgimp/libgimpui.def : moved from former
	to latter : gimp_<brush|font|gradient|pattern>_select_<new|destroy>
	added to former gimp_<brushes|gradients|patterns>_popup

	* app/paint/gimppaintcore.h : removed double semicolon
	which gave msvc error C2059: syntax error : ';'

	* libgimpbase/gimpwin32-io.h : (new file) compatibilty defines
	which were spread over multiple files to make up mostly for
	missing unistd.h

	* app/base/tile-swap.c app/core/gimpimagefile.c
	  libgimpbase/gimpdatafiles.c
	  plug-ins/FractalExplorer/FractalExplorer.c : use new header

	* plug-ins/gflare/gflare.c
	  plug-ins/flame/flame.c
	  plug-ins/FractalExplorer/Dialogs.c :
	removed #ifdef G_OS_WIN32 special casing, not needed anymore
	due to g_file_test() usage

	* app/text/*.* : changes required for build with PangoWin32,
	but not commited ...
2003-07-26 17:37:32 +00:00
Sven Neumann 82e8959e04 shut up CVS 2003-07-24 11:11:42 +00:00
Sven Neumann c0e5a4c749 fixed build rules. There must not be a dependency that causes
2003-07-24  Sven Neumann  <sven@gimp.org>

	* app/composite/Makefile.am: fixed build rules. There must not be
	a dependency that causes gimp-composite-dispatch.[ch] to be
	regenerated since we don't want to depend on Python for our build.

	* app/core/gimpdrawable-blend.c (gradient_fill_region)
	(gradient_put_pixel): fixed a problem with the new gradient
	dithering on grayscale drawables (bug #118141).
2003-07-24 11:10:47 +00:00
Helvetix Victorinox d3fc41f0c2 regenerated new code taking advantage of simplified function prototypes.
* app/composite/gimp-composite-dispatch.[ch]: regenerated new code
taking advantage of simplified function prototypes.

* app/composite/gimp-composite-test.c: New regression testing
driver.  This file is automatically generated, but it's included
in the cvs tree for expediency.

* app/composite/ns.py: hopeful checks for which OS is currently
running as a hint to what nm(1) is available.

* app/composite/gimp-composite-mmx.[ch]
* app/composite/gimp-composite-sse.[ch]
* app/composite/gimp-composite-generic.[ch]: function prototype
cleanup.

* app/composite/make-gimp-composite-dispatch.py: generates code to
test compositing functions.

* app/composite/gimp-composite-regression.[ch]: support for
automatically testing compositing functions.
2003-07-24 08:00:12 +00:00
Sven Neumann e1bdbd9fa3 gimp_composite_dispatch() doesn't have a return value, made it a void
2003-07-22  Sven Neumann  <sven@gimp.org>

	* app/composite/gimp-composite.[ch]: gimp_composite_dispatch()
	doesn't have a return value, made it a void function.
2003-07-22 09:04:10 +00:00
Helvetix Victorinox b31ae7332a big code cleanup.
* app/composite/make-gimp-composite-dispatch.py: big code cleanup.

* app/composite/Makefile.am: removed references to $(builddir)

* app/composite/test-composite.c: cleanup, preparation for transition to
automatically generated regression testing code.

* app/composite/gimp-composite.c: Clean up of typedef usage

* app/composite/gimp-composite-regression.[ch]: added foundation
for regression testing.
2003-07-21 23:49:48 +00:00
Sven Neumann 5de4384946 more Makefile fixes 2003-07-21 00:45:28 +00:00
Sven Neumann 0657dc4a5c more build fixes, include order 2003-07-21 00:14:37 +00:00
Sven Neumann cd3e719fcd more Makefile fixes 2003-07-20 23:57:07 +00:00
Sven Neumann 53cef3aa9e fixed typo
2003-07-21  Sven Neumann  <sven@gimp.org>

	* app/composite/Makefile.am (libappcomposite_a_sources): fixed typo
2003-07-20 23:42:53 +00:00
Michael Natterer 73af860ff4 made generated output compile again and cleaned it up a bit.
2003-07-18  Michael Natterer  <mitch@gimp.org>

	* app/composite/make-gimp-composite-dispatch.py: made generated
	output compile again and cleaned it up a bit.

	* app/composite/gimp-composite-dispatch.c: regenerated.

	* app/paint-funcs/paint-funcs.c (combine_sub_region): don't use
	tabs please.
2003-07-18 10:29:56 +00:00
Helvetix Victorinox 9e3bd94760 app/composite/gimp-composite.[ch],
* app/composite/gimp-composite.[ch],
* app/composite/make-gimp-composite-dispatch.py
stubbed out the 32bit-per-channel pixel formats.

* app/composite/gimp-composite-sse.[ch],
* app/composite/Makefile.am
Broke-out and added the SSE versions of the MMX code.

* app/composite/gimp-composite.[ch],
* app/paint-funcs/paint-funcs.c,
* app/composite/make-gimp-composite-dispatch.py
Use of the new gimp_composite code is now turned on via the
environment variable GIMP_COMPOSITE with a non-zero value.  For
example:
% GIMP_COMPOSITE=1 gimp-1.3
2003-07-18 07:36:55 +00:00
Sven Neumann 2496fa62f4 Removed gimp-composite-dispatch.c from .cvsignore. 2003-07-15 17:45:36 +00:00
Sven Neumann fd4bb0c951 shut up CVS 2003-07-15 16:58:43 +00:00
Helvetix Victorinox 707365f761 app/composite/gimp-composite-dispatch.c: added to cvs AGAIN.
app/composite/test-composite.c: by default check each
compositing function 1 time, with a 500001 pixel array.
2003-07-15 16:54:29 +00:00
Helvetix Victorinox f5e839a39c app/composite/gimp-composite-generic.h: Use
GimpCompositeFunction as the type for all compositing functions.

app/composite/Makefile.am: gimp-composite.c is no longer
dependant upon gimp-composite-dispatch.c

app/composite/gimp-composite-dispatch.[ch]
app/composite/make-gimp-composite-dispatch.py: Fixed type
mismatches.

app/composite/test-composite.c: Fixed bit-rot in not keeping up
with the changes in the surrounding .h files.

app/composite/gimp-composite-mmx.c: Incipient cleanup in marking
some asm constructs as volatile.
2003-07-15 16:04:39 +00:00
Sven Neumann fc385a8672 use AM_PROG_AS instead of defining CCAS and CCASFLAGS manually. Changed
2003-07-14  Sven Neumann  <sven@gimp.org>

	* configure.in: use AM_PROG_AS instead of defining CCAS and
	CCASFLAGS manually. Changed the assembler checks to use inline
	assembly as we do in app/composite/gimp-composite-mmx.c.

	* app/composite/Makefile.am: build the MMX code again; we need it
	to be tested. If you have any problems, please report them. You can
	quick-fix your build using the --disable-mmx configure option.

	* app/paint-funcs/Makefile.am: reverted Helvetix' change ...
	* app/paint-funcs/paint-funcs.c: ... and include
	"composite/gimp-composite.h" instead of "gimp-composite.h".
2003-07-14 10:33:53 +00:00
Helvetix Victorinox b062fa647f app/composite/gimp-composite-dispatch.[ch] are in CVS although
they are generated files.  This is preparation for building the
table at run-time, instead of compile time.
2003-07-14 07:09:35 +00:00
Manish Singh 473a15a4c3 remove bogus trailing slash
2003-07-13  Manish Singh  <yosh@gimp.org>

        * app/composite/Makefile.am: remove bogus trailing slash

        * libgimp/gimp.c: use raise() instead of kill() with getpid()
2003-07-13 18:03:42 +00:00
Helvetix Victorinox 9d2b63962e app/paint-funcs/Makefile.am include files from app/composite/
app/paint-funcs/paint-funcs.c stubbed out code for using
gimp_composite.  To enable the use of gimp_composite, set the
value of gimp_composite_use_old to 0 (zero).

app/base/base.c calls gimp_composite_init() hook to initialse
all the gimp_composite "stuff."

app/composite/make-gimp-composite-dispatch.py now generates
gimp-composite-dispatch.h

app/composite/gimp-composite-dispatch.[ch] are in CVS although
they are generated files.  This is preparation for building the
table at run-time, instead of compile time.

app/composite/gimp-composite.c doesn't #include the main
dispatch table.  This is preparation for building the table at
run-time, instead of compile time.

app/composite/Makefile.am doesn't compile gimp-composite-mmx.c
(until the various remaining gcc problems and configuration issues
are worked out).
2003-07-13 15:48:41 +00:00
Sven Neumann 9bad7d216b removed ... ... and readded under a new name.
2003-07-09  Sven Neumann  <sven@gimp.org>

	* app/composite/tester.c: removed ...
	* app/composite/test-composite.c: ... and readded under a new name.

	* app/composite/Makefile.am: added a check target that builds and
	runs the test program.

	* app/composite/gimp-composite-generic.c
	* app/composite/gimp-composite-mmx.c
	* app/composite/gimp-composite-util.h
	* app/composite/gimp-composite.[ch]
	* app/composite/make-gimp-composite-dispatch.py: made it fit
	better into the GIMP source tree:
	- do not include any files from headers
	- don't use types from <sys/types.h> but use what glib provides
	- coding style ...
2003-07-09 11:52:10 +00:00
Sven Neumann e3b560f0a9 only compile this code if USE_MMX is defined.
2003-07-10  Sven Neumann  <sven@gimp.org>

	* app/composite/gimp-composite-mmx.c: only compile this code if
	USE_MMX is defined.
2003-07-09 11:52:10 +00:00
Sven Neumann c366e257c6 removed ... ... and readded under a new name.
2003-07-09  Sven Neumann  <sven@gimp.org>

	* app/composite/tester.c: removed ...
	* app/composite/test-composite.c: ... and readded under a new name.

	* app/composite/Makefile.am: added a check target that builds and
	runs the test program.

	* app/composite/gimp-composite-generic.c
	* app/composite/gimp-composite-mmx.c
	* app/composite/gimp-composite-util.h
	* app/composite/gimp-composite.[ch]
	* app/composite/make-gimp-composite-dispatch.py: made it fit
	better into the GIMP source tree:
	- do not include any files from headers
	- don't use types from <sys/types.h> but use what glib provides
	- coding style ...
2003-07-09 11:52:10 +00:00
Sven Neumann 95daebaa4e shut up CVS 2003-07-09 10:19:56 +00:00
Sven Neumann 6087afacf0 app/Makefile.am some Makefile fixes, more to come.
2003-07-09  Sven Neumann  <sven@gimp.org>

        * app/Makefile.am
        * app/composite/Makefile.am: some Makefile fixes, more to come.
2003-07-09 10:16:50 +00:00
Helvetix Victorinox 45b2be990f I hate cvs.
Re-adding app/composite
2003-07-08 23:15:16 +00:00