mirror of https://github.com/GNOME/gimp.git
Replace "color-cube" by "min-colors".
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
Tor Lillqvist
parent
d35eae9b11
commit
9be1a769aa
11
ChangeLog
11
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
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.
|
||||
|
||||
2000-05-04 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* modules/cdisplay_gamma.c:
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@
|
|||
# colors remaining after the allocation of the colorcube
|
||||
# will be left to the system palette in an effort to reduce
|
||||
# colormap "flashing".
|
||||
(color-cube 6 6 4 24)
|
||||
(min-colors 144)
|
||||
|
||||
# Install a GIMP colormap by default -- only for 8-bit displays
|
||||
# (install-colormap)
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@
|
|||
# colors remaining after the allocation of the colorcube
|
||||
# will be left to the system palette in an effort to reduce
|
||||
# colormap "flashing".
|
||||
(color-cube 6 6 4 24)
|
||||
(min-colors 144)
|
||||
|
||||
# Install a GIMP colormap by default -- only for 8-bit displays
|
||||
# (install-colormap)
|
||||
|
|
|
|||
|
|
@ -196,6 +196,7 @@ EXPORTS
|
|||
gimp_matrix4_to_deg
|
||||
gimp_message
|
||||
gimp_micro_version
|
||||
gimp_min_colors
|
||||
gimp_minor_version
|
||||
gimp_palette_get_background
|
||||
gimp_palette_get_foreground
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# Change this to wherever you want to install the DLLs. This directory
|
||||
# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
|
||||
# only, it probably is best to keep them in the GIMP's bin directory.
|
||||
BIN = /gimp/bin
|
||||
BIN = /install/gimp/bin
|
||||
|
||||
# The name of the directory in your %HOME% where the GIMP's personal settings
|
||||
# and stuff is saved.
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# Change this to wherever you want to install the DLLs. This directory
|
||||
# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
|
||||
# only, it probably is best to keep them in the GIMP's bin directory.
|
||||
BIN = C:\gimp\bin
|
||||
BIN = C:\install\gimp\bin
|
||||
|
||||
GIMP_VER = 1.1
|
||||
|
||||
|
|
|
|||
|
|
@ -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)));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 $<
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@ FROMPLUGINSDIR=YES # Used to bypass other parts below
|
|||
# the one used with Microsoft's nmake, which has silly limits.
|
||||
|
||||
# The COMMON* ones are in the common subdirectory
|
||||
COMMON1 = CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur bumpmap c_astretch checkerboard colorify compose convmatrix csource cubism curve_bend
|
||||
COMMON1 = CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard colorify compose convmatrix csource cubism curve_bend
|
||||
COMMON2 = decompose deinterlace depthmerge despeckle destripe diffraction displace edge emboss engrave exchange film flarefx fractaltrace
|
||||
COMMON3 = gauss_iir gauss_rle gbr gee gicon gif gifload glasstile gpb gqbist gradmap grid gtm guillotine gz header hot hrz illusion iwarp jigsaw jpeg laplace lic
|
||||
COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma plugindetails png pnm polar ps psd psp randomize ripple rotate
|
||||
COMMON5 = sample_colorize scatter_hsv semiflatten sharpen shift smooth_palette snoise sobel sparkle spheredesigner spread sunras tga threshold_alpha tiff tile tileit tiler unsharp video vinvert vpropagate waves whirlpinch winclipboard wind winprint wmf xbm xwd zealouscrop
|
||||
|
||||
# These have own subdirectories each
|
||||
SEPARATE = AlienMap AlienMap2 FractalExplorer Lighting MapObject bmp borderaverage dbbrowser faxg3 fits flame fp gdyntext gfig gflare gfli gimpressionist ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi sinus struc twain webbrowser winsnap
|
||||
SEPARATE = AlienMap AlienMap2 FractalExplorer Lighting MapObject bmp dbbrowser faxg3 fits flame fp gdyntext gfig gflare gfli gimpressionist ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi sinus struc twain webbrowser winsnap
|
||||
|
||||
# These are unofficial, ie not in the CVS. To build these, you should
|
||||
# get tml's source snapshot and copy this makefile to the
|
||||
|
|
@ -454,8 +454,9 @@ EXTRALIBS = -L $(TIFF) -ltiff -L $(JPEG) -ljpeg -L $(ZLIB) -lz -luser32
|
|||
endif
|
||||
|
||||
ifdef EXTRA_gimp_ace
|
||||
EXTRACFLAGS = -DGLACE_GIMP
|
||||
EXTRACFLAGS = -DGLACE_GIMP -DVERSION=\"0.5.1\"
|
||||
OBJECTS = \
|
||||
dialog.o \
|
||||
gimp_ace.o \
|
||||
glace.o \
|
||||
glaceG.o
|
||||
|
|
@ -492,6 +493,41 @@ OBJECTS = \
|
|||
magiceye.o
|
||||
endif
|
||||
|
||||
ifdef EXTRA_mathmap
|
||||
OBJECTS = \
|
||||
builtins.o \
|
||||
builtins_compiler.o \
|
||||
cgen.o \
|
||||
colorwell.o \
|
||||
exprtree.o \
|
||||
internals.o \
|
||||
jump.o \
|
||||
lispreader.o \
|
||||
macros.o \
|
||||
mathmap.o \
|
||||
noise.o \
|
||||
overload.o \
|
||||
parser.o \
|
||||
postfix.o \
|
||||
scanner.o \
|
||||
tags.o \
|
||||
tuples.o \
|
||||
userval.o \
|
||||
vars.o
|
||||
|
||||
EXTRACFLAGS = -Drandom=g_random_int
|
||||
|
||||
parser.c parser.h : parser.y
|
||||
bison -p mm -d parser.y
|
||||
mv parser.tab.c parser.c
|
||||
mv parser.tab.h parser.h
|
||||
|
||||
scanner.c : scanner.fl parser.h
|
||||
flex -Pmm scanner.fl
|
||||
mv lex.mm.c scanner.c
|
||||
|
||||
endif
|
||||
|
||||
ifdef EXTRA_user_filter
|
||||
|
||||
uf_lexer.c : uf_lexer.l
|
||||
|
|
|
|||
|
|
@ -24,14 +24,14 @@ FROMPLUGINSDIR=YES # Used to bypass other parts below
|
|||
# List plug-ins. We must use several lists to work around nmake's limits
|
||||
|
||||
# The COMMON* ones are in the common subdirectory
|
||||
COMMON1 = CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur bumpmap c_astretch checkerboard colorify compose convmatrix csource cubism curve_bend
|
||||
COMMON1 = CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard colorify compose convmatrix csource cubism curve_bend
|
||||
COMMON2 = decompose deinterlace depthmerge despeckle destripe diffraction displace edge emboss engrave exchange film flarefx fractaltrace
|
||||
COMMON3 = gauss_iir gauss_rle gbr gee gicon gif gifload glasstile gpb gqbist gradmap grid gtm guillotine gz header hot hrz illusion iwarp jigsaw jpeg laplace lic
|
||||
COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma plugindetails png pnm polar ps psd randomize ripple rotate
|
||||
COMMON5 = sample_colorize scatter_hsv semiflatten sharpen shift smooth_palette snoise sobel sparkle spheredesigner spread sunras tga threshold_alpha tiff tile tileit tiler unsharp video vinvert vpropagate waves whirlpinch winclipboard wind winprint wmf xbm xwd zealouscrop
|
||||
|
||||
# These have own subdirectories each
|
||||
SEPARATE = AlienMap AlienMap2 FractalExplorer Lighting MapObject bmp borderaverage dbbrowser faxg3 fits flame fp gdyntext gfig gflare gfli gimpressionist ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi sinus struc twain webbrowser winsnap
|
||||
SEPARATE = AlienMap AlienMap2 FractalExplorer Lighting MapObject bmp dbbrowser faxg3 fits flame fp gdyntext gfig gflare gfli gimpressionist ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi sinus struc twain webbrowser winsnap
|
||||
|
||||
# These are unofficial, ie not in the CVS. To build these, you should
|
||||
# get tml's source snapshot and copy this makefile to the
|
||||
|
|
|
|||
Loading…
Reference in New Issue