diff --git a/src/modules/Image/blit.c b/src/modules/Image/blit.c
index 1d6db74bcea6b8910478281a8f3a9eb730f4823c..58c9b1974718c5a663b82a0d25491e7974463ee0 100644
--- a/src/modules/Image/blit.c
+++ b/src/modules/Image/blit.c
@@ -1,11 +1,11 @@
-/* $Id: blit.c,v 1.29 1998/04/24 13:46:04 mirar Exp $ */
+/* $Id: blit.c,v 1.30 1999/04/13 12:32:09 mirar Exp $ */
#include "global.h"
/*
**! module Image
**! note
-**! $Id: blit.c,v 1.29 1998/04/24 13:46:04 mirar Exp $
-**! class image
+**! $Id: blit.c,v 1.30 1999/04/13 12:32:09 mirar Exp $
+**! class Image
*/
#include <math.h>
diff --git a/src/modules/Image/blit_layer_include.h b/src/modules/Image/blit_layer_include.h
index e6f605e383307ad04c77cc7bc0982ce98fa0d81c..59463e17cf8686e19604ff7dd814935b4921173a 100644
--- a/src/modules/Image/blit_layer_include.h
+++ b/src/modules/Image/blit_layer_include.h
@@ -1,11 +1,11 @@
-/* $Id: blit_layer_include.h,v 1.5 1997/12/28 09:29:31 hubbe Exp $ */
+/* $Id: blit_layer_include.h,v 1.6 1999/04/13 12:32:11 mirar Exp $ */
/* included w/ defines in blit.c, image_add_layer() */
/*
**! module Image
**! note
-**! $Id: blit_layer_include.h,v 1.5 1997/12/28 09:29:31 hubbe Exp $
-**! class image
+**! $Id: blit_layer_include.h,v 1.6 1999/04/13 12:32:11 mirar Exp $
+**! class Image
*/
diff --git a/src/modules/Image/colors.c b/src/modules/Image/colors.c
index 2d129f662a9c3e2ce8a588970370f957cb4263f9..2cdee4fa12a4231ff1383e8ab1cbc17a1e00524d 100644
--- a/src/modules/Image/colors.c
+++ b/src/modules/Image/colors.c
@@ -1,8 +1,8 @@
/*
**! module Image
**! note
-**! $Id: colors.c,v 1.11 1999/04/12 14:55:48 mirar Exp $
-**! submodule color
+**! $Id: colors.c,v 1.12 1999/04/13 12:32:12 mirar Exp $
+**! submodule Color
**!
**! This module keeps names and easy handling
**! for easy color support. It gives you an easy
@@ -11,47 +11,47 @@
**! A color is here an object, containing color
**! information and methods for conversion, see below.
**!
-**! <ref>Image.color</ref> can be called to make a color object.
-**! <ref>Image.color()</ref> takes the following arguments:
+**! <ref>Image.Color</ref> can be called to make a color object.
+**! <ref>Image.Color()</ref> takes the following arguments:
**! <pre>
-**! Image.color(string name) // "red"
-**! Image.color(string prefix_string) // "lightblue"
-**! Image.color(string hex_name) // "#ff00ff"
-**! Image.color(string cmyk_string) // "%17,42,0,19.4"
-**! Image.color(string hsv_string) // "%@327,90,32"
-**! Image.color(int red, int green, int blue)
+**! Image.Color(string name) // "red"
+**! Image.Color(string prefix_string) // "lightblue"
+**! Image.Color(string hex_name) // "#ff00ff"
+**! Image.Color(string cmyk_string) // "%17,42,0,19.4"
+**! Image.Color(string hsv_string) // "%@327,90,32"
+**! Image.Color(int red, int green, int blue)
**! </pre>
**!
**! The color names available can be listed by using indices
-**! on Image.color. The colors are available by name directly
-**! as <tt>Image.color.name</tt>, too:
+**! on Image.Color. The colors are available by name directly
+**! as <tt>Image.Color.name</tt>, too:
**! <pre>
-**! ...Image.color.red...
-**! ...Image.color.green...
+**! ...Image.Color.red...
+**! ...Image.Color.green...
**! or, maybe
-**! import Image.color;
+**! import Image.Color;
**! ...red...
**! ...green...
**! ...lightgreen...
**! </pre>
**!
**! Giving red, green and blue values is equal to calling
-**! <ref>Image.color.rgb</ref>().
+**! <ref>Image.Color.rgb</ref>().
**!
**! The prefix_string method is a form for getting modified
**! colors, it understands all modifiers
-**! (<link to=Image.color.color.light>light</link>,
-**! <link to=Image.color.color.dark>dark</link>,
-**! <link to=Image.color.color.bright>bright</link>,
-**! <link to=Image.color.color.dull>dull</link> and
-**! <link to=Image.color.color.neon>neon</link>). Simply use
+**! (<link to=Image.Color.Color.light>light</link>,
+**! <link to=Image.Color.Color.dark>dark</link>,
+**! <link to=Image.Color.Color.bright>bright</link>,
+**! <link to=Image.Color.Color.dull>dull</link> and
+**! <link to=Image.Color.Color.neon>neon</link>). Simply use
**! "method"+"color"; (as in <tt>lightgreen</tt>,
**! <tt>dullmagenta</tt>, <tt>lightdullorange</tt>).
**!
**! The <tt>hex_name</tt> form is a simple
**! <tt>#rrggbb</tt> form, as in HTML or X-program argument.
**! A shorter form (<tt>#rgb</tt>) is also accepted. This
-**! is the inverse to the <ref>Image.color.color->hex</ref>()
+**! is the inverse to the <ref>Image.Color.Color->hex</ref>()
**! method.
**!
**! The <tt>cmyk_string</tt> is a string form of giving
@@ -63,30 +63,30 @@
**! and saturation and value is given in percent. <i>This is not
**! the same as returned or given to the <ref>hsv</ref>() methods!</i>
**!
-**! see also: Image.color.color->name, Image.color.color->rgb
+**! see also: Image.Color.Color->name, Image.Color.Color->rgb
**!
**! added:
**! pike 0.7
**!
**! note:
-**! <tt>Image.color["something"]</tt> will never(!) generate an error,
+**! <tt>Image.Color["something"]</tt> will never(!) generate an error,
**! but a zero_type 0, if the color is unknown. This is enough
**! to give the error "not present in module", if used
-**! as <tt>Image.color.something</tt>, though.
+**! as <tt>Image.Color.something</tt>, though.
**!
**! If you are using colors from for instance a webpage, you might
-**! want to create the color from <ref>Image.color.guess</ref>(),
+**! want to create the color from <ref>Image.Color.guess</ref>(),
**! since that method is more tolerant for mistakes and errors.
**!
-**! <tt>Image.color</tt>() is case- and space-sensitive.
-**! Use <ref>Image.color.guess</ref>() to catch all variants.
+**! <tt>Image.Color</tt>() is case- and space-sensitive.
+**! Use <ref>Image.Color.guess</ref>() to catch all variants.
**!
**! and subtract with a space (lower_case(x)-" ") to make
**! sure you get all variants.
**!
-**! see also: Image.color.color, Image.color.guess, Image, Image.colortable
+**! see also: Image.Color.Color, Image.Color.guess, Image, Image.Colortable
**!
-**! class color
+**! class Color
**! This is the color object. It has six readable variables,
**! <tt>r</tt>, <tt>g</tt>, <tt>b</tt>, for the <i>red</i>,
**! <i>green</i> and <i>blue</i> values,
@@ -97,7 +97,7 @@
#include "global.h"
#include <config.h>
-RCSID("$Id: colors.c,v 1.11 1999/04/12 14:55:48 mirar Exp $");
+RCSID("$Id: colors.c,v 1.12 1999/04/13 12:32:12 mirar Exp $");
#include "config.h"
@@ -299,7 +299,7 @@ static void try_find_name(struct color_struct *this)
/*
**! method void create(int r,int g,int b)
-**! This is the main <ref>Image.color.color</ref> creation
+**! This is the main <ref>Image.Color.Color</ref> creation
**! method, mostly for internal use.
**----- internal note: it takes a fourth argument, name of color ---
**!
@@ -311,7 +311,7 @@ static void try_find_name(struct color_struct *this)
**! method int greylevel()
**! method int greylevel(int r, int g, int b)
**! This is methods of getting information from an
-**! <ref>Image.color.color</ref> object.
+**! <ref>Image.Color.Color</ref> object.
**!
**! They give an array of
**! red, green and blue (rgb) values (color value),<br>
@@ -324,7 +324,7 @@ static void try_find_name(struct color_struct *this)
**! and could be given by argument.
**!
**! returns array(int) respective int
-**! see also: Image.color.color, grey
+**! see also: Image.Color.Color, grey
*/
static void image_color_rgb(INT32 args)
@@ -356,7 +356,7 @@ static void image_color_greylevel(INT32 args)
}
else
{
- get_all_args("Image.color.color->greylevel()",args,"%i%i%i",&r,&g,&b);
+ get_all_args("Image.Color.Color->greylevel()",args,"%i%i%i",&r,&g,&b);
}
pop_n_elems(args);
if (r+g+b==0) r=g=b=1;
@@ -452,7 +452,7 @@ static void image_color_cmyk(INT32 args)
**! method object grey(int red,int green,int blue)
**! Gives a new color, containing a grey color,
**! which is calculated by the <ref>greylevel</ref> method.
-**! returns a new <ref>Image.color.color</ref> object
+**! returns a new <ref>Image.Color.Color</ref> object
**! see also: greylevel
*/
@@ -484,8 +484,8 @@ static void image_color_grey(INT32 args)
**! the color, or the <ref>hex</ref>(2) if it isn't one
**! of the 16 <tt>HTML</tt> colors.
**!
-**! returns a new <ref>Image.color.color</ref> object
-**! see also: rgb, hsv, Image.color
+**! returns a new <ref>Image.Color.Color</ref> object
+**! see also: rgb, hsv, Image.Color
*/
static void image_color_hex(INT32 args)
@@ -494,7 +494,7 @@ static void image_color_hex(INT32 args)
INT32 i=sizeof(COLORTYPE)*2;
if (args)
- get_all_args("Image.color.color->hex()",args,"%i",&i);
+ get_all_args("Image.Color.Color->hex()",args,"%i",&i);
pop_n_elems(args);
if (i<1)
@@ -591,7 +591,7 @@ static void image_color_cast(INT32 args)
{
if (args!=1 ||
sp[-1].type!=T_STRING)
- error("Image.color.color->cast(): Illegal argument(s)\n");
+ error("Image.Color.Color->cast(): Illegal argument(s)\n");
if (sp[-1].u.string==str_array)
{
@@ -603,7 +603,7 @@ static void image_color_cast(INT32 args)
image_color_name(args);
return;
}
- error("Image.color.color->cast(): Can't cast to that\n");
+ error("Image.Color.Color->cast(): Can't cast to that\n");
}
static void image_color_index(INT32 args)
@@ -611,7 +611,7 @@ static void image_color_index(INT32 args)
struct svalue s;
if (args!=1)
- error("Image.color[]: illegal number of arguments\n");
+ error("Image.Color[]: illegal number of arguments\n");
object_index_no_free2(&s,THISOBJ,sp-1);
if (s.type==T_INT && sp[-1].type==T_STRING)
@@ -672,9 +672,9 @@ static void image_color_index(INT32 args)
**! Compares this object to another color,
**! or color name. Example:
**! <pre>
-**! object red=Image.color.red;
-**! object other=Image.color. ...;
-**! object black=Image.color.black;
+**! object red=Image.Color.red;
+**! object other=Image.Color. ...;
+**! object black=Image.Color.black;
**!
**! if (red==other) ...
**! if (red==({255,0,0})) ...
@@ -691,7 +691,7 @@ static void image_color_index(INT32 args)
static void image_color_equal(INT32 args)
{
if (args!=1)
- error("Image.color.color->`==: illegal number of arguments");
+ error("Image.Color.Color->`==: illegal number of arguments");
if (sp[-1].type==T_OBJECT)
{
@@ -769,32 +769,32 @@ static void image_color___hash(INT32 args)
**! <tr><th>method</th><th width=50%>effect</th>
**! <th>h</th><th>s</th><th>v</th><th>as</th></tr>
**! <tr><td>light </td><td>raise light level</td><td>�0</td><td> �0</td><td>+50</td>
-**! <td><illustration>return Image.image(20,20,@(array)Image.color["#693e3e"])</illustration>
-**! <illustration>return Image.image(20,20,@(array)Image.color["#693e3e"]->light())</illustration>
-**! <illustration>return Image.image(20,20,@(array)Image.color["#693e3e"]->light()->light())</illustration>
-**! <illustration>return Image.image(20,20,@(array)Image.color["#693e3e"]->light()->light()->light())</illustration></td></tr>
+**! <td><illustration>return Image(20,20,@(array)Color["#693e3e"])</illustration>
+**! <illustration>return Image(20,20,@(array)Color["#693e3e"]->light())</illustration>
+**! <illustration>return Image(20,20,@(array)Color["#693e3e"]->light()->light())</illustration>
+**! <illustration>return Image(20,20,@(array)Color["#693e3e"]->light()->light()->light())</illustration></td></tr>
**!
**! <tr><td>dark </td><td>lower light level</td><td>�0</td><td> �0</td><td>-50</td>
-**! <td><illustration>return Image.image(20,20,@(array)Image.color["#693e3e"])</illustration>
-**! <illustration>return Image.image(20,20,@(array)Image.color["#693e3e"]->dark())</illustration>
-**! <illustration>return Image.image(20,20,@(array)Image.color["#693e3e"]->dark()->dark())</illustration>
-**! <illustration>return Image.image(20,20,@(array)Image.color["#693e3e"]->dark()->dark()->dark())</illustration></td></tr>
+**! <td><illustration>return Image(20,20,@(array)Color["#693e3e"])</illustration>
+**! <illustration>return Image(20,20,@(array)Color["#693e3e"]->dark())</illustration>
+**! <illustration>return Image(20,20,@(array)Color["#693e3e"]->dark()->dark())</illustration>
+**! <illustration>return Image(20,20,@(array)Color["#693e3e"]->dark()->dark()->dark())</illustration></td></tr>
**!
**! <tr><td>bright</td><td>brighter color </td><td>�0</td><td>+50</td><td>+50</td>
-**! <td><illustration>return Image.image(20,20,@(array)Image.color["#693e3e"])</illustration>
-**! <illustration>return Image.image(20,20,@(array)Image.color["#693e3e"]->bright())</illustration>
-**! <illustration>return Image.image(20,20,@(array)Image.color["#693e3e"]->bright()->bright())</illustration>
-**! <illustration>return Image.image(20,20,@(array)Image.color["#693e3e"]->bright()->bright()->bright())</illustration></td></tr>
+**! <td><illustration>return Image(20,20,@(array)Color["#693e3e"])</illustration>
+**! <illustration>return Image(20,20,@(array)Color["#693e3e"]->bright())</illustration>
+**! <illustration>return Image(20,20,@(array)Color["#693e3e"]->bright()->bright())</illustration>
+**! <illustration>return Image(20,20,@(array)Color["#693e3e"]->bright()->bright()->bright())</illustration></td></tr>
**!
**! <tr><td>dull </td><td>greyer color </td><td>�0</td><td>-50</td><td>-50</td>
-**! <td><illustration>return Image.image(20,20,@(array)Image.color.red)</illustration>
-**! <illustration>return Image.image(20,20,@(array)Image.color.red->dull())</illustration>
-**! <illustration>return Image.image(20,20,@(array)Image.color.red->dull()->dull())</illustration>
-**! <illustration>return Image.image(20,20,@(array)Image.color.red->dull()->dull()->dull())</illustration></td></tr>
+**! <td><illustration>return Image(20,20,@(array)Color.red)</illustration>
+**! <illustration>return Image(20,20,@(array)Color.red->dull())</illustration>
+**! <illustration>return Image(20,20,@(array)Color.red->dull()->dull())</illustration>
+**! <illustration>return Image(20,20,@(array)Color.red->dull()->dull()->dull())</illustration></td></tr>
**!
**! <tr><td>neon </td><td>set to extreme </td><td>�0</td><td>max</td><td>max</td>
-**! <td><illustration>return Image.image(20,20,@(array)Image.color["#693e3e"])</illustration>
-**! <illustration>return Image.image(20,20,@(array)Image.color["#693e3e"]->neon())</illustration></td></tr>
+**! <td><illustration>return Image(20,20,@(array)Color["#693e3e"])</illustration>
+**! <illustration>return Image(20,20,@(array)Color["#693e3e"]->neon())</illustration></td></tr>
**!
**! </table>
**! returns the new color object
@@ -802,9 +802,9 @@ static void image_color___hash(INT32 args)
**! The opposites may not always take each other out.
**! The color is maximised at white and black levels,
**! so, for instance
-**! <ref>Image.color</ref>.white-><ref>light</ref>()-><ref>dark</ref>()
+**! <ref>Image.Color</ref>.white-><ref>light</ref>()-><ref>dark</ref>()
**! doesn't give the white color back, but the equal to
-**! <ref>Image.color</ref>.white-><ref>dark</ref>(), since
+**! <ref>Image.Color</ref>.white-><ref>dark</ref>(), since
**! white can't get any <ref>light</ref>er.
*/
@@ -893,7 +893,7 @@ static void image_color_bright(INT32 args)
static void image_color_mult(INT32 args)
{
float x=0.0;
- get_all_args("Image.color.color->`*",args,"%f",&x);
+ get_all_args("Image.Color.Color->`*",args,"%f",&x);
pop_n_elems(args);
_image_make_rgb_color((int)(THIS->rgb.r*x),
(int)(THIS->rgb.g*x),
@@ -955,7 +955,7 @@ static void image_color_add(INT32 args)
rgb_group rgb;
if (!image_color_arg(args,&rgb))
- error("Image.color.color->`+: Illegal argument(s)");
+ error("Image.Color.Color->`+: Illegal argument(s)");
pop_n_elems(args);
_image_make_rgb_color((int)(THIS->rgb.r+rgb.r),
@@ -977,7 +977,7 @@ static void image_get_color(INT32 args)
static char *callables[]={"light","dark","neon","dull","bright"};
if (args!=1)
- error("Image.color[]: illegal number of args");
+ error("Image.Color[]: illegal number of args");
if (!colors)
make_colors();
@@ -1061,7 +1061,7 @@ static void image_get_color(INT32 args)
pop_stack();
sp--;
push_array_items(sp->u.array);
- get_all_args("Image.color()",3,"%f%f%f",&h,&s,&v);
+ get_all_args("Image.Color()",3,"%f%f%f",&h,&s,&v);
pop_n_elems(3);
push_int((INT32)(h/360.0*256.0));
push_int((INT32)(s/100.0*255.4));
@@ -1142,7 +1142,7 @@ static void image_guess_color(INT32 args)
struct svalue s;
if (args!=1 && sp[-args].type!=T_STRING)
- error("Image.color->guess(): illegal argument(s)\n");
+ error("Image.Color->guess(): illegal argument(s)\n");
f_lower_case(1);
push_text(" ");
@@ -1179,11 +1179,11 @@ static void image_make_color(INT32 args)
/*
**! module Image
-**! submodule color
+**! submodule Color
**!
**! method object guess(string)
**! This is equivalent to
-**! <tt><ref>Image.color</ref>(lower_case(str)-" ")</tt>,
+**! <tt><ref>Image.Color</ref>(lower_case(str)-" ")</tt>,
**! and tries the color with a prepending '#' if no
**! corresponding color is found.
**!
@@ -1255,7 +1255,7 @@ static void image_make_rgb_color(INT32 args)
{
INT32 r=0,g=0,b=0;
- get_all_args("Image.color.rgb()",args,"%i%i%i",&r,&g,&b);
+ get_all_args("Image.Color.rgb()",args,"%i%i%i",&r,&g,&b);
_image_make_rgb_color(r,g,b);
}
@@ -1268,7 +1268,7 @@ static void image_make_hsv_color(INT32 args)
if (args && sp[-args].type==T_INT)
{
INT32 hi,si,vi;
- get_all_args("Image.color.hsv()",args,"%i%i%i",
+ get_all_args("Image.Color.hsv()",args,"%i%i%i",
&hi,&si,&vi);
pop_n_elems(args);
@@ -1283,7 +1283,7 @@ static void image_make_hsv_color(INT32 args)
}
else
{
- get_all_args("Image.color.hsv()",args,"%f%f%f",
+ get_all_args("Image.Color.hsv()",args,"%f%f%f",
&h,&s,&v);
pop_n_elems(args);
if (h<0) h=360+h-(((int)h/360)*360);
@@ -1324,7 +1324,7 @@ static void image_make_hsv_color(INT32 args)
static void image_make_cmyk_color(INT32 args)
{
float c,m,y,k,r,g,b;
- get_all_args("Image.color.cmyk()",args,"%F%F%F%F",&c,&m,&y,&k);
+ get_all_args("Image.Color.cmyk()",args,"%F%F%F%F",&c,&m,&y,&k);
pop_n_elems(args);
r=100-(c+k);
@@ -1338,7 +1338,7 @@ static void image_make_greylevel_color(INT32 args)
{
INT32 i;
- get_all_args("Image.color.greylevel()",args,"%i",&i);
+ get_all_args("Image.Color.greylevel()",args,"%i",&i);
pop_n_elems(args);
_image_make_rgb_color(i,i,i);
@@ -1351,7 +1351,7 @@ static void image_make_html_color(INT32 args)
if (args!=1 ||
sp[-1].type!=T_STRING)
{
- error("Image.color.html(): illegal arguments\n");
+ error("Image.Color.html(): illegal arguments\n");
return;
}
@@ -1380,10 +1380,10 @@ static void image_make_html_color(INT32 args)
/*
**! method array(string) _indices()
**! method array(object) _values()
-**! (ie as <tt>indices(Image.color)</tt> or <tt>values(Image.color)</tt>)
+**! (ie as <tt>indices(Image.Color)</tt> or <tt>values(Image.Color)</tt>)
**! <tt>indices</tt> gives a list of all the known color names,
**! <tt>values</tt> gives there corresponding objects.
-**! see also: Image.color
+**! see also: Image.Color
*/
static void image_colors_indices(INT32 args)
@@ -1476,12 +1476,12 @@ void init_image_colors(void)
ADD_FUNCTION("_indices",image_colors_indices,tFunc(,tArr(tStr)),0);
ADD_FUNCTION("_values",image_colors_values,tFunc(,tArr(tObj)),0);
- add_program_constant("color",image_color_program,0);
+ add_program_constant("Color",image_color_program,0);
prg=end_program();
push_object(clone_object(prg,0));
free_program(prg);
- str=make_shared_string("color");
+ str=make_shared_string("Color");
add_constant(str,sp-1,0);
free_string(str);
pop_stack();
diff --git a/src/modules/Image/colortable.c b/src/modules/Image/colortable.c
index 381ca9b25e5f895656b1fa09ed7ea0c2c826d68f..511b479dd80d897991fc9652d138909302506d54 100644
--- a/src/modules/Image/colortable.c
+++ b/src/modules/Image/colortable.c
@@ -1,12 +1,12 @@
#include "global.h"
#include <config.h>
-/* $Id: colortable.c,v 1.64 1999/04/13 11:14:55 mirar Exp $ */
+/* $Id: colortable.c,v 1.65 1999/04/13 12:32:15 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: colortable.c,v 1.64 1999/04/13 11:14:55 mirar Exp $
+**! $Id: colortable.c,v 1.65 1999/04/13 12:32:15 mirar Exp $
**! class Colortable
**!
**! This object keeps colortable information,
@@ -15,13 +15,13 @@
**! The object has color reduction, quantisation,
**! mapping and dithering capabilities.
**!
-**! see also: Image, Image.image, Image.font, Image.GIF
+**! see also: Image, Image.Image, Image.Font, Image.GIF
*/
#undef COLORTABLE_DEBUG
#undef COLORTABLE_REDUCE_DEBUG
-RCSID("$Id: colortable.c,v 1.64 1999/04/13 11:14:55 mirar Exp $");
+RCSID("$Id: colortable.c,v 1.65 1999/04/13 12:32:15 mirar Exp $");
#include <math.h> /* fabs() */
@@ -1815,8 +1815,6 @@ static rgbl_group dither_ordered_encode(struct nct_dither *dith,
int xs=dith->u.ordered.xs;
int ys=dith->u.ordered.ys;
- fprintf(stderr,"newline\n");
-
i=(int)(s.r+dith->u.ordered.rdiff
[((rowpos+dith->u.ordered.rx)%xs)+
((dith->u.ordered.row+dith->u.ordered.ry)%ys)*xs]);
@@ -1981,13 +1979,13 @@ void image_colortable_free_dither(struct nct_dither *dith)
/*
**! method void create()
**! method void create(array(array(int)) colors)
-**! method void create(object(Image.image) image,int number)
-**! method void create(object(Image.image) image,int number,array(array(int)) needed)
+**! method void create(object(Image.Image) image,int number)
+**! method void create(object(Image.Image) image,int number,array(array(int)) needed)
**! method void create(int r,int g,int b)
**! method void create(int r,int g,int b, array(int) from1,array(int) to1,int steps1, ..., array(int) fromn,array(int) ton,int stepsn)
**! method object add(array(array(int)) colors)
-**! method object add(object(Image.image) image,int number)
-**! method object add(object(Image.image) image,int number,array(array(int)) needed)
+**! method object add(object(Image.Image) image,int number)
+**! method object add(object(Image.Image) image,int number,array(array(int)) needed)
**! method object add(int r,int g,int b)
**! method object add(int r,int g,int b, array(int) from1,array(int) to1,int steps1, ..., array(int) fromn,array(int) ton,int stepsn)
**
@@ -2021,7 +2019,7 @@ void image_colortable_free_dither(struct nct_dither *dith)
**!
**! arg array(array(int)) colors
**! list of colors
-**! arg object(Image.image) image
+**! arg object(Image.Image) image
**! source image
**!
**! note: you may not get all colors from image,
@@ -2258,7 +2256,7 @@ void image_colortable_create(INT32 args)
**! improve floyd-steinberg dithering result.
**! (It doesn't work very well, though.)
**!
-**! returns the new <ref>colortable</ref> object
+**! returns the new <ref>Colortable</ref> object
**!
**! arg int colors
**! target number of colors
@@ -2356,10 +2354,10 @@ void image_colortable_reduce_fs(INT32 args)
/*
**! method object `+(object with,...)
**! sums colortables
-**! returns the resulting new <ref>colortable</ref> object
+**! returns the resulting new <ref>Colortable</ref> object
**!
-**! arg object(<ref>colortable</ref>) with
-**! <ref>colortable</ref> object with colors to add
+**! arg object(<ref>Colortable</ref>) with
+**! <ref>Colortable</ref> object with colors to add
**/
void image_colortable_operator_plus(INT32 args)
@@ -2408,10 +2406,10 @@ void image_colortable_operator_plus(INT32 args)
/*
**! method object `-(object with,...)
**! subtracts colortables
-**! returns the resulting new <ref>colortable</ref> object
+**! returns the resulting new <ref>Colortable</ref> object
**!
-**! arg object(<ref>colortable</ref>) with
-**! <ref>colortable</ref> object with colors to subtract
+**! arg object(<ref>Colortable</ref>) with
+**! <ref>Colortable</ref> object with colors to subtract
**/
void image_colortable_operator_minus(INT32 args)
@@ -2620,9 +2618,9 @@ void image_colortable_cast_to_string(struct neo_colortable *nct)
/*
**! method object cast(string to)
**! cast the colortable to an array or mapping,
-**! the array consists of <ref>Image.color</ref> objects
+**! the array consists of <ref>Image.Color</ref> objects
**! and are not in index order. The mapping consists of
-**! index:<ref>Image.color</ref> pairs, where index is
+**! index:<ref>Image.Color</ref> pairs, where index is
**! the index (int) of that color.
**!
**! example: <tt>(mapping)Image.Colortable(img)</tt>
@@ -2792,8 +2790,8 @@ void image_colortable_rigid(INT32 args)
**!
**! <table><tr valign=center>
**! <td><illustration> return lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),16); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),16)->cubicles(4,5,4,200); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),16); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),16)->cubicles(4,5,4,200); return c*lena(); </illustration></td>
**! </tr><tr valign=center>
**! <td>original</td>
**! <td>default cubicles,<br>16 colors</td>
@@ -3267,35 +3265,35 @@ void build_rigid(struct neo_colortable *nct)
**!
**! <table><tr valign=center>
**! <td></td>
-**! <td><illustration> object c=Image.Colortable(lena(),2); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),4); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),8); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),16); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),32); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),2); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),4); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),8); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),16); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),32); return c*lena(); </illustration></td>
**! <td>no dither</td>
**! </tr><tr valign=center>
**! <td></td>
-**! <td><illustration> object c=Image.Colortable(lena(),2)->floyd_steinberg(); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),4)->floyd_steinberg(); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),8)->floyd_steinberg(); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),16)->floyd_steinberg(); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),32)->floyd_steinberg(); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),2)->floyd_steinberg(); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),4)->floyd_steinberg(); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),8)->floyd_steinberg(); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),16)->floyd_steinberg(); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),32)->floyd_steinberg(); return c*lena(); </illustration></td>
**! <td><ref>floyd_steinberg</ref> dither</td>
**! </tr><tr valign=center>
**! <td></td>
-**! <td><illustration> object c=Image.Colortable(lena(),2)->ordered(60,60,60); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),4)->ordered(45,45,45); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),8)->ordered(40,40,40); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),16)->ordered(40,40,40); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),32)->ordered(15,15,15); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),2)->ordered(60,60,60); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),4)->ordered(45,45,45); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),8)->ordered(40,40,40); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),16)->ordered(40,40,40); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),32)->ordered(15,15,15); return c*lena(); </illustration></td>
**! <td><ref>ordered</ref> dither</td>
**! </tr><tr valign=center>
**! <td><illustration> return lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),2)->randomcube(60,60,60); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),4)->randomcube(45,45,45); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),8)->randomcube(40,40,40); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),16)->randomcube(40,40,40); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),32)->randomcube(15,15,15); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),2)->randomcube(60,60,60); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),4)->randomcube(45,45,45); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),8)->randomcube(40,40,40); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),16)->randomcube(40,40,40); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),32)->randomcube(15,15,15); return c*lena(); </illustration></td>
**! <td><ref>randomcube</ref> dither</td>
**! </tr><tr valign=center>
**! <td>original</td>
@@ -3652,7 +3650,7 @@ void image_colortable_index_32bit(INT32 args)
**! in the colorspace and comparing grey levels.
**!
**! Default factors are 3, 4 and 1; blue is much
-**! darker than green. Compare with <ref>Image.image->grey</ref>().
+**! darker than green. Compare with <ref>Image.Image->grey</ref>().
**!
**! returns the called object
**!
@@ -3692,8 +3690,8 @@ void image_colortable_spacefactors(INT32 args)
**!
**! <table><tr valign=center>
**! <td><illustration> return lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(4,4,4)->floyd_steinberg(); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(lena(),16)->floyd_steinberg(); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(4,4,4)->floyd_steinberg(); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(lena(),16)->floyd_steinberg(); return c*lena(); </illustration></td>
**! </tr><tr valign=center>
**! <td>original</td>
**! <td>floyd_steinberg to a 4�4�4 colorcube</td>
@@ -3820,8 +3818,8 @@ void image_colortable_nodither(INT32 args)
**!
**! <table><tr valign=center>
**! <td><illustration> return lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(4,4,4)->randomcube(); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(4,4,4)->randomgrey(); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(4,4,4)->randomcube(); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(4,4,4)->randomgrey(); return c*lena(); </illustration></td>
**! </tr><tr valign=top>
**! <td>original</td>
**! <td colspan=2>mapped to <br><tt>Image.Colortable(4,4,4)-></tt></td>
@@ -3831,23 +3829,23 @@ void image_colortable_nodither(INT32 args)
**! <td>randomgrey()</td>
**! </tr><tr valign=top>
**! <td><illustration>
-**! object i=Image.image(lena()->xsize(),lena()->ysize());
+**! object i=Image(lena()->xsize(),lena()->ysize());
**! i->tuned_box(0,0,i->xsize()-1,i->ysize()-1,
**! ({({0,0,0}),({0,0,0}),({255,255,255}),({255,255,255})}));
**! return i;
**! </illustration></td>
**! <td><illustration>
-**! object i=Image.image(lena()->xsize(),lena()->ysize());
+**! object i=Image(lena()->xsize(),lena()->ysize());
**! i->tuned_box(0,0,i->xsize()-1,i->ysize()-1,
**! ({({0,0,0}),({0,0,0}),({255,255,255}),({255,255,255})}));
-**! object c=Image.Colortable(4,4,4)->randomcube();
+**! object c=Colortable(4,4,4)->randomcube();
**! return c*i;
**! </illustration></td>
**! <td><illustration>
-**! object i=Image.image(lena()->xsize(),lena()->ysize());
+**! object i=Image(lena()->xsize(),lena()->ysize());
**! i->tuned_box(0,0,i->xsize()-1,i->ysize()-1,
**! ({({0,0,0}),({0,0,0}),({255,255,255}),({255,255,255})}));
-**! object c=Image.Colortable(4,4,4)->randomgrey();
+**! object c=Colortable(4,4,4)->randomgrey();
**! return c*i;
**! </illustration></td>
**! </tr></table>
@@ -4058,9 +4056,9 @@ static int *ordered_make_diff(int *errors,int sz,int err)
**!
**! <table><tr valign=center>
**! <td><illustration> return lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(6,6,6)->ordered(42,42,42,2,2); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(6,6,6)->ordered(); return c*lena(); </illustration></td>
-**! <td><illustration> object c=Image.Colortable(6,6,6)->ordered(42,42,42,8,8,0,0,0,1,1,0); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(6,6,6)->ordered(42,42,42,2,2); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(6,6,6)->ordered(); return c*lena(); </illustration></td>
+**! <td><illustration> object c=Colortable(6,6,6)->ordered(42,42,42,8,8,0,0,0,1,1,0); return c*lena(); </illustration></td>
**! </tr><tr valign=top>
**! <td>original</td>
**! <td colspan=2>mapped to <br><tt>Image.Colortable(6,6,6)-></tt></td>
@@ -4071,30 +4069,30 @@ static int *ordered_make_diff(int *errors,int sz,int err)
**! <td><tt>ordered<br> (42,42,42, 8,8,<br> 0,0, 0,1, 1,0)</tt></td>
**! </tr><tr valign=top>
**! <td><illustration>
-**! object i=Image.image(lena()->xsize(),lena()->ysize());
+**! object i=Image(lena()->xsize(),lena()->ysize());
**! i->tuned_box(0,0,i->xsize()-1,i->ysize()-1,
**! ({({0,0,0}),({0,0,0}),({255,255,255}),({255,255,255})}));
**! return i;
**! </illustration></td>
**! <td><illustration>
-**! object i=Image.image(lena()->xsize(),lena()->ysize());
+**! object i=Image(lena()->xsize(),lena()->ysize());
**! i->tuned_box(0,0,i->xsize()-1,i->ysize()-1,
**! ({({0,0,0}),({0,0,0}),({255,255,255}),({255,255,255})}));
-**! object c=Image.Colortable(6,6,6)->ordered(42,42,42,2,2);
+**! object c=Colortable(6,6,6)->ordered(42,42,42,2,2);
**! return c*i;
**! </illustration></td>
**! <td><illustration>
-**! object i=Image.image(lena()->xsize(),lena()->ysize());
+**! object i=Image(lena()->xsize(),lena()->ysize());
**! i->tuned_box(0,0,i->xsize()-1,i->ysize()-1,
**! ({({0,0,0}),({0,0,0}),({255,255,255}),({255,255,255})}));
-**! object c=Image.Colortable(6,6,6)->ordered();
+**! object c=Colortable(6,6,6)->ordered();
**! return c*i;
**! </illustration></td>
**! <td><illustration>
-**! object i=Image.image(lena()->xsize(),lena()->ysize());
+**! object i=Image(lena()->xsize(),lena()->ysize());
**! i->tuned_box(0,0,i->xsize()-1,i->ysize()-1,
**! ({({0,0,0}),({0,0,0}),({255,255,255}),({255,255,255})}));
-**! object c=Image.Colortable(6,6,6)->ordered(42,42,42,8,8,0,0,0,1,1,0);
+**! object c=Colortable(6,6,6)->ordered(42,42,42,8,8,0,0,0,1,1,0);
**! return c*i;
**! </illustration></td>
**! </tr></table>
diff --git a/src/modules/Image/dct.c b/src/modules/Image/dct.c
index b43d0873ee1d4ca944b29416ce2bca68b6f36f19..17fb32677e4464cdf8dff707e708112de38e5f06 100644
--- a/src/modules/Image/dct.c
+++ b/src/modules/Image/dct.c
@@ -1,10 +1,10 @@
-/* $Id: dct.c,v 1.11 1998/01/13 22:59:22 hubbe Exp $ */
+/* $Id: dct.c,v 1.12 1999/04/13 12:32:18 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: dct.c,v 1.11 1998/01/13 22:59:22 hubbe Exp $
-**! class image
+**! $Id: dct.c,v 1.12 1999/04/13 12:32:18 mirar Exp $
+**! class Image
*/
#include "global.h"
diff --git a/src/modules/Image/doc-header b/src/modules/Image/doc-header
index c045ca6fd793260b74b09a47b2202e968c037c8f..5d6973a1c672c021790116667ccdf36015f781c2 100644
--- a/src/modules/Image/doc-header
+++ b/src/modules/Image/doc-header
@@ -4,19 +4,19 @@
**!
**! <table border=0>
**! <tr>
-**! <td align=left valign=top><ref>Image.image</ref></td>
+**! <td align=left valign=top><ref>Image.Image</ref></td>
**! <td align=left valign=top>Basic image manipulation</td>
**! </tr>
**! <tr>
-**! <td align=left valign=top><ref>Image.font</ref></td>
+**! <td align=left valign=top><ref>Image.Font</ref></td>
**! <td align=left valign=top>Creating images from text</td>
**! </tr>
**! <tr>
-**! <td align=left valign=top><ref>Image.colortable</ref></td>
+**! <td align=left valign=top><ref>Image.Colortable</ref></td>
**! <td align=left valign=top>Color reduction, quantisation and dither</td>
**! </tr>
**! <tr>
-**! <td align=left valign=top><ref>Image.color</ref></td>
+**! <td align=left valign=top><ref>Image.Color</ref></td>
**! <td align=left valign=top>Color names, objects and conversion</td>
**! </tr>
**! <tr></tr><tr></tr><tr></tr>
@@ -60,12 +60,5 @@
**! of bit-mending stuff.</td>
**! </tr>
**! </table>
-1.4 Image.GIF
- 1.5 Image.JPEG
- 1.6 Image.PNG
- 1.7 Image.PNM
- 1.8 Image.X
- 1.9 Image.XFace
- 1.10 Image.XWD
**! note
**! <font size=-1><pre>Image module documentation is based on these file versions:
diff --git a/src/modules/Image/encodings/bmp.c b/src/modules/Image/encodings/bmp.c
index 98243d4054d453fa010f6d4850ec5357476742c6..b0fe098075e8f2ac6310f4aaec63fe0fb616d8ec 100644
--- a/src/modules/Image/encodings/bmp.c
+++ b/src/modules/Image/encodings/bmp.c
@@ -1,9 +1,9 @@
-/* $Id: bmp.c,v 1.3 1999/04/12 11:41:13 mirar Exp $ */
+/* $Id: bmp.c,v 1.4 1999/04/13 12:32:39 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: bmp.c,v 1.3 1999/04/12 11:41:13 mirar Exp $
+**! $Id: bmp.c,v 1.4 1999/04/13 12:32:39 mirar Exp $
**! submodule BMP
**!
**! This submodule keeps the BMP (Windows Bitmap)
@@ -14,7 +14,7 @@
**! Simple encoding:<br>
**! <ref>encode</ref>
**!
-**! see also: Image, Image.image, Image.colortable
+**! see also: Image, Image.Image, Image.Colortable
*/
#include "global.h"
@@ -22,7 +22,7 @@
#include <ctype.h>
#include "stralloc.h"
-RCSID("$Id: bmp.c,v 1.3 1999/04/12 11:41:13 mirar Exp $");
+RCSID("$Id: bmp.c,v 1.4 1999/04/13 12:32:39 mirar Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
diff --git a/src/modules/Image/encodings/gif.c b/src/modules/Image/encodings/gif.c
index b0841b05a5ed67d2bd3888cf54d9741cb8af6de0..3271be326a856368c5fd81cd63366f9697b6fd25 100644
--- a/src/modules/Image/encodings/gif.c
+++ b/src/modules/Image/encodings/gif.c
@@ -1,9 +1,9 @@
-/* $Id: gif.c,v 1.46 1999/03/11 08:29:33 mirar Exp $ */
+/* $Id: gif.c,v 1.47 1999/04/13 12:32:41 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: gif.c,v 1.46 1999/03/11 08:29:33 mirar Exp $
+**! $Id: gif.c,v 1.47 1999/04/13 12:32:41 mirar Exp $
**! submodule GIF
**!
**! This submodule keep the GIF encode/decode capabilities
@@ -23,7 +23,7 @@
**! Very advanced stuff:
**! <ref>_render_block</ref>, <ref>_gce_block</ref>
**!
-**! see also: Image, Image.image, Image.colortable
+**! see also: Image, Image.Image, Image.Colortable
*/
#include "global.h"
@@ -31,7 +31,7 @@
#include <ctype.h>
#include "stralloc.h"
-RCSID("$Id: gif.c,v 1.46 1999/03/11 08:29:33 mirar Exp $");
+RCSID("$Id: gif.c,v 1.47 1999/04/13 12:32:41 mirar Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -556,10 +556,10 @@ CHRONO("gif _render_block end");
**!
**! Example:
**! <pre>
-**! img1=<ref>Image.image</ref>([...]);
-**! img2=<ref>Image.image</ref>([...]);
+**! img1=<ref>Image.Image</ref>([...]);
+**! img2=<ref>Image.Image</ref>([...]);
**! [...] // make your very-nice images
-**! nct=<ref>Image.colortable</ref>([...]); // make a nice colortable
+**! nct=<ref>Image.Colortable</ref>([...]); // make a nice colortable
**! write(<ref>Image.GIF.header_block</ref>(xsize,ysize,nct)); // write a GIF header
**! write(<ref>Image.GIF.render_block</ref>(img1,nct,0,0,0,10)); // write a render block
**! write(<ref>Image.GIF.render_block</ref>(img2,nct,0,0,0,10)); // write a render block
@@ -914,7 +914,7 @@ CHRONO("gif render_block end");
**!
**! Example:
**! <pre>
-**! img=<ref>Image.image</ref>([...]);
+**! img=<ref>Image.Image</ref>([...]);
**! [...] // make your very-nice image
**! write(<ref>Image.GIF.encode</ref>(img)); // write it as GIF on stdout
**! </pre>
@@ -932,7 +932,7 @@ CHRONO("gif render_block end");
**! color indicates transparency. GIF has only transparent
**! or nontransparent (no real alpha channel).
**! You can always dither a transparency channel:
-**! <tt>Image.colortable(my_alpha, ({({0,0,0}),({255,255,255})}))<wbr>
+**! <tt>Image.Colortable(my_alpha, ({({0,0,0}),({255,255,255})}))<wbr>
**! ->full()<wbr>->floyd_steinberg()<wbr>->map(my_alpha)</tt>
**! arg int tr_r
**! arg int tr_g
@@ -1981,8 +1981,8 @@ void image_gif__decode(INT32 args)
**! note
**! This function may throw errors upon illegal GIF data.
**! This function uses <ref>__decode</ref>, <ref>_decode</ref>,
-**! <ref>Image.image->paste</ref> and
-**! <ref>Image.image->paste_alpha</ref> internally.
+**! <ref>Image.Image->paste</ref> and
+**! <ref>Image.Image->paste_alpha</ref> internally.
**!
**! returns the decoded image as an image object
*/
diff --git a/src/modules/Image/encodings/ilbm.c b/src/modules/Image/encodings/ilbm.c
index ee5d8159650a0c77dfb888661917aec734e4ad4e..99e97be8cac96d7d91c3cef32f88efc9f65bdfee 100644
--- a/src/modules/Image/encodings/ilbm.c
+++ b/src/modules/Image/encodings/ilbm.c
@@ -1,20 +1,20 @@
-/* $Id: ilbm.c,v 1.8 1999/04/09 18:21:36 marcus Exp $ */
+/* $Id: ilbm.c,v 1.9 1999/04/13 12:32:43 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: ilbm.c,v 1.8 1999/04/09 18:21:36 marcus Exp $
+**! $Id: ilbm.c,v 1.9 1999/04/13 12:32:43 mirar Exp $
**! submodule ILBM
**!
**! This submodule keep the ILBM encode/decode capabilities
**! of the <ref>Image</ref> module.
**!
-**! see also: Image, Image.image, Image.colortable
+**! see also: Image, Image.Image, Image.Colortable
*/
#include "global.h"
#include "stralloc.h"
-RCSID("$Id: ilbm.c,v 1.8 1999/04/09 18:21:36 marcus Exp $");
+RCSID("$Id: ilbm.c,v 1.9 1999/04/13 12:32:43 mirar Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
diff --git a/src/modules/Image/encodings/pnm.c b/src/modules/Image/encodings/pnm.c
index 8600fd3008165c875f0ef93b42f76ac5f55fbdef..459565eccd8a4b68b77ff980acbfd84ee469f05f 100644
--- a/src/modules/Image/encodings/pnm.c
+++ b/src/modules/Image/encodings/pnm.c
@@ -1,9 +1,9 @@
-/* $Id: pnm.c,v 1.17 1999/03/11 08:29:37 mirar Exp $ */
+/* $Id: pnm.c,v 1.18 1999/04/13 12:32:44 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: pnm.c,v 1.17 1999/03/11 08:29:37 mirar Exp $
+**! $Id: pnm.c,v 1.18 1999/04/13 12:32:44 mirar Exp $
**! submodule PNM
**!
**! This submodule keeps the PNM encode/decode capabilities
@@ -41,7 +41,7 @@
**! <ref>encode_P5</ref>, <br>
**! <ref>encode_P6</ref>
**!
-**! see also: Image, Image.image, Image.GIF
+**! see also: Image, Image.Image, Image.GIF
*/
#include "global.h"
@@ -49,7 +49,7 @@
#include <ctype.h>
#include "stralloc.h"
-RCSID("$Id: pnm.c,v 1.17 1999/03/11 08:29:37 mirar Exp $");
+RCSID("$Id: pnm.c,v 1.18 1999/04/13 12:32:44 mirar Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -246,12 +246,12 @@ void img_pnm_decode(INT32 args)
**!
**! <ref>encode_P1</ref>/<ref>encode_P4</ref>
**! assumes the image is black and white. Use
-**! <ref>Image.image->threshold</ref>() or something like
-**! <tt><ref>Image.colortable</ref>( ({({0,0,0}),({255,255,255})}) )<wbr>->floyd_steinberg()<wbr>->map(my_image)</tt>
+**! <ref>Image.Image->threshold</ref>() or something like
+**! <tt><ref>Image.Colortable</ref>( ({({0,0,0}),({255,255,255})}) )<wbr>->floyd_steinberg()<wbr>->map(my_image)</tt>
**! to get a black and white image.
**!
**! <ref>encode_P2</ref>/<ref>encode_P5</ref> assumes the image is greyscale. Use
-**! <ref>Image.image->grey</ref>() to get a greyscale image.
+**! <ref>Image.Image->grey</ref>() to get a greyscale image.
**!
**! see also: decode
**!
diff --git a/src/modules/Image/encodings/x.c b/src/modules/Image/encodings/x.c
index 6bbbfe34aeeb8ce97716d5ac3d4fb6d9a3fb7b79..dfacb9adf918dc312c7bde38cd9d1dda6bdcd208 100644
--- a/src/modules/Image/encodings/x.c
+++ b/src/modules/Image/encodings/x.c
@@ -1,9 +1,9 @@
-/* $Id: x.c,v 1.17 1998/08/09 11:36:18 grubba Exp $ */
+/* $Id: x.c,v 1.18 1999/04/13 12:32:46 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: x.c,v 1.17 1998/08/09 11:36:18 grubba Exp $
+**! $Id: x.c,v 1.18 1999/04/13 12:32:46 mirar Exp $
**! submodule X
**!
**! This submodule handles encoding and decoding of
@@ -11,7 +11,7 @@
**!
**!
**!
-**! see also: Image, Image.image, Image.colortable
+**! see also: Image, Image.Image, Image.Colortable
*/
#include "global.h"
@@ -29,7 +29,7 @@
#include <winsock.h>
#endif
-RCSID("$Id: x.c,v 1.17 1998/08/09 11:36:18 grubba Exp $");
+RCSID("$Id: x.c,v 1.18 1999/04/13 12:32:46 mirar Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
diff --git a/src/modules/Image/encodings/xcf.c b/src/modules/Image/encodings/xcf.c
index 0e7d2f6058acddc3493fbcdc381445166545559c..546ba99ab27f53826c513f8e17338b4e8b6b8b18 100644
--- a/src/modules/Image/encodings/xcf.c
+++ b/src/modules/Image/encodings/xcf.c
@@ -1,5 +1,5 @@
#include "global.h"
-RCSID("$Id: xcf.c,v 1.5 1999/04/12 11:41:16 mirar Exp $");
+RCSID("$Id: xcf.c,v 1.6 1999/04/13 12:32:47 mirar Exp $");
#include "config.h"
@@ -865,7 +865,7 @@ void image_xcf_f__rle_decode( INT32 args )
**!
**! <pre> Supported options
**! ([
-**! "background":({r,g,b})||Image.color object
+**! "background":({r,g,b})||Image.Color object
**! "draw_all_layers":1,
**! Draw invisible layers as well
**!
@@ -881,7 +881,7 @@ void image_xcf_f__rle_decode( INT32 args )
**! "mark_layers":1,
**! Draw an outline around all (drawn) layers
**!
-**! "mark_layer_names":Image.font object,
+**! "mark_layer_names":Image.Font object,
**! Write the name of all layers using the font object,
**!
**! "mark_active_layer":1,
@@ -908,8 +908,8 @@ void image_xcf_f__rle_decode( INT32 args )
**! float xres = 72.0;
**! float yres = 72.0;
**! int res_unit;
-**! Image.colortable colormap;
-**! Image.colortable meta_colormap;
+**! Image.Colortable colormap;
+**! Image.Colortable meta_colormap;
**! array(Layer) layers = ({});
**! array(Channel) channels = ({});
**! array(Guide) guides = ({});
@@ -952,8 +952,8 @@ void image_xcf_f__rle_decode( INT32 args )
**!
**! !class Hierarchy
**! {
-**! Image.image img;
-**! Image.image alpha;
+**! Image.Image img;
+**! Image.Image alpha;
**! int width;
**! int height;
**! int bpp;
diff --git a/src/modules/Image/encodings/xwd.c b/src/modules/Image/encodings/xwd.c
index f8b33eb2bebf5712dcaddc8f49f2c55c97b9db1d..ef01e557b6c754b5e5a89d1476f407ef335e7d59 100644
--- a/src/modules/Image/encodings/xwd.c
+++ b/src/modules/Image/encodings/xwd.c
@@ -1,9 +1,9 @@
-/* $Id: xwd.c,v 1.9 1999/04/12 11:41:17 mirar Exp $ */
+/* $Id: xwd.c,v 1.10 1999/04/13 12:32:50 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: xwd.c,v 1.9 1999/04/12 11:41:17 mirar Exp $
+**! $Id: xwd.c,v 1.10 1999/04/13 12:32:50 mirar Exp $
**! submodule XWD
**!
**! This submodule keeps the XWD (X Windows Dump)
@@ -17,7 +17,7 @@
**! Advanced decoding:<br>
**! <ref>_decode</ref>
**!
-**! see also: Image, Image.image, Image.PNM, Image.X
+**! see also: Image, Image.Image, Image.PNM, Image.X
*/
#include "global.h"
@@ -25,7 +25,7 @@
#include <ctype.h>
#include "stralloc.h"
-RCSID("$Id: xwd.c,v 1.9 1999/04/12 11:41:17 mirar Exp $");
+RCSID("$Id: xwd.c,v 1.10 1999/04/13 12:32:50 mirar Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index 938cfa6a49f8c8372a8f8ccdb1ee3fd474577c81..bab9e6d4dcfb3af451e28cf9da8efaf28e59faf5 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -1,4 +1,4 @@
-/* $Id: font.c,v 1.43 1999/02/10 21:48:27 hubbe Exp $ */
+/* $Id: font.c,v 1.44 1999/04/13 12:32:20 mirar Exp $ */
#include "global.h"
#include <config.h>
@@ -7,8 +7,8 @@
/*
**! module Image
**! note
-**! $Id: font.c,v 1.43 1999/02/10 21:48:27 hubbe Exp $
-**! class font
+**! $Id: font.c,v 1.44 1999/04/13 12:32:20 mirar Exp $
+**! class Font
**!
**! note
**! Short technical documentation on a font file:
@@ -88,7 +88,7 @@
**! len * (short char, short value)
**! **! </pre>
**!
-**! see also: Image, Image.image
+**! see also: Image, Image.Image
*/
/* Dump a font into a Roxen Font file (format version 2)
@@ -514,10 +514,10 @@ void font_load(INT32 args)
**! method object write(string text,...)
**! Writes some text; thus creating an image object
**! that can be used as mask or as a complete picture.
-**! returns an <ref>Image.image</ref> object
+**! returns an <ref>Image.Image</ref> object
**! arg string text, ...
**! One or more lines of text.
-**! see also: text_extents, load, Image.image->paste_mask, Image.image->paste_alpha_color
+**! see also: text_extents, load, Image.Image->paste_mask, Image.Image->paste_alpha_color
*/
void font_write(INT32 args)
@@ -884,45 +884,46 @@ void init_font_programs(void)
ADD_STORAGE(struct font*);
/* function(string:object|int) */
- ADD_FUNCTION("load",font_load,tFunc(tStr,tOr(tObj,tInt)),0);
+ ADD_FUNCTION("load",font_load,tFunc(tStr,tOr(tObj,tInt)),0);
/* function(void|string:void) */
- ADD_FUNCTION("create",font_create,tFunc(tOr(tVoid,tStr),tVoid),0);
+ ADD_FUNCTION("create",font_create,tFunc(tOr(tVoid,tStr),tVoid),0);
/* function(string:object) */
- ADD_FUNCTION("write",font_write,tFunc(tStr,tObj),0);
+ ADD_FUNCTION("write",font_write,tFunc(tStr,tObj),0);
/* function(:int) */
- ADD_FUNCTION("height",font_height,tFunc(,tInt),0);
+ ADD_FUNCTION("height",font_height,tFunc(,tInt),0);
/* function(:int) */
- ADD_FUNCTION("baseline",font_baseline,tFunc(,tInt),0);
+ ADD_FUNCTION("baseline",font_baseline,tFunc(,tInt),0);
/* function(string ...:array(int)) */
- ADD_FUNCTION("extents",font_text_extents,tFuncV(,tStr,tArr(tInt)),0);
+ ADD_FUNCTION("extents",font_text_extents,tFuncV(,tStr,tArr(tInt)),0);
/* function(string ...:array(int)) */
- ADD_FUNCTION("text_extents",font_text_extents,tFuncV(,tStr,tArr(tInt)),0);
+ ADD_FUNCTION("text_extents",font_text_extents,tFuncV(,tStr,tArr(tInt)),0);
/* function(float:void) */
- ADD_FUNCTION("set_x_spacing",font_set_xspacing_scale,tFunc(tFlt,tVoid),0);
+ ADD_FUNCTION("set_x_spacing",font_set_xspacing_scale,tFunc(tFlt,tVoid),0);
/* function(float:void) */
- ADD_FUNCTION("set_y_spacing",font_set_yspacing_scale,tFunc(tFlt,tVoid),0);
+ ADD_FUNCTION("set_y_spacing",font_set_yspacing_scale,tFunc(tFlt,tVoid),0);
/* function(void:void) */
- ADD_FUNCTION("center", font_set_center,tFunc(tVoid,tVoid), 0);
+ ADD_FUNCTION("center", font_set_center,tFunc(tVoid,tVoid), 0);
/* function(void:void) */
- ADD_FUNCTION("left", font_set_left,tFunc(tVoid,tVoid), 0);
+ ADD_FUNCTION("left", font_set_left,tFunc(tVoid,tVoid), 0);
/* function(void:void) */
- ADD_FUNCTION("right", font_set_right,tFunc(tVoid,tVoid), 0);
+ ADD_FUNCTION("right", font_set_right,tFunc(tVoid,tVoid), 0);
set_init_callback(init_font_struct);
set_exit_callback(exit_font_struct);
font_program=end_program();
- add_program_constant("font",font_program, 0);
+ add_program_constant("font",font_program, 0); /* compat */
+ add_program_constant("Font",font_program, 0);
}
void exit_font(void)
diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c
index de92e3dcec0bc55c6f41da5c594c997799046dc0..3bd4a59f60c2a7612f04f26919667608c48d9d72 100644
--- a/src/modules/Image/image.c
+++ b/src/modules/Image/image.c
@@ -1,9 +1,9 @@
-/* $Id: image.c,v 1.127 1999/04/13 11:14:34 mirar Exp $ */
+/* $Id: image.c,v 1.128 1999/04/13 12:32:22 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: image.c,v 1.127 1999/04/13 11:14:34 mirar Exp $
+**! $Id: image.c,v 1.128 1999/04/13 12:32:22 mirar Exp $
**! class Image
**!
**! The main object of the <ref>Image</ref> module, this object
@@ -87,7 +87,7 @@
**! <ref>tuned_box</ref>,
**! <ref>gradients</ref>
**!
-**! see also: Image, Image.font, Image.colortable, Image.X
+**! see also: Image, Image.Font, Image.Colortable, Image.X
*/
#include "global.h"
@@ -97,7 +97,7 @@
#include "stralloc.h"
#include "global.h"
-RCSID("$Id: image.c,v 1.127 1999/04/13 11:14:34 mirar Exp $");
+RCSID("$Id: image.c,v 1.128 1999/04/13 12:32:22 mirar Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -3230,12 +3230,12 @@ void image_gamma(INT32 args)
**! Old code:
**! <pre>img=map_fs(img->select_colors(200));</pre>
**! New code:
-**! <pre>img=Image.colortable(img,200)->floyd_steinberg()->map(img);</pre>
+**! <pre>img=Image.Colortable(img,200)->floyd_steinberg()->map(img);</pre>
**!
**! Old code:
**! <pre>img=map_closest(img->select_colors(17)+({({255,255,255}),({0,0,0})}));</pre>
**! New code:
-**! <pre>img=Image.colortable(img,19,({({255,255,255}),({0,0,0})}))->map(img);</pre>
+**! <pre>img=Image.Colortable(img,19,({({255,255,255}),({0,0,0})}))->map(img);</pre>
*/
void _image_map_compat(INT32 args,int fs) /* compat function */
@@ -3456,8 +3456,8 @@ void image_read_lsb_grey(INT32 args)
**! method string cast(string type)
**! Cast the image to another datatype. Currently supported
**! are string ("rgbrgbrgb...") and array (double array
-**! of <ref>Image.color</ref> objects).
-**! see also: Image.color,Image.X
+**! of <ref>Image.Color</ref> objects).
+**! see also: Image.Color,Image.X
*/
void image_cast(INT32 args)
diff --git a/src/modules/Image/matrix.c b/src/modules/Image/matrix.c
index de3fb05203a756884a72a5d4d8b6aed3f2b8cdf5..70da33ca071a4cfce30a48a6c72301e243b6f7db 100644
--- a/src/modules/Image/matrix.c
+++ b/src/modules/Image/matrix.c
@@ -1,10 +1,10 @@
-/* $Id: matrix.c,v 1.17 1998/04/24 13:51:00 mirar Exp $ */
+/* $Id: matrix.c,v 1.18 1999/04/13 12:32:25 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: matrix.c,v 1.17 1998/04/24 13:51:00 mirar Exp $
-**! class image
+**! $Id: matrix.c,v 1.18 1999/04/13 12:32:25 mirar Exp $
+**! class Image
*/
#include "global.h"
diff --git a/src/modules/Image/operator.c b/src/modules/Image/operator.c
index dde1959c92131818c29b3b47e6ffb871acda8f74..2878ce84b20734990f74b22587351abd406342bd 100644
--- a/src/modules/Image/operator.c
+++ b/src/modules/Image/operator.c
@@ -1,10 +1,10 @@
-/* $Id: operator.c,v 1.19 1999/03/19 18:21:49 mirar Exp $ */
+/* $Id: operator.c,v 1.20 1999/04/13 12:32:27 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: operator.c,v 1.19 1999/03/19 18:21:49 mirar Exp $
-**! class image
+**! $Id: operator.c,v 1.20 1999/04/13 12:32:27 mirar Exp $
+**! class Image
*/
#include "global.h"
@@ -630,9 +630,9 @@ void image_average(INT32 args)
pop_n_elems(args);
if (!THIS->img)
- error("Image.image->average(): no image\n");
+ error("Image.Image->average(): no image\n");
if (!THIS->xsize || !THIS->ysize)
- error("Image.image->average(): no pixels in image (division by zero)\n");
+ error("Image.Image->average(): no pixels in image (division by zero)\n");
y=THIS->ysize;
xz=THIS->xsize;
@@ -671,7 +671,7 @@ void image_sumf(INT32 args)
pop_n_elems(args);
if (!THIS->img)
- error("Image.image->sumf(): no image\n");
+ error("Image.Image->sumf(): no image\n");
y=THIS->ysize;
xz=THIS->xsize;
@@ -709,7 +709,7 @@ void image_sum(INT32 args)
pop_n_elems(args);
if (!THIS->img)
- error("Image.image->sum(): no image\n");
+ error("Image.Image->sum(): no image\n");
n=THIS->ysize*THIS->xsize;
THREADS_ALLOW();
@@ -738,7 +738,7 @@ void image_min(INT32 args)
pop_n_elems(args);
if (!THIS->img)
- error("Image.image->min(): no image\n");
+ error("Image.Image->min(): no image\n");
n=THIS->ysize*THIS->xsize;
THREADS_ALLOW();
@@ -767,7 +767,7 @@ void image_max(INT32 args)
pop_n_elems(args);
if (!THIS->img)
- error("Image.image->max(): no image\n");
+ error("Image.Image->max(): no image\n");
n=THIS->ysize*THIS->xsize;
THREADS_ALLOW();
@@ -829,7 +829,7 @@ void image_find_min(INT32 args)
rgb.b=41;
}
else
- getrgbl(&rgb,0,args,"Image.image->find_min()");
+ getrgbl(&rgb,0,args,"Image.Image->find_min()");
if (rgb.r||rgb.g||rgb.b)
div=1.0/(rgb.r+rgb.g+rgb.b);
else
@@ -838,9 +838,9 @@ void image_find_min(INT32 args)
pop_n_elems(args);
if (!THIS->img)
- error("Image.image->find_min(): no image\n");
+ error("Image.Image->find_min(): no image\n");
if (!THIS->xsize || !THIS->ysize)
- error("Image.image->find_min(): no pixels in image (none to find)\n");
+ error("Image.Image->find_min(): no pixels in image (none to find)\n");
yz=THIS->ysize;
xz=THIS->xsize;
@@ -877,7 +877,7 @@ void image_find_max(INT32 args)
rgb.b=41;
}
else
- getrgbl(&rgb,0,args,"Image.image->find_max()");
+ getrgbl(&rgb,0,args,"Image.Image->find_max()");
if (rgb.r||rgb.g||rgb.b)
div=1.0/(rgb.r+rgb.g+rgb.b);
else
@@ -886,9 +886,9 @@ void image_find_max(INT32 args)
pop_n_elems(args);
if (!THIS->img)
- error("Image.image->find_max(): no image\n");
+ error("Image.Image->find_max(): no image\n");
if (!THIS->xsize || !THIS->ysize)
- error("Image.image->find_max(): no pixels in image (none to find)\n");
+ error("Image.Image->find_max(): no pixels in image (none to find)\n");
yz=THIS->ysize;
xz=THIS->xsize;
diff --git a/src/modules/Image/orient.c b/src/modules/Image/orient.c
index 16c3a783b9eaddb0dd265fde199ccbf96a024b28..a7c8d057f99bf429bbad69352568b3c077e76f18 100644
--- a/src/modules/Image/orient.c
+++ b/src/modules/Image/orient.c
@@ -1,10 +1,10 @@
-/* $Id: orient.c,v 1.10 1998/04/20 19:51:56 mirar Exp $ */
+/* $Id: orient.c,v 1.11 1999/04/13 12:32:29 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: orient.c,v 1.10 1998/04/20 19:51:56 mirar Exp $
-**! class image
+**! $Id: orient.c,v 1.11 1999/04/13 12:32:29 mirar Exp $
+**! class Image
*/
#include "global.h"
diff --git a/src/modules/Image/pattern.c b/src/modules/Image/pattern.c
index b549ea8d4e1f95bcf49644733b97fe2fa32a8fdd..0bd4b530751f822ca57b28d1a1e270cef64ec1f0 100644
--- a/src/modules/Image/pattern.c
+++ b/src/modules/Image/pattern.c
@@ -1,10 +1,10 @@
-/* $Id: pattern.c,v 1.14 1999/04/12 23:55:20 mirar Exp $ */
+/* $Id: pattern.c,v 1.15 1999/04/13 12:32:30 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: pattern.c,v 1.14 1999/04/12 23:55:20 mirar Exp $
-**! class image
+**! $Id: pattern.c,v 1.15 1999/04/13 12:32:30 mirar Exp $
+**! class Image
*/
#include "global.h"
@@ -341,7 +341,7 @@ static void init_colorrange(rgb_group *cr,struct svalue *s,char *where)
**!
**! Example:
**! <tt>->noise( ({0,({255,0,0}), 0.3,({0,255,0}), 0.6,({0,0,255}), 0.8,({255,255,0})}), 0.2,0.0,0.0,1.0 );</tt>
-**! <br><illustration>return image(200,100)->noise( ({0,({255,0,0}), 0.3,({0,255,0}), 0.6,({0,0,255}), 0.8,({255,255,0})}), 0.2,0.0,0.0,1.0 );</illustration>
+**! <br><illustration>return Image(200,100)->noise( ({0,({255,0,0}), 0.3,({0,255,0}), 0.6,({0,0,255}), 0.8,({255,255,0})}), 0.2,0.0,0.0,1.0 );</illustration>
**!
**! arg array(float|int|array(int)) colorrange
**! colorrange table
@@ -412,9 +412,9 @@ void image_noise(INT32 args)
**! The random seed may be different with each instance of pike.
**!
**! Example: <br>
-**! <tt>->turbulence( ({0,({229,204,204}), 0.9,({229,20,20}), 0.9,Image.color.black}) );</tt>
-**! <br><illustration>return image(200,100)->
-**! turbulence( ({0,({229,204,204}), 0.9,({229,20,20}), 0.9,Image.color.black}));</illustration>
+**! <tt>->turbulence( ({0,({229,204,204}), 0.9,({229,20,20}), 0.9,Color.black}) );</tt>
+**! <br><illustration>return Image(200,100)->
+**! turbulence( ({0,({229,204,204}), 0.9,({229,20,20}), 0.9,Color.black}));</illustration>
**! arg array(float|int|array(int)) colorrange
**! colorrange table
**! arg int octaves
@@ -426,7 +426,7 @@ void image_noise(INT32 args)
**! default value is 0,0
**! arg float cscale
**! default value is 1
-**! see also: noise
+**! see also: noise, Image.Color
*/
void image_turbulence(INT32 args)
diff --git a/src/modules/Image/pnm_compat.c b/src/modules/Image/pnm_compat.c
index 9eaed973c9ffd2e93654e12a33f412ab04a9de74..ccc3cc297f12d93c2beb602d088e439965f8e41d 100644
--- a/src/modules/Image/pnm_compat.c
+++ b/src/modules/Image/pnm_compat.c
@@ -1,10 +1,10 @@
-/* $Id: pnm_compat.c,v 1.1 1999/03/11 18:49:30 grubba Exp $ */
+/* $Id: pnm_compat.c,v 1.2 1999/04/13 12:32:31 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: pnm_compat.c,v 1.1 1999/03/11 18:49:30 grubba Exp $
-**! class image
+**! $Id: pnm_compat.c,v 1.2 1999/04/13 12:32:31 mirar Exp $
+**! class Image
*/
#include "global.h"
diff --git a/src/modules/Image/polyfill.c b/src/modules/Image/polyfill.c
index b38857a168d37d002bc36c56947aae1eeda7ccac..4b15659f9cc426cc1d5cafc3f987f3794f794995 100644
--- a/src/modules/Image/polyfill.c
+++ b/src/modules/Image/polyfill.c
@@ -1,5 +1,5 @@
#include "global.h"
-RCSID("$Id: polyfill.c,v 1.26 1998/04/24 13:50:19 mirar Exp $");
+RCSID("$Id: polyfill.c,v 1.27 1999/04/13 12:32:33 mirar Exp $");
/* Prototypes are needed for these */
extern double floor(double);
@@ -32,8 +32,8 @@ extern double floor(double);
/*
**! module Image
**! note
-**! $Id: polyfill.c,v 1.26 1998/04/24 13:50:19 mirar Exp $
-**! class image
+**! $Id: polyfill.c,v 1.27 1999/04/13 12:32:33 mirar Exp $
+**! class Image
*/
/*
@@ -737,11 +737,11 @@ void image_polyfill(INT32 args)
float *buf;
if (!THIS->img)
- error("Image.image->polyfill: no image\n");
+ error("Image.Image->polyfill: no image\n");
buf=malloc(sizeof(float)*(THIS->xsize+1));
if (!buf)
- error("Image.image->polyfill: out of memory\n");
+ error("Image.Image->polyfill: out of memory\n");
v=polyfill_begin();
@@ -752,14 +752,14 @@ void image_polyfill(INT32 args)
if (sp[-1].type!=T_ARRAY)
{
polyfill_free(v);
- error("Image.image->polyfill: Illegal argument %d, expected array\n",
+ error("Image.Image->polyfill: Illegal argument %d, expected array\n",
args);
}
- if ((v_tmp=polyfill_add(v, sp[-1].u.array, args, "Image.image->polyfill()"))) {
+ if ((v_tmp=polyfill_add(v, sp[-1].u.array, args, "Image.Image->polyfill()"))) {
v = v_tmp;
} else {
polyfill_free(v);
- error("Image.image->polyfill: Bad argument %d, bad vertex\n", args);
+ error("Image.Image->polyfill: Bad argument %d, bad vertex\n", args);
}
args--;
pop_stack();
diff --git a/src/modules/Image/search.c b/src/modules/Image/search.c
index fbf0748886036c4dbe6feabde84de7d69a387c29..365c51f5c086a6dc0dcf087b14e7211a009f3d29 100644
--- a/src/modules/Image/search.c
+++ b/src/modules/Image/search.c
@@ -3,7 +3,7 @@
**! module Image
**! note
**! Experimental functions.
-**! class image
+**! class Image
*/
#include "global.h"
@@ -600,13 +600,13 @@ void image_apply_max(INT32 args)
if (args<1 ||
sp[-args].type!=T_ARRAY)
- error("Illegal arguments to Image.image->apply_max()\n");
+ error("Illegal arguments to Image.Image->apply_max()\n");
if (args>3)
if (sp[1-args].type!=T_INT ||
sp[2-args].type!=T_INT ||
sp[3-args].type!=T_INT)
- error("Illegal argument(s) (2,3,4) to Image.image->apply_max()\n");
+ error("Illegal argument(s) (2,3,4) to Image.Image->apply_max()\n");
else
{
default_rgb.r=sp[1-args].u.integer;
@@ -640,12 +640,12 @@ void image_apply_max(INT32 args)
{
struct svalue s=sp[-args].u.array->item[i];
if (s.type!=T_ARRAY)
- error("Illegal contents of (root) array (Image.image->apply_max)\n");
+ error("Illegal contents of (root) array (Image.Image->apply_max)\n");
if (width==-1)
width=s.u.array->size;
else
if (width!=s.u.array->size)
- error("Arrays has different size (Image.image->apply_max)\n");
+ error("Arrays has different size (Image.Image->apply_max)\n");
}
if (width==-1) width=0;
diff --git a/src/modules/Image/togif.c b/src/modules/Image/togif.c
index 7719ac48e85be78838c133bd49a0221479420a53..1d9c57244c1f77b1be3a48b610d68b385ca6374a 100644
--- a/src/modules/Image/togif.c
+++ b/src/modules/Image/togif.c
@@ -2,7 +2,7 @@
togif
-$Id: togif.c,v 1.32 1998/04/24 13:51:03 mirar Exp $
+$Id: togif.c,v 1.33 1999/04/13 12:32:36 mirar Exp $
old GIF API compat stuff
@@ -11,8 +11,8 @@ old GIF API compat stuff
/*
**! module Image
**! note
-**! $Id: togif.c,v 1.32 1998/04/24 13:51:03 mirar Exp $
-**! class image
+**! $Id: togif.c,v 1.33 1999/04/13 12:32:36 mirar Exp $
+**! class Image
*/
#include "global.h"
@@ -83,7 +83,7 @@ extern struct program *image_colortable_program;
**! <tr><td>gif_add_fs_nomap</td><td><ref>Image.GIF.render_block</ref>��</td></tr>
**! </table>
**!
-**! � Use <ref>Image.colortable</ref> to get whatever dithering
+**! � Use <ref>Image.Colortable</ref> to get whatever dithering
**! you want.
**!
**! � local map toggle is sent as an argument
diff --git a/src/modules/Image/x.c b/src/modules/Image/x.c
index 1188ae5475030879c822fba1f4e98dcfb3307868..96b7c8cf194d1fb0f2f6c15b87c7a61285036fad 100644
--- a/src/modules/Image/x.c
+++ b/src/modules/Image/x.c
@@ -1,8 +1,8 @@
-/* $Id: x.c,v 1.20 1999/04/12 14:55:57 mirar Exp $ */
+/* $Id: x.c,v 1.21 1999/04/13 12:32:37 mirar Exp $ */
/*
**! module Image
-**! class image
+**! class Image
*/
#include "global.h"
@@ -12,7 +12,7 @@
#include "stralloc.h"
#include "global.h"
-RCSID("$Id: x.c,v 1.20 1999/04/12 14:55:57 mirar Exp $");
+RCSID("$Id: x.c,v 1.21 1999/04/13 12:32:37 mirar Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"