mirror of https://github.com/GNOME/gimp.git
From ChangeLog:
* INSTALL: updated to properly reflect installation procedure
* app/text_tool.c: Fixed bad string in tool description
* libgimp/gimppixelrgn.c: tiles aren't marked dirty in
gimp_pixel_rgn_get_pixel
* plug-ins/edge/edge.c
* plug-ins/edge/emboss.c
* plug-ins/edge/laplace.c
* plug-ins/edge/sobel.c: DEC OSF1 cannont handle reference to
array element with a negative arugment with an unsigned int
(gimp-joke-980108-0)
* plug-ins/sinus/sinus_logo.h: got rid of really long string
* plug-ins/refract/Makefile.am
* plug-ins/refract/refmain.c: fixed megawidget reference
* plug-ins/xpm/xpm.c: made our own case-insenstive strcmp
for checking for transperancy
-Yosh
This commit is contained in:
Manish Singh
parent
0b8bdb4dd7
commit
c871eb39a9
24
ChangeLog
24
ChangeLog
|
|
@ -1,3 +1,27 @@
|
|||
Fri Jan 9 01:15:51 PST 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* INSTALL: updated to properly reflect installation procedure
|
||||
|
||||
* app/text_tool.c: Fixed bad string in tool description
|
||||
|
||||
* libgimp/gimppixelrgn.c: tiles aren't marked dirty in
|
||||
gimp_pixel_rgn_get_pixel
|
||||
|
||||
* plug-ins/edge/edge.c
|
||||
* plug-ins/edge/emboss.c
|
||||
* plug-ins/edge/laplace.c
|
||||
* plug-ins/edge/sobel.c: DEC OSF1 cannont handle reference to
|
||||
array element with a negative arugment with an unsigned int
|
||||
(gimp-joke-980108-0)
|
||||
|
||||
* plug-ins/sinus/sinus_logo.h: got rid of really long string
|
||||
|
||||
* plug-ins/refract/Makefile.am
|
||||
* plug-ins/refract/refmain.c: fixed megawidget reference
|
||||
|
||||
* plug-ins/xpm/xpm.c: made our own case-insenstive strcmp
|
||||
for checking for transperancy
|
||||
|
||||
Tue Jan 6 14:17:02 PST 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* configure.in: make it *really* check for gtk >= 0.99.1 this
|
||||
|
|
|
|||
12
INSTALL
12
INSTALL
|
|
@ -1,10 +1,14 @@
|
|||
There are three basic steps to building and installing the
|
||||
GIMP on unix:
|
||||
|
||||
1. Configure the GIMP by running the `configure' script.
|
||||
2. Build the GIMP by running `make'.
|
||||
3. Install the GIMP by running `make install'.
|
||||
4. Install the gimp-data package. Be sure to install this, or you
|
||||
1. You need to have installed GTK version 0.99.1 or better
|
||||
2. You may want to install other third party libraries that
|
||||
are needed for some of the available plugins: TIFF, PNG,
|
||||
JPEG, MPEG, etc.
|
||||
3. Configure the GIMP by running the `configure' script.
|
||||
4. Build the GIMP by running `make'.
|
||||
5. Install the GIMP by running `make install'.
|
||||
6. Install the gimp-data package. Be sure to install this, or you
|
||||
won't have the GIMP's datafiles installed.
|
||||
|
||||
Generic instructions for configuring and compiling auto-configured
|
||||
|
|
|
|||
|
|
@ -1835,11 +1835,10 @@ ProcRecord text_tool_proc =
|
|||
{
|
||||
"gimp_text",
|
||||
"Add text at the specified location as a floating selection or a new layer.",
|
||||
"This tool requires font information in the form of seven parameters: {size, foundry, family, weight, slant, set_width, spacing}. The font size can either be specified in units of pixels or points, and the appropriate metric is specified using the size
|
||||
_type argument. The x and y parameters together control the placement of the new text by specifying the upper left corner of the text bounding box. If the antialias parameter is non-zero, the generated text will blend more smoothly with underlying layer
|
||||
s. This option requires more time and memory to compute than non-antialiased text; the resulting floating selection or layer, however, will require the same amount of memory with or without antialiasing. If the specified drawable parameter is valid, the
|
||||
text will be created as a floating selection attached to the drawable. If the drawable parameter is not valid (-1), the text will appear as a new layer. Finally, a border can be specified around the final rendered text. The border is measured in pixel
|
||||
s.",
|
||||
"This tool requires font information in the form of seven parameters: {size, foundry, family, weight, slant, set_width, spacing}. The font size can either be specified in units of pixels or points, and the appropriate metric is specified using the size_type "
|
||||
"argument. The x and y parameters together control the placement of the new text by specifying the upper left corner of the text bounding box. If the antialias parameter is non-zero, the generated text will blend more smoothly with underlying layers. "
|
||||
"This option requires more time and memory to compute than non-antialiased text; the resulting floating selection or layer, however, will require the same amount of memory with or without antialiasing. If the specified drawable parameter is valid, the "
|
||||
"text will be created as a floating selection attached to the drawable. If the drawable parameter is not valid (-1), the text will appear as a new layer. Finally, a border can be specified around the final rendered text. The border is measured in pixels.",
|
||||
"Spencer Kimball & Peter Mattis",
|
||||
"Spencer Kimball & Peter Mattis",
|
||||
"1995-1996",
|
||||
|
|
|
|||
|
|
@ -1835,11 +1835,10 @@ ProcRecord text_tool_proc =
|
|||
{
|
||||
"gimp_text",
|
||||
"Add text at the specified location as a floating selection or a new layer.",
|
||||
"This tool requires font information in the form of seven parameters: {size, foundry, family, weight, slant, set_width, spacing}. The font size can either be specified in units of pixels or points, and the appropriate metric is specified using the size
|
||||
_type argument. The x and y parameters together control the placement of the new text by specifying the upper left corner of the text bounding box. If the antialias parameter is non-zero, the generated text will blend more smoothly with underlying layer
|
||||
s. This option requires more time and memory to compute than non-antialiased text; the resulting floating selection or layer, however, will require the same amount of memory with or without antialiasing. If the specified drawable parameter is valid, the
|
||||
text will be created as a floating selection attached to the drawable. If the drawable parameter is not valid (-1), the text will appear as a new layer. Finally, a border can be specified around the final rendered text. The border is measured in pixel
|
||||
s.",
|
||||
"This tool requires font information in the form of seven parameters: {size, foundry, family, weight, slant, set_width, spacing}. The font size can either be specified in units of pixels or points, and the appropriate metric is specified using the size_type "
|
||||
"argument. The x and y parameters together control the placement of the new text by specifying the upper left corner of the text bounding box. If the antialias parameter is non-zero, the generated text will blend more smoothly with underlying layers. "
|
||||
"This option requires more time and memory to compute than non-antialiased text; the resulting floating selection or layer, however, will require the same amount of memory with or without antialiasing. If the specified drawable parameter is valid, the "
|
||||
"text will be created as a floating selection attached to the drawable. If the drawable parameter is not valid (-1), the text will appear as a new layer. Finally, a border can be specified around the final rendered text. The border is measured in pixels.",
|
||||
"Spencer Kimball & Peter Mattis",
|
||||
"Spencer Kimball & Peter Mattis",
|
||||
"1995-1996",
|
||||
|
|
|
|||
|
|
@ -1835,11 +1835,10 @@ ProcRecord text_tool_proc =
|
|||
{
|
||||
"gimp_text",
|
||||
"Add text at the specified location as a floating selection or a new layer.",
|
||||
"This tool requires font information in the form of seven parameters: {size, foundry, family, weight, slant, set_width, spacing}. The font size can either be specified in units of pixels or points, and the appropriate metric is specified using the size
|
||||
_type argument. The x and y parameters together control the placement of the new text by specifying the upper left corner of the text bounding box. If the antialias parameter is non-zero, the generated text will blend more smoothly with underlying layer
|
||||
s. This option requires more time and memory to compute than non-antialiased text; the resulting floating selection or layer, however, will require the same amount of memory with or without antialiasing. If the specified drawable parameter is valid, the
|
||||
text will be created as a floating selection attached to the drawable. If the drawable parameter is not valid (-1), the text will appear as a new layer. Finally, a border can be specified around the final rendered text. The border is measured in pixel
|
||||
s.",
|
||||
"This tool requires font information in the form of seven parameters: {size, foundry, family, weight, slant, set_width, spacing}. The font size can either be specified in units of pixels or points, and the appropriate metric is specified using the size_type "
|
||||
"argument. The x and y parameters together control the placement of the new text by specifying the upper left corner of the text bounding box. If the antialias parameter is non-zero, the generated text will blend more smoothly with underlying layers. "
|
||||
"This option requires more time and memory to compute than non-antialiased text; the resulting floating selection or layer, however, will require the same amount of memory with or without antialiasing. If the specified drawable parameter is valid, the "
|
||||
"text will be created as a floating selection attached to the drawable. If the drawable parameter is not valid (-1), the text will appear as a new layer. Finally, a border can be specified around the final rendered text. The border is measured in pixels.",
|
||||
"Spencer Kimball & Peter Mattis",
|
||||
"Spencer Kimball & Peter Mattis",
|
||||
"1995-1996",
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ gimp_pixel_rgn_get_pixel (GPixelRgn *pr,
|
|||
for (b = 0; b < tile->bpp; b++)
|
||||
*buf++ = *tile_data++;
|
||||
|
||||
gimp_tile_unref (tile, TRUE);
|
||||
gimp_tile_unref (tile, FALSE);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -534,7 +534,7 @@ edge( GDrawable *drawable )
|
|||
*
|
||||
* -- taka
|
||||
*/
|
||||
#define PIX(X,Y) src[ (Y-1)*src_rgn.rowstride + (X-1)*src_rgn.bpp + chan ]
|
||||
#define PIX(X,Y) src[ (Y-1)*(int)src_rgn.rowstride + (X-1)*(int)src_rgn.bpp + chan ]
|
||||
/* make convolusion */
|
||||
sum1 = ( PIX(2,0) - PIX(0,0) ) +
|
||||
2 * ( PIX(2,1) - PIX(0,1) ) +
|
||||
|
|
|
|||
|
|
@ -269,9 +269,9 @@ EmbossRow(guchar *src, guchar *texture, guchar *dst,
|
|||
* some cases the sum is unsigned, in others it is
|
||||
* signed. ergo, cast to signed.
|
||||
*/
|
||||
Nx = (int)(s1[-bypp] + s2[-bypp] + s3[-bypp]
|
||||
Nx = (int)(s1[-(int)bypp] + s2[-(int)bypp] + s3[-(int)bypp]
|
||||
- s1[bypp] - s2[bypp] - s3[bypp]);
|
||||
Ny = (int)(s3[-bypp] + s3[0] + s3[bypp] - s1[-bypp]
|
||||
Ny = (int)(s3[-(int)bypp] + s3[0] + s3[bypp] - s1[-(int)bypp]
|
||||
- s1[0] - s1[bypp]);
|
||||
|
||||
/* shade with distant light source */
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ laplace_prepare_row (GPixelRgn *pixel_rgn,
|
|||
/* Fill in edge pixels */
|
||||
for (b = 0; b < pixel_rgn->bpp; b++)
|
||||
{
|
||||
data[-pixel_rgn->bpp + b] = data[b];
|
||||
data[-(int)pixel_rgn->bpp + b] = data[b];
|
||||
data[w * pixel_rgn->bpp + b] = data[(w - 1) * pixel_rgn->bpp + b];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -341,7 +341,7 @@ sobel_prepare_row (GPixelRgn *pixel_rgn,
|
|||
/* Fill in edge pixels */
|
||||
for (b = 0; b < pixel_rgn->bpp; b++)
|
||||
{
|
||||
data[-pixel_rgn->bpp + b] = data[b];
|
||||
data[-(int)pixel_rgn->bpp + b] = data[b];
|
||||
data[w * pixel_rgn->bpp + b] = data[(w - 1) * pixel_rgn->bpp + b];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,6 +60,9 @@ static void run (char *name,
|
|||
static gint32
|
||||
load_image (char *filename);
|
||||
|
||||
static int
|
||||
cmp_icase (char *s1, char *s2);
|
||||
|
||||
static void
|
||||
parse_colors (XpmImage *xpm_image,
|
||||
guchar **cmap);
|
||||
|
|
@ -309,6 +312,24 @@ load_image (char *filename)
|
|||
|
||||
|
||||
|
||||
static int
|
||||
cmp_icase (char *s1, char *s2)
|
||||
{
|
||||
register int c1, c2;
|
||||
|
||||
while (*s1 && *s2)
|
||||
{
|
||||
c1 = tolower(*s1++); c2 = tolower(*s2++);
|
||||
if (c1 != c2)
|
||||
return (c1 - c2);
|
||||
}
|
||||
|
||||
return (int) (*s1 - *s2);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
static void
|
||||
parse_colors (XpmImage *xpm_image, guchar **cmap)
|
||||
{
|
||||
|
|
@ -348,12 +369,9 @@ parse_colors (XpmImage *xpm_image, guchar **cmap)
|
|||
else if (xpm_color->m_color)
|
||||
colorspec = xpm_color->m_color;
|
||||
|
||||
if (strcmp(colorspec, "none") == 0)
|
||||
colorspec = "None";
|
||||
|
||||
/* parse if it's not transparent. the assumption is that
|
||||
g_new will memset the buffer to zeros */
|
||||
if (strcmp(colorspec, "None") != 0) {
|
||||
if (cmp_icase(colorspec, "None") != 0) {
|
||||
XParseColor (display, colormap, colorspec, &xcolor);
|
||||
(*cmap)[j++] = xcolor.red >> 8;
|
||||
(*cmap)[j++] = xcolor.green >> 8;
|
||||
|
|
|
|||
|
|
@ -534,7 +534,7 @@ edge( GDrawable *drawable )
|
|||
*
|
||||
* -- taka
|
||||
*/
|
||||
#define PIX(X,Y) src[ (Y-1)*src_rgn.rowstride + (X-1)*src_rgn.bpp + chan ]
|
||||
#define PIX(X,Y) src[ (Y-1)*(int)src_rgn.rowstride + (X-1)*(int)src_rgn.bpp + chan ]
|
||||
/* make convolusion */
|
||||
sum1 = ( PIX(2,0) - PIX(0,0) ) +
|
||||
2 * ( PIX(2,1) - PIX(0,1) ) +
|
||||
|
|
|
|||
|
|
@ -269,9 +269,9 @@ EmbossRow(guchar *src, guchar *texture, guchar *dst,
|
|||
* some cases the sum is unsigned, in others it is
|
||||
* signed. ergo, cast to signed.
|
||||
*/
|
||||
Nx = (int)(s1[-bypp] + s2[-bypp] + s3[-bypp]
|
||||
Nx = (int)(s1[-(int)bypp] + s2[-(int)bypp] + s3[-(int)bypp]
|
||||
- s1[bypp] - s2[bypp] - s3[bypp]);
|
||||
Ny = (int)(s3[-bypp] + s3[0] + s3[bypp] - s1[-bypp]
|
||||
Ny = (int)(s3[-(int)bypp] + s3[0] + s3[bypp] - s1[-(int)bypp]
|
||||
- s1[0] - s1[bypp]);
|
||||
|
||||
/* shade with distant light source */
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ laplace_prepare_row (GPixelRgn *pixel_rgn,
|
|||
/* Fill in edge pixels */
|
||||
for (b = 0; b < pixel_rgn->bpp; b++)
|
||||
{
|
||||
data[-pixel_rgn->bpp + b] = data[b];
|
||||
data[-(int)pixel_rgn->bpp + b] = data[b];
|
||||
data[w * pixel_rgn->bpp + b] = data[(w - 1) * pixel_rgn->bpp + b];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ LDADD = \
|
|||
|
||||
DEPS = \
|
||||
$(top_builddir)/libgimp/libgimpui.la \
|
||||
$(top_srcdir)/plug-ins/megawidget/libmegawidget.a \
|
||||
$(top_builddir)/plug-ins/megawidget/libmegawidget.a \
|
||||
$(top_builddir)/libgimp/libgimp.la
|
||||
|
||||
refract_DEPENDENCIES = $(DEPS)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
TO DO:
|
||||
|
||||
code:
|
||||
Do The Right Thing with respect to row buffers, macros, and inline functions.
|
||||
Have the plug-in return the ID of the new layer, if it created one.
|
||||
|
||||
UI:
|
||||
megawidgets are insufficient. (No way to integrate entry_scale
|
||||
with tooltips or option_menu). Replace them.
|
||||
|
||||
necessary luxuries:
|
||||
Add radio buttons for edge wrapping options.
|
||||
|
||||
nicities:
|
||||
Find why two undo steps are required to undo.
|
||||
Find a way to reduce the speckling.
|
||||
|
||||
excess luxuries:
|
||||
Variable IOR information in some [alpha?] channel.
|
||||
|
||||
for version 1.1:
|
||||
THIS PLUGIN NEEDS A PREVIEW THING!
|
||||
Reflections
|
||||
|
||||
for version > 1.1:
|
||||
Diffraction or whatever that thing that makes rainbows is called.
|
||||
Lighting
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
/* megawidget.h could be in any of several places relative to us... */
|
||||
/* should this be an autoconf thing? */
|
||||
#ifdef HAVE_CONFIG_H /* We're part of the GIMP distribution. */
|
||||
#include "../megawidget/megawidget.h"
|
||||
#include <plug-ins/megawidget/megawidget.h>
|
||||
#else
|
||||
#include "megawidget.h"
|
||||
/* #include <megawidget.h> */
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -341,7 +341,7 @@ sobel_prepare_row (GPixelRgn *pixel_rgn,
|
|||
/* Fill in edge pixels */
|
||||
for (b = 0; b < pixel_rgn->bpp; b++)
|
||||
{
|
||||
data[-pixel_rgn->bpp + b] = data[b];
|
||||
data[-(int)pixel_rgn->bpp + b] = data[b];
|
||||
data[w * pixel_rgn->bpp + b] = data[(w - 1) * pixel_rgn->bpp + b];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,6 +60,9 @@ static void run (char *name,
|
|||
static gint32
|
||||
load_image (char *filename);
|
||||
|
||||
static int
|
||||
cmp_icase (char *s1, char *s2);
|
||||
|
||||
static void
|
||||
parse_colors (XpmImage *xpm_image,
|
||||
guchar **cmap);
|
||||
|
|
@ -309,6 +312,24 @@ load_image (char *filename)
|
|||
|
||||
|
||||
|
||||
static int
|
||||
cmp_icase (char *s1, char *s2)
|
||||
{
|
||||
register int c1, c2;
|
||||
|
||||
while (*s1 && *s2)
|
||||
{
|
||||
c1 = tolower(*s1++); c2 = tolower(*s2++);
|
||||
if (c1 != c2)
|
||||
return (c1 - c2);
|
||||
}
|
||||
|
||||
return (int) (*s1 - *s2);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
static void
|
||||
parse_colors (XpmImage *xpm_image, guchar **cmap)
|
||||
{
|
||||
|
|
@ -348,12 +369,9 @@ parse_colors (XpmImage *xpm_image, guchar **cmap)
|
|||
else if (xpm_color->m_color)
|
||||
colorspec = xpm_color->m_color;
|
||||
|
||||
if (strcmp(colorspec, "none") == 0)
|
||||
colorspec = "None";
|
||||
|
||||
/* parse if it's not transparent. the assumption is that
|
||||
g_new will memset the buffer to zeros */
|
||||
if (strcmp(colorspec, "None") != 0) {
|
||||
if (cmp_icase(colorspec, "None") != 0) {
|
||||
XParseColor (display, colormap, colorspec, &xcolor);
|
||||
(*cmap)[j++] = xcolor.red >> 8;
|
||||
(*cmap)[j++] = xcolor.green >> 8;
|
||||
|
|
|
|||
Loading…
Reference in New Issue