philip Tue Jul 22 15:06:01 2003 EDT
Modified files:
/phpdoc/en/reference/image/functions getimagesize.xml
exif-imagetype.xml
Log:
Document XBM and WBMP support, as of PHP 4.3.2. (and fix some typos)
Index: phpdoc/en/reference/image/functions/getimagesize.xml
diff -u phpdoc/en/reference/image/functions/getimagesize.xml:1.15
phpdoc/en/reference/image/functions/getimagesize.xml:1.16
--- phpdoc/en/reference/image/functions/getimagesize.xml:1.15 Wed Jul 16 13:14:17
2003
+++ phpdoc/en/reference/image/functions/getimagesize.xml Tue Jul 22 15:06:01
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
<!-- splitted from ./en/functions/image.xml, last change in rev 1.36 -->
<refentry id="function.getimagesize">
<refnamediv>
@@ -19,21 +19,28 @@
<acronym>PNG</acronym>, <acronym>SWF</acronym>,
<acronym>SWC</acronym>, <acronym>PSD</acronym>,
<acronym>TIFF</acronym>, <acronym>BMP</acronym>,
- <acronym>IFF</acronym>, <acronym>JP2</acronym> or
- <acronym>JPC</acronym>
- image file and return the dimensions along with the file type and
- a height/width text string to be used inside a normal
+ <acronym>IFF</acronym>, <acronym>JP2</acronym>,
+ <acronym>JPC</acronym>, <acronym>XBM</acronym>, or
+ <acronym>WBMP</acronym> image file and return the dimensions along with
+ the file type and a height/width text string to be used inside a normal
<acronym>HTML</acronym> <literal>IMG</literal> tag.
</para>
+ <note>
+ <para>
+ Support for <acronym>JPC</acronym>, <acronym>JPC</acronym>,
+ <acronym>XBM</acronym>, and <acronym>WBMP</acronym> became available in
+ PHP 4.3.2.
+ </para>
+ </note>
<para>
Returns an array with 4 elements. Index 0 contains the width of
the image in pixels. Index 1 contains the height. Index 2 is a
flag indicating the type of the image: 1 = GIF, 2 = JPG, 3 =
PNG, 4 = SWF, 5 = PSD, 6 = BMP, 7 = TIFF(intel byte order),
8 = TIFF(motorola byte order), 9 = JPC, 10 = JP2, 11 = JPX, 12 =
- JB2, 13 = SWC, 14 = IFF. These values correspond to the IMAGETYPE
- constants that were added in PHP 4.3. Index 3 is a text string with
- the correct height="yyy" width="xxx" string that can be used
+ JB2, 13 = SWC, 14 = IFF, 15 = WBMP, 16 = XBM. These values correspond to
+ the IMAGETYPE constants that were added in PHP 4.3. Index 3 is a text
+ string with the correct height="yyy" width="xxx" string that can be used
directly in an IMG tag.
<example>
<title>getimagesize (file)</title>
Index: phpdoc/en/reference/image/functions/exif-imagetype.xml
diff -u phpdoc/en/reference/image/functions/exif-imagetype.xml:1.11
phpdoc/en/reference/image/functions/exif-imagetype.xml:1.12
--- phpdoc/en/reference/image/functions/exif-imagetype.xml:1.11 Thu May 29 16:22:12
2003
+++ phpdoc/en/reference/image/functions/exif-imagetype.xml Tue Jul 22 15:06:01
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
<!-- splitted from ./en/functions/image.xml, last change in rev 1.81 -->
<refentry id="function.exif-imagetype">
<refnamediv>
@@ -22,7 +22,7 @@
<para>
The following constants are defined:
<table>
- <title>Imagetyp Constants</title>
+ <title>Imagetype Constants</title>
<tgroup cols="2">
<thead>
<row>
@@ -67,7 +67,7 @@
</row>
<row>
<entry>9</entry>
- <entry><constant>MAGETYPE_JPC</constant></entry>
+ <entry><constant>IMAGETYPE_JPC</constant></entry>
</row>
<row>
<entry>10</entry>
@@ -76,11 +76,27 @@
<row>
<entry>11</entry>
<entry><constant>IMAGETYPE_JPX</constant></entry>
- </row>
+ </row>
<row>
<entry>12</entry>
+ <entry><constant>IMAGETYPE_JB2</constant></entry>
+ </row>
+ <row>
+ <entry>13</entry>
<entry><constant>IMAGETYPE_SWC</constant></entry>
- </row>
+ </row>
+ <row>
+ <entry>14</entry>
+ <entry><constant>IMAGETYPE_IFF</constant></entry>
+ </row>
+ <row>
+ <entry>15</entry>
+ <entry><constant>IMAGETYPE_WBMP</constant></entry>
+ </row>
+ <row>
+ <entry>16</entry>
+ <entry><constant>IMAGETYPE_XBM</constant></entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -93,7 +109,7 @@
</para>
<note>
<simpara>
- This function is only available if PHP 4 is compiled using
+ This function is only available if PHP is compiled using
<option role="configure">--enable-exif</option>.
</simpara>
</note>
--
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php