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

just a minor string change.

Browse Source 
2003-01-19  Sven Neumann  <sven@gimp.org>

	* app/main.c: just a minor string change.

	* modules/Makefile.am: minor cleanup

	* plug-ins/libgck/gck/gck.h
	* plug-ins/libgck/gck/gckcolor.c: removed unused functions.
This commit is contained in:
Sven Neumann
2003-01-19 12:44:31 +00:00
committed by Sven Neumann
parent c311c5c81f
commit bad9bb7412
6 changed files with 21 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2003-01-19 Sven Neumann <sven@gimp.org>
* app/main.c: just a minor string change.
* modules/Makefile.am: minor cleanup
* plug-ins/libgck/gck/gck.h
* plug-ins/libgck/gck/gckcolor.c: removed unused functions.
2003-01-18 Maurits Rijk <lpeek.mrijk@consunet.nl>
* plug-ins/common/CML_explorer.c (CML_next_value): g_rand_new is a

9
NEWS
View File

@ -11,6 +11,13 @@ dubbed GIMP 1.4.
Overview of Changes in GIMP 1.3.12
==================================
- Improved the code that handles the plug-ins [Mitch]
- Updated the gimprc man-page, or actually, wrote a tool that does it [Sven]
- Improved the code that handles all the menus [Mitch]
- Added new PSD save plug-in [Bolsh]
- Added back SphereDesigner plug-in [Sven]
- More plug-ins cleaned up [Maurits, Sven]
- Reorganized startup code [Yosh]
- Portability fixes for 64bit platforms [Yosh, Sven]
- Handle large swap files (>2GB) [Sven]
- Updates to the Win32 build system [Tor Lillqvist, Hans Breuer]
@ -18,7 +25,7 @@ Overview of Changes in GIMP 1.3.12
- Lots of bug fixes
Other contributors:
Maurits Rijk, Garry R. Osgood, Jakub Steiner
Garry R. Osgood, Jakub Steiner, Simon Budig, Henrik Brix Anderse
Overview of Changes in GIMP 1.3.11

2
app/main.c
View File

