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

Replace "color-cube" by "min-colors".

Browse Source 
2000-05-04  Tor Lillqvist  <tml@iki.fi>

* gimprc.win32: Replace "color-cube" by "min-colors".

* */makefile.{cygwin,msc}: Updates. Install to /install/gimp.

* libgimp/gimp.def: Add gimp_min_colors.

* modules/cdisplay_highcontrast.c: Include gimpmath.h instead of
math.h. Use G_PI instead of M_PI.
This commit is contained in:
Tor Lillqvist
2000-05-04 18:41:22 +00:00
committed by Tor Lillqvist
parent d35eae9b11
commit 9be1a769aa
11 changed files with 90 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cdisplay_highcontrast.c
View File

@ -17,7 +17,6 @@
*/
#include "config.h"
#include <math.h>
#include <string.h>
#include <libgimp/color_display.h>
@ -25,6 +24,7 @@
#include <libgimp/gimpmodule.h>
#include <libgimp/parasite.h>
#include <libgimp/gimpui.h>
#include <libgimp/gimpmath.h>
#include <gtk/gtk.h>
#include "modregister.h"
@ -163,7 +163,7 @@ contrast_create_lookup_table (ContrastContext *context)
for (i = 0; i < 256; i++)
{
context->lookup[i]
= (guchar) (int)(255 * .5 * (1 + sin(context->contrast*2*M_PI*i/255.0)));
= (guchar) (int)(255 * .5 * (1 + sin(context->contrast*2*G_PI*i/255.0)));
}
}

21
modules/makefile.cygwin
View File

@ -1,9 +1,10 @@
## Makefile for building gimp modules with gcc -mno-cygwin
## Makefile for building gimp modules with gcc
## Use: make -f makefile.cygwin
# Change this to wherever you install the gimp.
GIMP = /gimp
BIN = $(GIMP)/modules
# Change this to wherever you install gimp.
# This is what I use as installation target, from where the installer-builder
# will pick it up.
GIMP = /install/gimp
OPTIMIZE = -O
@ -27,10 +28,14 @@ INTL = ../../intl
CFLAGS = $(OPTIMIZE) -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)/gdk -I$(GTK) -I$(INTL)
LDFLAGS = -s
BIN = $(GIMP)/modules
MODULES = \
colorsel_gtk-$(GIMP_VER).dll \
colorsel_triangle-$(GIMP_VER).dll \
colorsel_water-$(GIMP_VER).dll
colorsel_water-$(GIMP_VER).dll \
cdisplay_gamma-$(GIMP_VER).dll \
cdisplay_highcontrast-$(GIMP_VER).dll
all : \
$(MODULES)
@ -50,5 +55,11 @@ colorsel_triangle-$(GIMP_VER).dll : colorsel_triangle.o module.def
colorsel_water-$(GIMP_VER).dll : colorsel_water.o module.def
$(GLIB)/build-dll colorsel_water $(GIMP_VER) module.def colorsel_water.o $(LDFLAGS) -L ../app -lgimp -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER)
cdisplay_gamma-$(GIMP_VER).dll : cdisplay_gamma.o module.def
$(GLIB)/build-dll cdisplay_gamma $(GIMP_VER) module.def cdisplay_gamma.o $(LDFLAGS) -L ../app -lgimp -L ../libgimp -lgimp-$(GIMP_VER) -lgimpui-$(GIMP_VER) -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER)
cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.o module.def
$(GLIB)/build-dll cdisplay_highcontrast $(GIMP_VER) module.def cdisplay_highcontrast.o $(LDFLAGS) -L ../app -lgimp -L ../libgimp -lgimp-$(GIMP_VER) -lgimpui-$(GIMP_VER) -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER)
clean:
-rm *.dll *.a *.o *.exp *.base

19
modules/makefile.msc
View File

@ -1,9 +1,10 @@
## Makefile for building gimp modules with Microsoft C
## Use: nmake -f makefile.msc
# Change this to wherever you install the gimp.
GIMP = C:\gimp
BIN = $(GIMP)\modules
# Change this to wherever you install gimp.
# This is what I use as installation target, from where the installer-builder
# will pick it up.
GIMP = \install\gimp
################################################################
@ -36,10 +37,14 @@ INTL = ..\..\intl
CFLAGS = -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk -I$(GTK) -I$(INTL)
BIN = $(GIMP)\modules
MODULES = \
colorsel_gtk-$(GIMP_VER).dll \
colorsel_triangle-$(GIMP_VER).dll \
colorsel_water-$(GIMP_VER).dll
colorsel_water-$(GIMP_VER).dll \
cdisplay_gamma-$(GIMP_VER).dll \
cdisplay_highcontrast-$(GIMP_VER).dll
all : \
@ -60,6 +65,12 @@ colorsel_triangle-$(GIMP_VER).dll : colorsel_triangle.obj module.def
colorsel_water-$(GIMP_VER).dll : colorsel_water.obj module.def
$(CC) $(CFLAGS) -LD -Fe$@ colorsel_water.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
cdisplay_gamma-$(GIMP_VER).dll : cdisplay_gamma.obj module.def
$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_gamma.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.obj module.def
$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_highcontrast.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
# General rule for building
.c.obj:
$(CC) $(CFLAGS) -GD -c $<