cvs: /php3/functions gd.c

eschmid Mon Jan 24 12:07:49 2000 EDT Modified files: /php3/functions gd.c Log: Correct indentation for the protos. Index: php3/functions/gd.c diff -u php3/functions/gd.c:1.141 php3/functions/gd.c:1.142 --- php3/functions/gd.c:1.141 Thu Jan 13 05:31:11 2000 +++ php3/functions/gd.c Mon Jan 24 12:07:49 2000 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.141 2000/01/13 13:31:11 rasmus Exp $ */ +/* $Id: gd.c,v 1.142 2000/01/24 20:07:49 eschmid Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -272,7 +272,7 @@ } /* {{{ proto int imageloadfont(string filename) -Load a new font */ + Load a new font */ void php3_imageloadfont(INTERNAL_FUNCTION_PARAMETERS) { pval *file; int hdr_size = sizeof(gdFont) - sizeof(char *); @@ -354,7 +354,7 @@ /* }}} */ /* {{{ proto int imagecreate(int x_size, int y_size) -Create a new image */ + Create a new image */ void php3_imagecreate(INTERNAL_FUNCTION_PARAMETERS) { pval *x_size, *y_size; int ind; @@ -377,7 +377,7 @@ #if HAVE_GD_GIF /* {{{ proto int imagecreatefromgif(string filename) -Create a new image from file or URL */ + Create a new image from file or URL */ void php3_imagecreatefromgif (INTERNAL_FUNCTION_PARAMETERS) { pval *file; int ind; @@ -421,7 +421,7 @@ #if HAVE_GD_PNG /* {{{ proto int imagecreatefrompng(string filename) -Create a new image from file or URL */ + Create a new image from file or URL */ void php3_imagecreatefrompng (INTERNAL_FUNCTION_PARAMETERS) { pval *file; int ind; @@ -464,7 +464,7 @@ #endif /* HAVE_GD_PNG */ /* {{{ proto int imagedestroy(int im) -Destroy an image */ + Destroy an image */ void php3_imagedestroy(INTERNAL_FUNCTION_PARAMETERS) { pval *imgind; @@ -481,7 +481,7 @@ /* }}} */ /* {{{ proto int imagecolorallocate(int im, int red, int green, int blue) -Allocate a color for an image */ + Allocate a color for an image */ void php3_imagecolorallocate(INTERNAL_FUNCTION_PARAMETERS) { pval *imgind, *red, *green, *blue; int ind, ind_type; @@ -517,7 +517,7 @@ /* im, x, y */ /* {{{ proto int imagecolorat(int im, int x, int y) -Get the index of the color of a pixel */ + Get the index of the color of a pixel */ void php3_imagecolorat(INTERNAL_FUNCTION_PARAMETERS) { pval *imgind, *x, *y; int ind, ind_type; @@ -553,7 +553,7 @@ /* }}} */ /* {{{ proto int imagecolorclosest(int im, int red, int green, int blue) -Get the index of the closest color to the specified color */ + Get the index of the closest color to the specified color */ void php3_imagecolorclosest(INTERNAL_FUNCTION_PARAMETERS) { pval *imgind, *red, *green, *blue; int ind, ind_type; @@ -588,7 +588,7 @@ /* }}} */ /* {{{ proto int imagecolordeallocate(int im, int index) -De-allocate a color for an image */ + De-allocate a color for an image */ void php3_imagecolordeallocate(INTERNAL_FUNCTION_PARAMETERS) { pval *imgind, *index; int ind, ind_type, col; @@ -622,7 +622,7 @@ /* }}} */ /* {{{ proto int imagecolorresolve(int im, int red, int green, int blue) -Get the index of the specified color or its closest possible alternative */ + Get the index of the specified color or its closest possible alternative */ void php3_imagecolorresolve(INTERNAL_FUNCTION_PARAMETERS) { pval *imgind, *red, *green, *blue; int ind, ind_type; @@ -657,7 +657,7 @@ /* }}} */ /* {{{ proto int imagecolorexact(int im, int red, int green, int blue) -Get the index of the specified color */ + Get the index of the specified color */ void php3_imagecolorexact(INTERNAL_FUNCTION_PARAMETERS) { pval *imgind, *red, *green, *blue; int ind, ind_type; @@ -692,7 +692,7 @@ /* }}} */ /* {{{ proto int imagecolorset(int im, int col, int red, int green, int blue) -Set the color for the specified palette index */ + Set the color for the specified palette index */ void php3_imagecolorset(INTERNAL_FUNCTION_PARAMETERS) { pval *imgind, *color, *red, *green, *blue; int ind, ind_type; @@ -734,7 +734,7 @@ /* }}} */ /* {{{ proto array imagecolorsforindex(int im, int col) -Get the colors for an index */ + Get the colors for an index */ void php3_imagecolorsforindex(INTERNAL_FUNCTION_PARAMETERS) { pval *imgind, *index; int col, ind, ind_type; @@ -773,7 +773,7 @@ #if HAVE_GD_GIF /* {{{ proto int imagegif(int im [, string filename]) -Output image to browser or file */ + Output image to browser or file */ void php3_imagegif (INTERNAL_FUNCTION_PARAMETERS) { pval *imgind, *file; gdImagePtr im; @@ -860,7 +860,7 @@ #if HAVE_GD_PNG /* {{{ proto int imagepng(int im [, string filename]) -Output image to browser or file */ + Output image to browser or file */ void php3_imagepng (INTERNAL_FUNCTION_PARAMETERS) { pval *imgind, *file; gdImagePtr im; @@ -938,7 +938,7 @@ #endif /* HAVE_GD_PNG */ /* {{{ proto int imagesetpixel(int im, int x, int y, int col) -Set a single pixel */ + Set a single pixel */ void php3_imagesetpixel(INTERNAL_FUNCTION_PARAMETERS) { pval *imarg, *xarg, *yarg, *colarg; gdImagePtr im; @@ -975,7 +975,7 @@ /* im, x1, y1, x2, y2, col */ /* {{{ proto int imageline(int im, int x1, int y1, int x2, int y2, int col) -Draw a line */ + Draw a line */ void php3_imageline(INTERNAL_FUNCTION_PARAMETERS) { pval *IM, *COL, *X1, *Y1, *X2, *Y2; gdImagePtr im; @@ -1014,7 +1014,7 @@ /* }}} */ /* {{{ proto int imagedashedline(int im, int x1, int y1, int x2, int y2, int col) -Draw a dashed line */ + Draw a dashed line */ void php3_imagedashedline(INTERNAL_FUNCTION_PARAMETERS) { pval *IM, *COL, *X1, *Y1, *X2, *Y2; gdImagePtr im; @@ -1085,7 +1085,7 @@ /* im, x1, y1, x2, y2, col */ /* {{{ proto int imagerectangle(int im, int x1, int y1, int x2, int y2, int col) -Draw a rectangle */ + Draw a rectangle */ void php3_imagerectangle(INTERNAL_FUNCTION_PARAMETERS) { pval *IM, *COL, *X1, *Y1, *X2, *Y2; gdImagePtr im; @@ -1125,7 +1125,7 @@ /* im, x1, y1, x2, y2, col */ /* {{{ proto int imagefilledrectangle(int im, int x1, int y1, int x2, int y2, int col) -Draw a filled rectangle */ + Draw a filled rectangle */ void php3_imagefilledrectangle(INTERNAL_FUNCTION_PARAMETERS) { pval *IM, *COL, *X1, *Y1, *X2, *Y2; gdImagePtr im; @@ -1164,7 +1164,7 @@ /* }}} */ /* {{{ proto int imagearc(int im, int cx, int cy, int w, int h, int s, int e, int col) -Draw a partial ellipse */ + Draw a partial ellipse */ void php3_imagearc(INTERNAL_FUNCTION_PARAMETERS) { pval *COL, *E, *ST, *H, *W, *CY, *CX, *IM; gdImagePtr im; @@ -1215,7 +1215,7 @@ /* im, x, y, border, col */ /* {{{ proto int imagefilltoborder(int im, int x, int y, int border, int col) -Flood fill to specific color */ + Flood fill to specific color */ void php3_imagefilltoborder(INTERNAL_FUNCTION_PARAMETERS) { pval *IM, *X, *Y, *BORDER, *COL; gdImagePtr im; @@ -1253,7 +1253,7 @@ /* im, x, y, col */ /* {{{ proto int imagefill(int im, int x, int y, int col) -Flood fill */ + Flood fill */ void php3_imagefill(INTERNAL_FUNCTION_PARAMETERS) { pval *IM, *X, *Y, *COL; gdImagePtr im; @@ -1288,7 +1288,7 @@ /* }}} */ /* {{{ proto int imagecolorstotal(int im) -Find out the number of colors in an image's palette */ + Find out the number of colors in an image's palette */ void php3_imagecolorstotal(INTERNAL_FUNCTION_PARAMETERS) { pval *IM; gdImagePtr im; @@ -1312,7 +1312,7 @@ /* im, col */ /* {{{ proto int imagecolortransparent(int im [, int col]) -Define a color as transparent */ + Define a color as transparent */ void php3_imagecolortransparent(INTERNAL_FUNCTION_PARAMETERS) { pval *IM, *COL = NULL; gdImagePtr im; @@ -1354,7 +1354,7 @@ /* im, interlace */ /* {{{ proto int imageinterlace(int im [, int interlace]) -Enable or disable interlace */ + Enable or disable interlace */ void php3_imageinterlace(INTERNAL_FUNCTION_PARAMETERS) { pval *IM, *INT = NULL; gdImagePtr im; @@ -1480,7 +1480,7 @@ /* {{{ proto int imagepolygon(int im, array point, int num_points, int col) -Draw a polygon */ + Draw a polygon */ void php3_imagepolygon(INTERNAL_FUNCTION_PARAMETERS) { _php3_imagepolygon(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); @@ -1488,7 +1488,7 @@ /* }}} */ /* {{{ proto int imagefilledpolygon(int im, array point, int num_points, int col) -Draw a filled polygon */ + Draw a filled polygon */ void php3_imagefilledpolygon(INTERNAL_FUNCTION_PARAMETERS) { _php3_imagepolygon(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -1553,7 +1553,7 @@ /* {{{ proto int imagefontwidth(int font) -Get font width */ + Get font width */ void php3_imagefontwidth(INTERNAL_FUNCTION_PARAMETERS) { _php3_imagefontsize(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); @@ -1561,7 +1561,7 @@ /* }}} */ /* {{{ proto int imagefontheight(int font) -Get font height */ + Get font height */ void php3_imagefontheight(INTERNAL_FUNCTION_PARAMETERS) { _php3_imagefontsize(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -1673,14 +1673,14 @@ } /* {{{ proto int imagechar(int im, int font, int x, int y, string c, int col) -Draw a character */ + Draw a character */ void php3_imagechar(INTERNAL_FUNCTION_PARAMETERS) { _php3_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ /* {{{ proto int imagecharup(int im, int font, int x, int y, string c, int col) -Draw a character rotated 90 degrees counter-clockwise */ + Draw a character rotated 90 degrees counter-clockwise */ void php3_imagecharup(INTERNAL_FUNCTION_PARAMETERS) { _php3_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } @@ -1694,14 +1694,14 @@ /* }}} */ /* {{{ proto int imagestringup(int im, int font, int x, int y, string str, int col) -Draw a string vertically - rotated 90 degrees counter-clockwise */ + Draw a string vertically - rotated 90 degrees counter-clockwise */ void php3_imagestringup(INTERNAL_FUNCTION_PARAMETERS) { _php3_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 3); } /* }}} */ /* {{{ proto int imagecopy(int dst_im, int src_im, int dstX, int dstY, int srcX, int srcY, int srcW, int srcH) -Copy part of an image */ + Copy part of an image */ void php3_imagecopy(INTERNAL_FUNCTION_PARAMETERS) { pval *SIM, *DIM, *SX, *SY, *SW, *SH, *DX, *DY; @@ -1751,7 +1751,7 @@ /* }}} */ /* {{{ proto int imagecopyresized(int dst_im, int src_im, int dstX, int dstY, int srcX, int srcY, int dstW, int dstH, int srcW, int srcH); -Copy and resize part of an image */ + Copy and resize part of an image */ void php3_imagecopyresized(INTERNAL_FUNCTION_PARAMETERS) { pval *SIM, *DIM, *SX, *SY, *SW, *SH, *DX, *DY, *DW, *DH; @@ -1806,7 +1806,7 @@ /* }}} */ /* {{{ proto int imagesx(int im) -Get image width */ + Get image width */ void php3_imagesxfn(INTERNAL_FUNCTION_PARAMETERS) { pval *IM; @@ -1829,7 +1829,7 @@ /* }}} */ /* {{{ proto int imagesy(int im) -Get image height */ + Get image height */ void php3_imagesyfn(INTERNAL_FUNCTION_PARAMETERS) { pval *IM; @@ -1857,7 +1857,7 @@ #define TTFTEXT_BBOX 1 /* {{{ proto array imagettfbbox(int size, int angle, string font_file, string text) -Give the bounding box of a text using TrueType fonts */ + Give the bounding box of a text using TrueType fonts */ void php3_imagettfbbox(INTERNAL_FUNCTION_PARAMETERS) { php3_imagettftext_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, TTFTEXT_BBOX); @@ -1865,7 +1865,7 @@ /* }}} */ /* {{{ proto array imagettftext(int im, int size, int angle, int x, int y, int col, string font_file, string text) -Write text to the image using a TrueType font */ + Write text to the image using a TrueType font */ void php3_imagettftext(INTERNAL_FUNCTION_PARAMETERS) { php3_imagettftext_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, TTFTEXT_DRAW); @@ -1958,7 +1958,7 @@ } /* {{{ proto int imagepsloadfont(string pathname) -Load a new font from specified file */ + Load a new font from specified file */ void php3_imagepsloadfont(INTERNAL_FUNCTION_PARAMETERS) { pval *file; int l_ind; @@ -2002,7 +2002,7 @@ /* {{{ The function in t1lib which this function uses seem to be buggy... proto int imagepscopyfont(int font_index) -Make a copy of a font for purposes like extending or reenconding */ + Make a copy of a font for purposes like extending or reenconding */ /* void php3_imagepscopyfont(INTERNAL_FUNCTION_PARAMETERS) { pval *fnt; @@ -2056,7 +2056,7 @@ /* }}} */ /* {{{ proto bool imagepsfreefont(int font_index) -Free memory used by a font */ + Free memory used by a font */ void php3_imagepsfreefont(INTERNAL_FUNCTION_PARAMETERS) { pval *fnt; int type; @@ -2080,7 +2080,7 @@ /* }}} */ /* {{{ proto bool imagepsencodefont(int font_index, string filename) -To change a fonts character encoding vector */ + To change a fonts character encoding vector */ void php3_imagepsencodefont(INTERNAL_FUNCTION_PARAMETERS) { pval *fnt, *enc; char **enc_vector; @@ -2118,7 +2118,7 @@ /* }}} */ /* {{{ proto bool imagepsextendfont(int font_index, double extend) -Extend or or condense (if extend < 1) a font */ + Extend or or condense (if extend < 1) a font */ void php3_imagepsextendfont(INTERNAL_FUNCTION_PARAMETERS) { pval *fnt, *ext; int type; @@ -2145,7 +2145,7 @@ /* }}} */ /* {{{ proto bool imagepsslantfont(int font_index, double slant) -Slant a font */ + Slant a font */ void php3_imagepsslantfont(INTERNAL_FUNCTION_PARAMETERS) { pval *fnt, *slt; int type; @@ -2171,7 +2171,7 @@ /* }}} */ /* {{{ proto array imagepstext(int image, string text, int font, int size, int xcoord, int ycoord [, int space, int tightness, double angle, int antialias]) -Rasterize a string over an image */ + Rasterize a string over an image */ void php3_imagepstext(INTERNAL_FUNCTION_PARAMETERS) { pval *img, *str, *fnt, *sz, *fg, *bg, *sp, *px, *py, *aas, *wd, *ang; int i, j, x, y; @@ -2338,8 +2338,8 @@ } /* }}} */ -/* {{{ proto array imagepsbbox(string text, int font, int size[, int space, int tightness, int angle]) -Return the bounding box needed by a string if rasterized */ +/* {{{ proto array imagepsbbox(string text, int font, int size [, int space, int tightness, int angle]) + Return the bounding box needed by a string if rasterized */ void php3_imagepsbbox(INTERNAL_FUNCTION_PARAMETERS) { pval *str, *fnt, *sz, *sp, *wd, *ang; int i, space, add_width, char_width, amount_kern, type;