Commit cb166972 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

Makefile.am configure.in added stuff for the new library below.

2001-01-24  Michael Natterer  <mitch@gimp.org>

	* Makefile.am
	* configure.in
	* gimptool.in: added stuff for the new library below.

	* libgimpmath/.cvsignore
	* libgimpmath/Makefile.am
	* libgimpmath/gimpmath.def
	* libgimpmath/gimpmath.h
	* libgimpmath/gimpmathtypes.h
	* libgimpmath/gimpmatrix.c
	* libgimpmath/gimpmatrix.h
	* libgimpmath/gimpvector.c
	* libgimpmath/gimpvector.h
	* libgimpmath/makefile.mingw.in
	* libgimpmath/makefile.msc: new shared library. Depends on glib only.

	* libgimp/Makefile.am
	* libgimp/gimp.def
	* libgimp/gimp.h: removed the math stuff.

	* libgimp/gimpmath.h
	* libgimp/gimpmatrix.[ch]
	* libgimp/gimpvector.[ch]: removed.

	* app/Makefile.am
	* plug-ins/Lighting/Makefile.am
	* plug-ins/MapObject/Makefile.am
	* plug-ins/pagecurl/Makefile.am: link against libgimpmath.la

	* app/[many files]
	* libgimpcolor/gimpcolorspace.c
	* libgimpcolor/gimprgb.c
	* libgimp/gimpadaptivesupersample.c
	* libgimp/gimpbilinear.c
	* libgimp/gimpwidgets.c
	* modules/colorsel_gtk.c
	* modules/colorsel_triangle.c
	* modules/colorsel_water.c
	* plug-ins/libgck/gck/gckcolor.c
	* tools/pdbgen/pdb/channel.pdb
	* tools/pdbgen/pdb/image.pdb: include "libgimpmath/gimpmath.h",
	removed the remaining includes of the old color stuff.
