From 0f0443c5ac3c9af28777935dc132ef2ab586ed28 Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Sat, 13 Oct 2007 19:22:54 +0000
Subject: [PATCH] Document the IMAGETYPE_ICO constant and the icon support in
 getimagesize()

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@244162 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/image/constants.xml                    | 16 +++++++++++++++-
 reference/image/functions/getimagesize.xml       | 14 +++++++++++++-
 .../image/functions/image-type-to-mime-type.xml  |  6 +++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/reference/image/constants.xml b/reference/image/constants.xml
index cb35248e3b..bb4f5f2ac6 100644
--- a/reference/image/constants.xml
+++ b/reference/image/constants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <section xml:id="image.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  &extension.constants;
@@ -660,6 +660,20 @@
     </simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>
+    <constant>IMAGETYPE_ICO</constant>
+    (<type>integer</type>)
+   </term>
+   <listitem>
+    <simpara>
+     Image type constant used by the
+     <function>image_type_to_mime_type</function> and
+     <function>image_type_to_extension</function> functions.
+     (Available as of PHP 5.3.0)
+    </simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>
     <constant>PNG_NO_FILTER</constant> 
diff --git a/reference/image/functions/getimagesize.xml b/reference/image/functions/getimagesize.xml
index 62d9756ee2..d82ec29f2f 100644
--- a/reference/image/functions/getimagesize.xml
+++ b/reference/image/functions/getimagesize.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.35 $ -->
+<!-- $Revision: 1.36 $ -->
 <refentry xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://docbook.org/ns/docbook" xml:id="function.getimagesize">
  <refnamediv>
   <refname>getimagesize</refname>
@@ -32,6 +32,12 @@
     codestream it encounters in the root of the file.
    </simpara>
   </note>
+  <note>
+   <simpara>
+    The information about icons are retreived from the icon with the highest
+    bitrate.
+   </simpara>
+  </note>
  </refsect1>
  <refsect1 role="parameters">
   &reftitle.parameters;
@@ -147,6 +153,12 @@ if ($size && $fp) {
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>5.3.0</entry>
+       <entry>
+        Added icon support.
+       </entry>
+      </row>
       <row>
        <entry>5.2.3</entry>
        <entry>
diff --git a/reference/image/functions/image-type-to-mime-type.xml b/reference/image/functions/image-type-to-mime-type.xml
index c97caa6388..2272cf9594 100644
--- a/reference/image/functions/image-type-to-mime-type.xml
+++ b/reference/image/functions/image-type-to-mime-type.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <refentry xml:id="function.image-type-to-mime-type" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>image_type_to_mime_type</refname>
@@ -112,6 +112,10 @@
        <entry><constant>IMAGETYPE_XBM</constant></entry>
        <entry><literal>image/xbm</literal></entry>
       </row>
+      <row>
+       <entry><constant>IMAGETYPE_ICO</constant></entry>
+       <entry><literal>image/vnd.microsoft.icon</literal></entry>
+      </row>
      </tbody>
     </tgroup>
    </table>