@ -167,7 +167,7 @@ main (int argc,
{
const gchar *msg;
msg = _("GIMP could not initialize the GUI.\n"
msg = _("GIMP could not initialize the graphical user interface.\n"
"Make sure a proper setup for your display environment exists.");
g_print ("%s\n\n", msg);

4
modules/Makefile.am
View File

@ -15,13 +15,11 @@ INCLUDES = \
-I$(includedir)
EXTRA_DIST = \
makefile.msc \
colorsel_water.c
makefile.msc
lib_LTLIBRARIES = \
libcolorsel_triangle.la \
libcolorsel_water.la \
\
libcdisplay_colorblind.la \
libcdisplay_gamma.la \
libcdisplay_highcontrast.la

8
plug-ins/libgck/gck/gck.h
View File

@ -28,14 +28,6 @@
extern "C" {
#endif
#define GCK_CONSTRAIN_RGB 1<<0
#define GCK_CONSTRAIN_RGBA 1<<1
#define GCK_CONSTRAIN_GRAY 1<<2
#define GCK_CONSTRAIN_GRAYA 1<<3
#define GCK_CONSTRAIN_INDEXED 1<<4
#define GCK_CONSTRAIN_INDEXEDA 1<<5
#define GCK_CONSTRAIN_ALL 0xff
typedef enum
{
DITHER_NONE,

165
plug-ins/libgck/gck/gckcolor.c
View File

@ -47,10 +47,6 @@
static GdkColor *gck_rgb_to_gdkcolor (GckVisualInfo *visinfo,
guchar r,guchar g,guchar b);
/* returns a malloc'ed area */
static GdkColor *gck_rgb_to_gdkcolor_r (GckVisualInfo *visinfo,
guchar r,guchar g,guchar b);
/******************/
/* Implementation */
@ -229,7 +225,7 @@ void gck_visualinfo_destroy(GckVisualInfo * visinfo)
{
g_assert(visinfo!=NULL);
gdk_colormap_unref(visinfo->colormap);
g_object_unref(visinfo->colormap);
g_free(visinfo);
}
@ -297,29 +293,6 @@ gck_rgb_to_color8(GckVisualInfo * visinfo, guchar r, guchar g, guchar b)
return (&color);
}
/*
* Reentrant function - GdkColor will be malloc'ed
*/
static GdkColor *
gck_rgb_to_color8_r(GckVisualInfo * visinfo, guchar r, guchar g, guchar b)
{
gint index;
GdkColor *color;
g_assert(visinfo!=NULL);
color=(GdkColor *)g_malloc(sizeof(GdkColor));
if (color==NULL)
return(NULL);
r = visinfo->map_r[r];
g = visinfo->map_g[g];
b = visinfo->map_b[b];
index = visinfo->indextab[r][g][b];
*color=visinfo->rgbpalette[index];
return (color);
}
/***************************************************/
/* RGB to 8 bpp pseudocolor using error-diffusion */
@ -618,37 +591,6 @@ gck_rgb_to_color16(GckVisualInfo * visinfo, guchar r, guchar g, guchar b)
return (&color);
}
/*
* Reentrant function - GdkColor will be malloc'ed
*/
static GdkColor *
gck_rgb_to_color16_r(GckVisualInfo * visinfo, guchar r, guchar g, guchar b)
{
guint32 red, green, blue;
GdkColor *color;
g_assert(visinfo!=NULL);
color=(GdkColor *)g_malloc(sizeof(GdkColor));
if (color==NULL)
return(NULL);
color->red = ((guint16) r) << 8;
color->green = ((guint16) g) << 8;
color->blue = ((guint16) b) << 8;
red = ((guint32) r) >> (8 - visinfo->visual->red_prec);
green = ((guint32) g) >> (8 - visinfo->visual->green_prec);
blue = ((guint32) b) >> (8 - visinfo->visual->blue_prec);
red = red << visinfo->visual->red_shift;
green = green << visinfo->visual->green_shift;
blue = blue << visinfo->visual->blue_shift;
color->pixel = red | green | blue;
return (color);
}
/***************************************************/
/* RGB to 16 bpp truecolor using error-diffusion */
@ -957,34 +899,6 @@ gck_rgb_to_color24(GckVisualInfo * visinfo, guchar r, guchar g, guchar b)
return (&color);
}
/*
* Reentrant function - GdkColor will be malloc'ed
*/
static GdkColor *
gck_rgb_to_color24_r(GckVisualInfo * visinfo, guchar r, guchar g, guchar b)
{
guint32 red, green, blue;
GdkColor *color;
g_assert(visinfo!=NULL);
color=(GdkColor *)g_malloc(sizeof(GdkColor));
if (color==NULL)
return(NULL);
color->red = ((guint16) r) << 8;
color->green = ((guint16) g) << 8;
color->blue = ((guint16) b) << 8;
red = ((guint32) r << 16);
green = ((guint32) g) << 8;
blue = ((guint32) b);
color->pixel = red | green | blue;
return (color);
}
static void
gck_rgb_to_image24(GckVisualInfo * visinfo,
guchar * RGB_data,
@ -1049,34 +963,6 @@ gck_rgb_to_color32(GckVisualInfo * visinfo, guchar r, guchar g, guchar b)
return (&color);
}
/*
* Reentrant function - GdkColor will be malloc'ed
*/
static GdkColor *
gck_rgb_to_color32_r(GckVisualInfo * visinfo, guchar r, guchar g, guchar b)
{
guint32 red, green, blue;
GdkColor *color;
g_assert(visinfo!=NULL);
color=(GdkColor *)g_malloc(sizeof(GdkColor));
if (color==NULL)
return(NULL);
color->red = ((guint16) r) << 8;
color->green = ((guint16) g) << 8;
color->blue = ((guint16) b) << 8;
red = ((guint32) r) << 8;
green = ((guint32) g) << 16;
blue = ((guint32) b) << 24;
color->pixel = red | green | blue;
return (color);
}
static void
gck_rgb_to_image32(GckVisualInfo * visinfo,
guchar * RGB_data,
@ -1223,52 +1109,3 @@ gck_rgb_to_gdkcolor(GckVisualInfo * visinfo, guchar r, guchar g, guchar b)
return (color);
}
/*
* Reentrant function - GdkColor will be malloc'ed
*/
static GdkColor *
gck_rgb_to_gdkcolor_r(GckVisualInfo * visinfo, guchar r, guchar g, guchar b)
{
GdkColor *color=NULL;
g_assert(visinfo!=NULL);
if (visinfo->visual->type == GDK_VISUAL_PSEUDO_COLOR)
{
if (visinfo->visual->depth == 8)
{
/* Standard 256 color display */
/* ========================== */
color=gck_rgb_to_color8_r(visinfo, r, g, b);
}
}
else if (visinfo->visual->type == GDK_VISUAL_TRUE_COLOR ||
visinfo->visual->type == GDK_VISUAL_DIRECT_COLOR)
{
if (visinfo->visual->depth == 15 || visinfo->visual->depth == 16)
{
/* HiColor modes */
/* ============= */
color=gck_rgb_to_color16_r(visinfo, r, g, b);
}
else if (visinfo->visual->depth == 24)
{
/* Normal 24 bit mode */
/* ================== */
color=gck_rgb_to_color24_r(visinfo, r, g, b);
}
else if (visinfo->visual->depth == 32)
{
/* 32 bpp mode */
/* =========== */
color=gck_rgb_to_color32_r(visinfo, r, g, b);
}
}
return (color);
}