parent e803bedd
2001-01-24 Michael Natterer <mitch@gimp.org>
* Makefile.am
* configure.in
* gimptool.in: added stuff for the new library below.
* libgimpmath/.cvsignore
* libgimpmath/Makefile.am
* libgimpmath/gimpmath.def
* libgimpmath/gimpmath.h
* libgimpmath/gimpmathtypes.h
* libgimpmath/gimpmatrix.c
* libgimpmath/gimpmatrix.h
* libgimpmath/gimpvector.c
* libgimpmath/gimpvector.h
* libgimpmath/makefile.mingw.in
* libgimpmath/makefile.msc: new shared library. Depends on glib only.
* libgimp/Makefile.am
* libgimp/gimp.def
* libgimp/gimp.h: removed the math stuff.
* libgimp/gimpmath.h
* libgimp/gimpmatrix.[ch]
* libgimp/gimpvector.[ch]: removed.
* app/Makefile.am
* plug-ins/Lighting/Makefile.am
* plug-ins/MapObject/Makefile.am
* plug-ins/pagecurl/Makefile.am: link against libgimpmath.la
* app/[many files]
* libgimpcolor/gimpcolorspace.c
* libgimpcolor/gimprgb.c
* libgimp/gimpadaptivesupersample.c
* libgimp/gimpbilinear.c
* libgimp/gimpwidgets.c
* modules/colorsel_gtk.c
* modules/colorsel_triangle.c
* modules/colorsel_water.c
* plug-ins/libgck/gck/gckcolor.c
* tools/pdbgen/pdb/channel.pdb
* tools/pdbgen/pdb/image.pdb: include "libgimpmath/gimpmath.h",
removed the remaining includes of the old color stuff.
2001-01-23 Michael Natterer <mitch@gimp.org> 2001-01-23 Michael Natterer <mitch@gimp.org>
* Makefile.am * Makefile.am
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
SUBDIRS = \ SUBDIRS = \
tools \ tools \
intl \ intl \
libgimpmath \
libgimpcolor \ libgimpcolor \
libgimp \ libgimp \
app \ app \
......
...@@ -312,6 +312,7 @@ gimp_LDADD = \ ...@@ -312,6 +312,7 @@ gimp_LDADD = \
pdb/libapppdb.la \ pdb/libapppdb.la \
tools/libapptools.la \ tools/libapptools.la \
$(top_builddir)/libgimpcolor/libgimpcolor.la \ $(top_builddir)/libgimpcolor/libgimpcolor.la \
$(top_builddir)/libgimpmath/libgimpmath.la \
$(top_builddir)/libgimp/libgimpi.a \ $(top_builddir)/libgimp/libgimpi.a \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(GIMP_THREAD_LIBS) \ $(GIMP_THREAD_LIBS) \
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "libgimpmath/gimpmath.h"
#include "apptypes.h" #include "apptypes.h"
#include "about_dialog.h" #include "about_dialog.h"
...@@ -38,7 +40,6 @@ ...@@ -38,7 +40,6 @@
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimphelpui.h" #include "libgimp/gimphelpui.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h" #include "apptypes.h"
...@@ -80,7 +81,6 @@ ...@@ -80,7 +81,6 @@
#include "tools/tools.h" #include "tools/tools.h"
#include "libgimp/gimphelpui.h" #include "libgimp/gimphelpui.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -21,12 +21,11 @@ ...@@ -21,12 +21,11 @@
#include "libgimpcolor/gimpcolortypes.h" #include "libgimpcolor/gimpcolortypes.h"
#include "libgimpmath/gimpmathtypes.h"
#include "libgimp/gimpuitypes.h" #include "libgimp/gimpuitypes.h"
/* stuff that will go to general-purpose libraries */ /* stuff that will go to general-purpose libraries */
#include "libgimp/gimpmatrix.h"
#include "libgimp/gimpvector.h"
#include "libgimp/gimpunit.h" #include "libgimp/gimpunit.h"
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h" #include "apptypes.h"
...@@ -41,8 +42,6 @@ ...@@ -41,8 +42,6 @@
#include "asupsample.h" #include "asupsample.h"
#include "gimpprogress.h" #include "gimpprogress.h"
#include "libgimp/gimpmath.h"
typedef struct typedef struct
{ {
......
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
...@@ -35,8 +38,6 @@ ...@@ -35,8 +38,6 @@
#include "tool_options.h" #include "tool_options.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpcolorspace.h"
#define CYAN_RED 0x1 #define CYAN_RED 0x1
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpmath/gimpmath.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
...@@ -39,7 +41,6 @@ ...@@ -39,7 +41,6 @@
#include "libgimp/gimpenv.h" #include "libgimp/gimpenv.h"
#include "libgimp/gimphelpui.h" #include "libgimp/gimphelpui.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpmath/gimpmath.h"
#include "apptypes.h" #include "apptypes.h"
#include "drawable.h" #include "drawable.h"
...@@ -38,7 +40,6 @@ ...@@ -38,7 +40,6 @@
#include "pixel_processor.h" #include "pixel_processor.h"
#include <libgimp/gimphelpui.h> #include <libgimp/gimphelpui.h>
#include <libgimp/gimpmath.h>
struct _GimpHistogram struct _GimpHistogram
......
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
...@@ -34,9 +37,6 @@ ...@@ -34,9 +37,6 @@
#include "tools.h" #include "tools.h"
#include "tool_options.h" #include "tool_options.h"
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -22,14 +22,14 @@ ...@@ -22,14 +22,14 @@
#include <glib.h> #include <glib.h>
#include "libgimpmath/gimpmath.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
#include "gimplut.h" #include "gimplut.h"
#include "gimphistogram.h" #include "gimphistogram.h"
#include "libgimp/gimpmath.h"
/* ---------- Brightness/Contrast -----------*/ /* ---------- Brightness/Contrast -----------*/
......
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#include <process.h> /* For _getpid() */ #include <process.h> /* For _getpid() */
#endif #endif
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
...@@ -43,8 +45,6 @@ ...@@ -43,8 +45,6 @@
#include "pixel_region.h" #include "pixel_region.h"
#include "temp_buf.h" #include "temp_buf.h"
#include "libgimp/gimpcolorspace.h"
static guchar * temp_buf_allocate (guint); static guchar * temp_buf_allocate (guint);
static void temp_buf_to_color (TempBuf *src_buf, static void temp_buf_to_color (TempBuf *src_buf,
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpmath/gimpmath.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
...@@ -33,7 +35,6 @@ ...@@ -33,7 +35,6 @@
#include "temp_buf.h" #include "temp_buf.h"
#include "libgimp/gimphelpui.h" #include "libgimp/gimphelpui.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpmath/gimpmath.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
...@@ -45,8 +47,6 @@ ...@@ -45,8 +47,6 @@
#include "tile_manager.h" #include "tile_manager.h"
#include "undo.h" #include "undo.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -22,6 +22,9 @@ ...@@ -22,6 +22,9 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
...@@ -42,13 +45,13 @@ ...@@ -42,13 +45,13 @@
#include "tile_manager.h" #include "tile_manager.h"
#include "libgimp/gimphelpui.h" #include "libgimp/gimphelpui.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#define ENTRY_WIDTH 60 #define ENTRY_WIDTH 60
typedef struct _OffsetDialog OffsetDialog; typedef struct _OffsetDialog OffsetDialog;
struct _OffsetDialog struct _OffsetDialog
...@@ -62,11 +65,15 @@ struct _OffsetDialog ...@@ -62,11 +65,15 @@ struct _OffsetDialog
GimpImage *gimage; GimpImage *gimage;
}; };
/* Forward declarations */ /* Forward declarations */
static void offset_ok_callback (GtkWidget *, gpointer); static void offset_ok_callback (GtkWidget *widget,
static void offset_cancel_callback (GtkWidget *, gpointer); gpointer data);
static void offset_cancel_callback (GtkWidget *widget,
gpointer data);
static void offset_halfheight_callback (GtkWidget *, gpointer); static void offset_halfheight_callback (GtkWidget *widget,
gpointer data);
void void
......
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
#include "channel.h" #include "channel.h"
#include "channels_dialog.h" #include "channels_dialog.h"
#include "color_panel.h" #include "color_panel.h"
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include "undo.h" #include "undo.h"
#include "libgimp/gimphelpui.h" #include "libgimp/gimphelpui.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h" #include "apptypes.h"
#include "color_area.h" #include "color_area.h"
...@@ -38,7 +40,6 @@ ...@@ -38,7 +40,6 @@
#include "libgimp/gimphelpui.h" #include "libgimp/gimphelpui.h"
#include "libgimp/gimpcolorarea.h" #include "libgimp/gimpcolorarea.h"
#include "libgimp/gimpcolorselector.h" #include "libgimp/gimpcolorselector.h"
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h" #include "apptypes.h"
#include "appenv.h" #include "appenv.h"
...@@ -36,7 +38,6 @@ ...@@ -36,7 +38,6 @@
#include "session.h" #include "session.h"
#include "color_area.h" #include "color_area.h"
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpcolorselector.h" #include "libgimp/gimpcolorselector.h"
#include "libgimp/gimphelpui.h" #include "libgimp/gimphelpui.h"
......
...@@ -23,32 +23,40 @@ ...@@ -23,32 +23,40 @@
#include <glib.h> #include <glib.h>
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"