[DOC-CVS] [doc-en] master: exif: fix XML to get remove of useless wrapping para tags (#5115)
[email protected] (Gina Peter Banyard via GitHub)
| Newsgroups | php.doc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: Gina Peter Banyard (Girgias)
Committer: GitHub (web-flow)
Pusher: Girgias
Date: 2026-01-15T22:59:41Z
Commit: https://github.com/php/doc-en/commit/b090c4476884e5dbce1f3cc2adf28c65b04d9de9
Raw diff: https://github.com/php/doc-en/commit/b090c4476884e5dbce1f3cc2adf28c65b04d9de9.diff
exif: fix XML to get remove of useless wrapping para tags (#5115)
Changed paths:
M reference/exif/constants.xml
M reference/exif/functions/exif-imagetype.xml
M reference/exif/functions/exif-read-data.xml
M reference/exif/functions/exif-tagname.xml
M reference/exif/functions/exif-thumbnail.xml
M reference/exif/functions/read-exif-data.xml
M reference/exif/ini.xml
Diff:
diff --git a/reference/exif/constants.xml b/reference/exif/constants.xml
index 81e425da419e..bf81817accfd 100644
--- a/reference/exif/constants.xml
+++ b/reference/exif/constants.xml
@@ -1,25 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<appendix xml:id="exif.constants" xmlns="http://docbook.org/ns/docbook">
+<appendix xmlns="http://docbook.org/ns/docbook" xml:id="exif.constants">
&reftitle.constants;
&extension.constants;
- <para>
- <variablelist>
- <varlistentry xml:id="constant.exif-use-mbstring">
- <term>
- <constant>EXIF_USE_MBSTRING</constant>
- (<type>int</type>)
- </term>
- <listitem>
- <simpara>
- This constant has a value of <literal>1</literal> if the
- <link linkend="ref.mbstring">mbstring</link> is enabled, otherwise
- it has a value of <literal>0</literal>.
- </simpara>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry xml:id="constant.exif-use-mbstring">
+ <term>
+ <constant>EXIF_USE_MBSTRING</constant>
+ (<type>int</type>)
+ </term>
+ <listitem>
+ <simpara>
+ This constant has a value of <literal>1</literal> if the
+ <link linkend="ref.mbstring">mbstring</link> is enabled, otherwise
+ it has a value of <literal>0</literal>.
+ </simpara>
+ </listitem>
+ </varlistentry>
+ </variablelist>
<para>
The <function>exif_imagetype</function> lists several related built-in
constants.
diff --git a/reference/exif/functions/exif-imagetype.xml b/reference/exif/functions/exif-imagetype.xml
index 39a663781ea4..280f489bbf7a 100644
--- a/reference/exif/functions/exif-imagetype.xml
+++ b/reference/exif/functions/exif-imagetype.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- splitted from ./en/functions/image.xml, last change in rev 1.81 -->
- <refentry xml:id="function.exif-imagetype" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.exif-imagetype">
<refnamediv>
<refname>exif_imagetype</refname>
<refpurpose>Determine the type of an image</refpurpose>
@@ -17,26 +17,24 @@
checks its signature.
</para>
<para>
- <function>exif_imagetype</function> can be used to avoid calls to other
- <link linkend="ref.exif">exif</link> functions with unsupported file types
- or in conjunction with <varname>$_SERVER['HTTP_ACCEPT']</varname> to check
+ <function>exif_imagetype</function> can be used to avoid calls to other
+ <link linkend="ref.exif">exif</link> functions with unsupported file types
+ or in conjunction with <varname>$_SERVER['HTTP_ACCEPT']</varname> to check
whether or not the viewer is able to see a specific image in the browser.
</para>
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>filename</parameter></term>
- <listitem>
- <simpara>
- The image being checked.
- </simpara>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>filename</parameter></term>
+ <listitem>
+ <simpara>
+ The image being checked.
+ </simpara>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -47,7 +45,7 @@
<function>exif_imagetype</function> is much faster.
</para>
<para>
- The following constants are defined, and represent possible
+ The following constants are defined, and represent possible
<function>exif_imagetype</function> return values:
<table>
<title>Imagetype Constants</title>
@@ -74,33 +72,33 @@
<row>
<entry>4</entry>
<entry><constant>IMAGETYPE_SWF</constant></entry>
- </row>
+ </row>
<row>
<entry>5</entry>
<entry><constant>IMAGETYPE_PSD</constant></entry>
- </row>
+ </row>
<row>
<entry>6</entry>
<entry><constant>IMAGETYPE_BMP</constant></entry>
- </row>
+ </row>
<row>
<entry>7</entry>
<entry><constant>IMAGETYPE_TIFF_II</constant> (intel byte order)</entry>
- </row>
+ </row>
<row>
<entry>8</entry>
<entry>
<constant>IMAGETYPE_TIFF_MM</constant> (motorola byte order)
</entry>
- </row>
+ </row>
<row>
<entry>9</entry>
<entry><constant>IMAGETYPE_JPC</constant></entry>
- </row>
+ </row>
<row>
<entry>10</entry>
<entry><constant>IMAGETYPE_JP2</constant></entry>
- </row>
+ </row>
<row>
<entry>11</entry>
<entry><constant>IMAGETYPE_JPX</constant></entry>
@@ -138,8 +136,8 @@
<entry><constant>IMAGETYPE_AVIF</constant></entry>
</row>
</tbody>
- </tgroup>
- </table>
+ </tgroup>
+ </table>
</para>
<note>
@@ -155,59 +153,53 @@
</refsect1>
<refsect1 role="changelog">
&reftitle.changelog;
- <para>
- <informaltable>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>&Version;</entry>
- <entry>&Description;</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>7.1.0</entry>
- <entry>
- Added WebP support.
- </entry>
- </row>
- <row>
- <entry>8.1.0</entry>
- <entry>
- Added AVIF support.
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>7.1.0</entry>
+ <entry>
+ Added WebP support.
+ </entry>
+ </row>
+ <row>
+ <entry>8.1.0</entry>
+ <entry>
+ Added AVIF support.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
</refsect1>
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title><function>exif_imagetype</function> example</title>
- <programlisting role="php">
+ <example>
+ <title><function>exif_imagetype</function> example</title>
+ <programlisting role="php">
<![CDATA[
<?php
if (exif_imagetype('image.gif') != IMAGETYPE_GIF) {
echo 'The picture is not a gif';
}
?>
-]]>
- </programlisting>
- </example>
- </para>
+]]>
+ </programlisting>
+ </example>
</refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
- <para>
- <simplelist>
- <member><function>image_type_to_mime_type</function></member>
- <member><function>getimagesize</function></member>
- </simplelist>
- </para>
+ <simplelist>
+ <member><function>image_type_to_mime_type</function></member>
+ <member><function>getimagesize</function></member>
+ </simplelist>
</refsect1>
</refentry>
<!-- Keep this comment at the end of the file
diff --git a/reference/exif/functions/exif-read-data.xml b/reference/exif/functions/exif-read-data.xml
index 712bcd09c21e..93d83a008848 100644
--- a/reference/exif/functions/exif-read-data.xml
+++ b/reference/exif/functions/exif-read-data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- splitted from ./en/functions/image.xml, last change in rev 1.78 -->
-<refentry xml:id="function.exif-read-data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.exif-read-data">
<refnamediv>
<refname>exif_read_data</refname>
<refpurpose>Reads the <acronym>EXIF</acronym> headers from an image file</refpurpose>
@@ -17,7 +17,7 @@
</methodsynopsis>
<para>
<function>exif_read_data</function> reads the
- <acronym>EXIF</acronym> headers from an image file. This way you can read meta data
+ <acronym>EXIF</acronym> headers from an image file. This way you can read meta data
generated by digital cameras.
</para>
<para>
@@ -27,9 +27,9 @@
a specific Exif header being present.
</para>
<para>
- <literal>Height</literal> and <literal>Width</literal> are computed the
- same way <function>getimagesize</function> does so their values must not be
- part of any header returned. Also, <literal>html</literal> is a
+ <literal>Height</literal> and <literal>Width</literal> are computed the
+ same way <function>getimagesize</function> does so their values must not be
+ part of any header returned. Also, <literal>html</literal> is a
height/width text string to be used inside normal <acronym>HTML</acronym>.
</para>
<para>
@@ -56,115 +56,112 @@
</para>
<para>
<function>exif_read_data</function> also validates EXIF data tags according
- to the EXIF specification (<link
- xlink:href="&url.exifspec;">&url.exifspec;</link>, page 20).
+ to the EXIF specification (<link xlink:href="&url.exifspec;">&url.exifspec;</link>, page 20).
</para>
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>file</parameter></term>
- <listitem>
- <para>
- The location of the image file. This can either be a path to the file
- (stream wrappers are also supported as usual)
- or a stream <type>resource</type>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>required_sections</parameter></term>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>file</parameter></term>
+ <listitem>
+ <para>
+ The location of the image file. This can either be a path to the file
+ (stream wrappers are also supported as usual)
+ or a stream <type>resource</type>.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>required_sections</parameter></term>
+ <listitem>
+ <para>
+ Is a comma separated list of sections that need to be present in file
+ to produce a result <type>array</type>. If none of the requested
+ sections could be found the return value is &false;.
+ <informaltable>
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>FILE</entry>
+ <entry>FileName, FileSize, FileDateTime, SectionsFound</entry>
+ </row>
+ <row>
+ <entry>COMPUTED</entry>
+ <entry>
+ html, Width, Height, IsColor, and more if available. Height and
+ Width are computed the same way <function>getimagesize</function>
+ does so their values must not be part of any header returned.
+ Also, <literal>html</literal> is a height/width text string to be used inside normal
+ <acronym>HTML</acronym>.
+ </entry>
+ </row>
+ <row>
+ <entry>ANY_TAG</entry>
+ <entry>Any information that has a Tag e.g. <literal>IFD0</literal>, <literal>EXIF</literal>, ...</entry>
+ </row>
+ <row>
+ <entry>IFD0</entry>
+ <entry>
+ All tagged data of IFD0. In normal imagefiles this contains
+ image size and so forth.
+ </entry>
+ </row>
+ <row>
+ <entry>THUMBNAIL</entry>
+ <entry>
+ A file is supposed to contain a thumbnail if it has a second <literal>IFD</literal>.
+ All tagged information about the embedded thumbnail is stored in
+ this section.
+ </entry>
+ </row>
+ <row>
+ <entry>COMMENT</entry>
+ <entry>Comment headers of JPEG images.</entry>
+ </row>
+ <row>
+ <entry>EXIF</entry>
+ <entry>
+ The EXIF section is a sub section of <literal>IFD0</literal>. It contains
+ more detailed information about an image. Most of these entries
+ are digital camera related.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>as_arrays</parameter></term>
<listitem>
- <para>
- Is a comma separated list of sections that need to be present in file
- to produce a result <type>array</type>. If none of the requested
- sections could be found the return value is &false;.
- <informaltable>
- <tgroup cols="2">
- <tbody>
- <row>
- <entry>FILE</entry>
- <entry>FileName, FileSize, FileDateTime, SectionsFound</entry>
- </row>
- <row>
- <entry>COMPUTED</entry>
- <entry>
- html, Width, Height, IsColor, and more if available. Height and
- Width are computed the same way <function>getimagesize</function>
- does so their values must not be part of any header returned.
- Also, <literal>html</literal> is a height/width text string to be used inside normal
- <acronym>HTML</acronym>.
- </entry>
- </row>
- <row>
- <entry>ANY_TAG</entry>
- <entry>Any information that has a Tag e.g. <literal>IFD0</literal>, <literal>EXIF</literal>, ...</entry>
- </row>
- <row>
- <entry>IFD0</entry>
- <entry>
- All tagged data of IFD0. In normal imagefiles this contains
- image size and so forth.
- </entry>
- </row>
- <row>
- <entry>THUMBNAIL</entry>
- <entry>
- A file is supposed to contain a thumbnail if it has a second <literal>IFD</literal>.
- All tagged information about the embedded thumbnail is stored in
- this section.
- </entry>
- </row>
- <row>
- <entry>COMMENT</entry>
- <entry>Comment headers of JPEG images.</entry>
- </row>
- <row>
- <entry>EXIF</entry>
- <entry>
- The EXIF section is a sub section of <literal>IFD0</literal>. It contains
- more detailed information about an image. Most of these entries
- are digital camera related.
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>as_arrays</parameter></term>
- <listitem>
- <para>
- Specifies whether or not each section becomes an array. The
- <parameter>required_sections</parameter> <literal>COMPUTED</literal>,
- <literal>THUMBNAIL</literal>, and <literal>COMMENT</literal>
- always become arrays as they may contain values whose names conflict
- with other sections.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>read_thumbnail</parameter></term>
- <listitem>
- <para>
- When set to &true; the thumbnail itself is read. Otherwise, only the
- tagged data is read.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
- </refsect1>
+ <para>
+ Specifies whether or not each section becomes an array. The
+ <parameter>required_sections</parameter> <literal>COMPUTED</literal>,
+ <literal>THUMBNAIL</literal>, and <literal>COMMENT</literal>
+ always become arrays as they may contain values whose names conflict
+ with other sections.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>read_thumbnail</parameter></term>
+ <listitem>
+ <para>
+ When set to &true; the thumbnail itself is read. Otherwise, only the
+ tagged data is read.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- It returns an associative <type>array</type> where the array indexes are
- the header names and the array values are the values associated with
- those headers. If no data can be returned,
+ It returns an associative <type>array</type> where the array indexes are
+ the header names and the array values are the values associated with
+ those headers. If no data can be returned,
<function>exif_read_data</function> will return &false;.
</para>
</refsect1>
@@ -180,61 +177,58 @@
<refsect1 role="changelog">
&reftitle.changelog;
- <para>
- <informaltable>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>&Version;</entry>
- <entry>&Description;</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>8.0.0</entry>
- <entry>
- <parameter>required_sections</parameter> is nullable now.
- </entry>
- </row>
- <row>
- <entry>7.2.0</entry>
- <entry>
- The <parameter>file</parameter> parameter now supports both local files
- and stream resources.
- </entry>
- </row>
- <row>
- <entry>7.2.0</entry>
- <entry>
- <para>
- Support for the following EXIF formats were added:
- <simplelist>
- <member>Samsung</member>
- <member>DJI</member>
- <member>Panasonic</member>
- <member>Sony</member>
- <member>Pentax</member>
- <member>Minolta</member>
- <member>Sigma/Foveon</member>
- <member>AGFA</member>
- <member>Kyocera</member>
- <member>Ricoh</member>
- <member>Epson</member>
- </simplelist>
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>required_sections</parameter> is nullable now.
+ </entry>
+ </row>
+ <row>
+ <entry>7.2.0</entry>
+ <entry>
+ The <parameter>file</parameter> parameter now supports both local files
+ and stream resources.
+ </entry>
+ </row>
+ <row>
+ <entry>7.2.0</entry>
+ <entry>
+ <para>
+ Support for the following EXIF formats were added:
+ <simplelist>
+ <member>Samsung</member>
+ <member>DJI</member>
+ <member>Panasonic</member>
+ <member>Sony</member>
+ <member>Pentax</member>
+ <member>Minolta</member>
+ <member>Sigma/Foveon</member>
+ <member>AGFA</member>
+ <member>Kyocera</member>
+ <member>Ricoh</member>
+ <member>Epson</member>
+ </simplelist>
+ </para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
</refsect1>
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title><function>exif_read_data</function> example</title>
- <programlisting role="php">
+ <example>
+ <title><function>exif_read_data</function> example</title>
+ <programlisting role="php">
<![CDATA[
<?php
echo "test1.jpg:<br />\n";
@@ -250,12 +244,12 @@ foreach ($exif as $key => $section) {
}
?>
]]>
- </programlisting>
- <para>
- The first call fails because the image has no header information.
- </para>
- &example.outputs.similar;
- <screen role="php">
+ </programlisting>
+ <para>
+ The first call fails because the image has no header information.
+ </para>
+ &example.outputs.similar;
+ <screen role="php">
<![CDATA[
test1.jpg:
No header data found.
@@ -286,13 +280,11 @@ THUMBNAIL.JPEGInterchangeFormat: 134
THUMBNAIL.Thumbnail.Height: 1
THUMBNAIL.Thumbnail.Height: 1
]]>
- </screen>
- </example>
- </para>
- <para>
- <example>
- <title><function>exif_read_data</function> with streams available as of PHP 7.2.0</title>
- <programlisting role="php">
+ </screen>
+ </example>
+ <example>
+ <title><function>exif_read_data</function> with streams available as of PHP 7.2.0</title>
+ <programlisting role="php">
<![CDATA[
<?php
// Open a the file, this should be in binary mode
@@ -319,9 +311,9 @@ foreach ($headers['COMPUTED'] as $header => $value) {
}
?>
]]>
- </programlisting>
- &example.outputs.similar;
- <screen role="php">
+ </programlisting>
+ &example.outputs.similar;
+ <screen role="php">
<![CDATA[
EXIF Headers:
Height => 576
@@ -335,39 +327,36 @@ EXIF Headers:
Thumbnail.FileType => 2
Thumbnail.MimeType => image/jpeg
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
<refsect1 role="notes">
&reftitle.notes;
<note>
<para>
- If <link linkend="ref.mbstring">mbstring</link> is enabled, exif will attempt to process
- the unicode and pick a charset as specified by
- <link linkend="ini.exif.decode-unicode-motorola">exif.decode_unicode_motorola</link> and
- <link linkend="ini.exif.decode-unicode-intel">exif.decode_unicode_intel</link>. The exif
- extension will not attempt to figure out the encoding on its own, and it is up to the user
- to properly specify the encoding for which to use for decoding by setting one of these two
- ini directives prior to calling <function>exif_read_data</function>.
+ If <link linkend="ref.mbstring">mbstring</link> is enabled, exif will attempt to process
+ the unicode and pick a charset as specified by
+ <link linkend="ini.exif.decode-unicode-motorola">exif.decode_unicode_motorola</link> and
+ <link linkend="ini.exif.decode-unicode-intel">exif.decode_unicode_intel</link>. The exif
+ extension will not attempt to figure out the encoding on its own, and it is up to the user
+ to properly specify the encoding for which to use for decoding by setting one of these two
+ ini directives prior to calling <function>exif_read_data</function>.
</para>
</note>
<note>
<para>
- If the <parameter>file</parameter> is used to pass a stream to this function, then the stream
+ If the <parameter>file</parameter> is used to pass a stream to this function, then the stream
must be seekable. Note that the file pointer position is not changed after this function returns.
</para>
</note>
</refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
- <para>
- <simplelist>
- <member><function>exif_thumbnail</function></member>
- <member><function>getimagesize</function></member>
- <member><xref linkend="wrappers"/></member>
- </simplelist>
- </para>
+ <simplelist>
+ <member><function>exif_thumbnail</function></member>
+ <member><function>getimagesize</function></member>
+ <member><xref linkend="wrappers"/></member>
+ </simplelist>
</refsect1>
</refentry>
<!-- Keep this comment at the end of the file
diff --git a/reference/exif/functions/exif-tagname.xml b/reference/exif/functions/exif-tagname.xml
index cdd51fc4ed0c..f830ed73717e 100644
--- a/reference/exif/functions/exif-tagname.xml
+++ b/reference/exif/functions/exif-tagname.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<refentry xml:id="function.exif-tagname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.exif-tagname">
<refnamediv>
<refname>exif_tagname</refname>
<refpurpose>Get the header name for an index</refpurpose>
@@ -14,18 +14,16 @@
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>index</parameter></term>
- <listitem>
- <para>
- The Tag ID for which a Tag Name will be looked up.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>index</parameter></term>
+ <listitem>
+ <para>
+ The Tag ID for which a Tag Name will be looked up.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
@@ -36,36 +34,32 @@
</refsect1>
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title><function>exif_tagname</function> example</title>
- <programlisting role="php">
+ <example>
+ <title><function>exif_tagname</function> example</title>
+ <programlisting role="php">
<![CDATA[
<?php
echo "256: ".exif_tagname(256).PHP_EOL;
echo "257: ".exif_tagname(257).PHP_EOL;
?>
]]>
- </programlisting>
- &example.outputs;
- <screen>
+ </programlisting>
+ &example.outputs;
+ <screen>
<![CDATA[
256: ImageWidth
257: ImageLength
]]>
- </screen>
- </example>
- </para>
+ </screen>
+ </example>
</refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
- <para>
- <simplelist>
- <member><function>exif_imagetype</function></member>
- <member><link xlink:href="&url.exifspec;">EXIF Specification</link></member>
- <member><link xlink:href="&url.exiftags;">EXIF Tags</link></member>
- </simplelist>
- </para>
+ <simplelist>
+ <member><function>exif_imagetype</function></member>
+ <member><link xlink:href="&url.exifspec;">EXIF Specification</link></member>
+ <member><link xlink:href="&url.exiftags;">EXIF Tags</link></member>
+ </simplelist>
</refsect1>
</refentry>
<!-- Keep this comment at the end of the file
diff --git a/reference/exif/functions/exif-thumbnail.xml b/reference/exif/functions/exif-thumbnail.xml
index 42f7a028561f..da1d8cb0d6b0 100644
--- a/reference/exif/functions/exif-thumbnail.xml
+++ b/reference/exif/functions/exif-thumbnail.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- splitted from ./en/functions/image.xml, last change in rev 1.78 -->
-<refentry xml:id="function.exif-thumbnail" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.exif-thumbnail">
<refnamediv>
<refname>exif_thumbnail</refname>
<refpurpose>Retrieve the embedded thumbnail of an image</refpurpose>
@@ -16,99 +16,94 @@
<methodparam choice="opt"><type>int</type><parameter role="reference">image_type</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
- <function>exif_thumbnail</function> reads the embedded thumbnail of an image.
+ <function>exif_thumbnail</function> reads the embedded thumbnail of an image.
</para>
<para>
If you want to deliver thumbnails through this function, you should send
the mimetype information using the <function>header</function> function.
</para>
<para>
- It is possible that <function>exif_thumbnail</function> cannot create an
- image but can determine its size. In this case, the return value is
- &false; but <parameter>width</parameter> and <parameter>height</parameter>
+ It is possible that <function>exif_thumbnail</function> cannot create an
+ image but can determine its size. In this case, the return value is
+ &false; but <parameter>width</parameter> and <parameter>height</parameter>
are set.
</para>
</refsect1>
<refsect1 role="parameters">
&reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>file</parameter></term>
- <listitem>
- <para>
- The location of the image file. This can either be a path to the file
- or a stream <type>resource</type>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>width</parameter></term>
- <listitem>
- <para>
- The return width of the returned thumbnail.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>height</parameter></term>
- <listitem>
- <para>
- The returned height of the returned thumbnail.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>image_type</parameter></term>
- <listitem>
- <para>
- The returned image type of the returned thumbnail. This is either
- <acronym>TIFF</acronym> or <acronym>JPEG</acronym>.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>file</parameter></term>
+ <listitem>
+ <para>
+ The location of the image file. This can either be a path to the file
+ or a stream <type>resource</type>.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>width</parameter></term>
+ <listitem>
+ <para>
+ The return width of the returned thumbnail.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>height</parameter></term>
+ <listitem>
+ <para>
+ The returned height of the returned thumbnail.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>image_type</parameter></term>
+ <listitem>
+ <para>
+ The returned image type of the returned thumbnail. This is either
+ <acronym>TIFF</acronym> or <acronym>JPEG</acronym>.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- Returns the embedded thumbnail, or &false; if the image contains no
+ Returns the embedded thumbnail, or &false; if the image contains no
thumbnail.
</para>
</refsect1>
<refsect1 role="changelog">
&reftitle.changelog;
- <para>
- <informaltable>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>&Version;</entry>
- <entry>&Description;</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>7.2.0</entry>
- <entry>
- The <parameter>file</parameter> parameter now supports both local files
- and stream resources.
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>7.2.0</entry>
+ <entry>
+ The <parameter>file</parameter> parameter now supports both local files
+ and stream resources.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
</refsect1>
<refsect1 role="examples">
&reftitle.examples;
- <para>
- <example>
- <title><function>exif_thumbnail</function> example</title>
- <programlisting role="php">
+ <example>
+ <title><function>exif_thumbnail</function> example</title>
+ <programlisting role="php">
<![CDATA[
<?php
$image = exif_thumbnail('/path/to/image.jpg', $width, $height, $type);
@@ -123,28 +118,25 @@ if ($image!==false) {
}
?>
]]>
- </programlisting>
- </example>
- </para>
+ </programlisting>
+ </example>
</refsect1>
<refsect1 role="notes">
&reftitle.notes;
<note>
<para>
- If the <parameter>file</parameter> is used to pass a stream to this function, then the stream
+ If the <parameter>file</parameter> is used to pass a stream to this function, then the stream
must be seekable. Note that the file pointer position is not changed after this function returns.
</para>
</note>
</refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
- <para>
- <simplelist>
- <member><function>exif_read_data</function></member>
- <member><function>image_type_to_mime_type</function></member>
- </simplelist>
- </para>
+ <simplelist>
+ <member><function>exif_read_data</function></member>
+ <member><function>image_type_to_mime_type</function></member>
+ </simplelist>
</refsect1>
</refentry>
<!-- Keep this comment at the end of the file
diff --git a/reference/exif/functions/read-exif-data.xml b/reference/exif/functions/read-exif-data.xml
index 1282b4a16e32..d2c1146972e3 100644
--- a/reference/exif/functions/read-exif-data.xml
+++ b/reference/exif/functions/read-exif-data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- splitted from ./en/functions/image.xml, last change in rev 1.78 -->
-<refentry xml:id="function.read-exif-data" xmlns="http://docbook.org/ns/docbook">
+<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.read-exif-data">
<refnamediv>
<refname>read_exif_data</refname>
<refpurpose>&Alias; <function>exif_read_data</function></refpurpose>
@@ -20,29 +20,26 @@
</refsect1>
<refsect1 role="changelog">
&reftitle.changelog;
- <para>
- <informaltable>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>&Version;</entry>
- <entry>&Description;</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>7.2.0</entry>
- <entry>
- This function alias was deprecated.
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>7.2.0</entry>
+ <entry>
+ This function alias was deprecated.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/exif/ini.xml b/reference/exif/ini.xml
index 48d94ba5e36a..fbcdbb06f8e8 100644
--- a/reference/exif/ini.xml
+++ b/reference/exif/ini.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<section xml:id="exif.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xmlns="http://docbook.org/ns/docbook" xml:id="exif.configuration">
&reftitle.runtime;
&extension.runtime;
<para>
- Exif supports automatically conversion for Unicode and JIS
+ Exif supports automatically conversion for Unicode and JIS
character encodings of user comments when module
<link linkend="ref.mbstring">mbstring</link>
is available. This is done by first decoding the comment
@@ -27,144 +27,141 @@
<entry><link linkend="ini.exif.encode-unicode">exif.encode_unicode</link></entry>
<entry>"ISO-8859-15"</entry>
<entry><constant>INI_ALL</constant></entry>
- <entry></entry>
+ <entry/>
</row>
<row>
<entry><link linkend="ini.exif.decode-unicode-motorola">exif.decode_unicode_motorola</link></entry>
<entry>"UCS-2BE"</entry>
<entry><constant>INI_ALL</constant></entry>
- <entry></entry>
+ <entry/>
</row>
<row>
<entry><link linkend="ini.exif.decode-unicode-intel">exif.decode_unicode_intel</link></entry>
<entry>"UCS-2LE"</entry>
<entry><constant>INI_ALL</constant></entry>
- <entry></entry>
+ <entry/>
</row>
<row>
<entry><link linkend="ini.exif.encode-jis">exif.encode_jis</link></entry>
<entry>""</entry>
<entry><constant>INI_ALL</constant></entry>
- <entry></entry>
+ <entry/>
</row>
<row>
<entry><link linkend="ini.exif.decode-jis-motorola">exif.decode_jis_motorola</link></entry>
<entry>"JIS"</entry>
<entry><constant>INI_ALL</constant></entry>
- <entry></entry>
+ <entry/>
</row>
<row>
<entry><link linkend="ini.exif.decode-jis-intel">exif.decode_jis_intel</link></entry>
<entry>"JIS"</entry>
<entry><constant>INI_ALL</constant></entry>
- <entry></entry>
+ <entry/>
</row>
</tbody>
</tgroup>
</table>
&ini.php.constants;
</para>
-
+
&ini.descriptions.title;
-
- <para>
- <variablelist>
- <varlistentry xml:id="ini.exif.encode-unicode">
- <term>
- <parameter>exif.encode_unicode</parameter>
- <type>string</type>
- </term>
- <listitem>
+
+ <variablelist>
+ <varlistentry xml:id="ini.exif.encode-unicode">
+ <term>
+ <parameter>exif.encode_unicode</parameter>
+ <type>string</type>
+ </term>
+ <listitem>
+ <para>
+ <literal>exif.encode_unicode</literal> defines the
+ characterset UNICODE user comments are handled.
+ This defaults to ISO-8859-15 which should work for
+ most non Asian countries. The setting can be empty
+ or must be an encoding supported by mbstring. If it
+ is empty the current internal encoding of mbstring is
+ used.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry xml:id="ini.exif.decode-unicode-motorola">
+ <term>
+ <parameter>exif.decode_unicode_motorola</parameter>
+ <type>string</type>
+ </term>
+ <listitem>
<para>
- <literal>exif.encode_unicode</literal> defines the
- characterset UNICODE user comments are handled.
- This defaults to ISO-8859-15 which should work for
- most non Asian countries. The setting can be empty
- or must be an encoding supported by mbstring. If it
- is empty the current internal encoding of mbstring is
- used.
+ <literal>exif.decode_unicode_motorola</literal> defines
+ the image internal characterset for Unicode encoded user
+ comments if image is in motorola byte order (big-endian).
+ This setting cannot be empty but you can specify a list
+ of encodings supported by mbstring. The default is UCS-2BE.
</para>
- </listitem>
- </varlistentry>
- <varlistentry xml:id="ini.exif.decode-unicode-motorola">
- <term>
- <parameter>exif.decode_unicode_motorola</parameter>
- <type>string</type>
- </term>
- <listitem>
- <para>
- <literal>exif.decode_unicode_motorola</literal> defines
- the image internal characterset for Unicode encoded user
- comments if image is in motorola byte order (big-endian).
- This setting cannot be empty but you can specify a list
- of encodings supported by mbstring. The default is UCS-2BE.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry xml:id="ini.exif.decode-unicode-intel">
- <term>
- <parameter>exif.decode_unicode_intel</parameter>
- <type>string</type>
- </term>
- <listitem>
- <para>
- <literal>exif.decode_unicode_intel</literal> defines
- the image internal characterset for Unicode encoded user
- comments if image is in intel byte order (little-endian).
- This setting cannot be empty but you can specify a list
- of encodings supported by mbstring. The default is UCS-2LE.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry xml:id="ini.exif.encode-jis">
- <term>
- <parameter>exif.encode_jis</parameter>
- <type>string</type>
- </term>
- <listitem>
- <para>
- <literal>exif.encode_jis</literal> defines the
- characterset JIS user comments are handled.
- This defaults to an empty value which forces
- the functions to use the current internal encoding
- of mbstring.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry xml:id="ini.exif.decode-jis-motorola">
- <term>
- <parameter>exif.decode_jis_motorola</parameter>
- <type>string</type>
- </term>
- <listitem>
- <para>
- <literal>exif.decode_jis_motorola</literal> defines
- the image internal characterset for JIS encoded user
- comments if image is in motorola byte order (big-endian).
- This setting cannot be empty but you can specify a list
- of encodings supported by mbstring. The default is JIS.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry xml:id="ini.exif.decode-jis-intel">
- <term>
- <parameter>exif.decode_jis_intel</parameter>
- <type>string</type>
- </term>
- <listitem>
- <para>
- <literal>exif.decode_jis_intel</literal> defines
- the image internal characterset for JIS encoded user
- comments if image is in intel byte order (little-endian).
- This setting cannot be empty but you can specify a list
- of encodings supported by mbstring. The default is JIS.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry xml:id="ini.exif.decode-unicode-intel">
+ <term>
+ <parameter>exif.decode_unicode_intel</parameter>
+ <type>string</type>
+ </term>
+ <listitem>
+ <para>
+ <literal>exif.decode_unicode_intel</literal> defines
+ the image internal characterset for Unicode encoded user
+ comments if image is in intel byte order (little-endian).
+ This setting cannot be empty but you can specify a list
+ of encodings supported by mbstring. The default is UCS-2LE.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry xml:id="ini.exif.encode-jis">
+ <term>
+ <parameter>exif.encode_jis</parameter>
+ <type>string</type>
+ </term>
+ <listitem>
+ <para>
+ <literal>exif.encode_jis</literal> defines the
+ characterset JIS user comments are handled.
+ This defaults to an empty value which forces
+ the functions to use the current internal encoding
+ of mbstring.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry xml:id="ini.exif.decode-jis-motorola">
+ <term>
+ <parameter>exif.decode_jis_motorola</parameter>
+ <type>string</type>
+ </term>
+ <listitem>
+ <para>
+ <literal>exif.decode_jis_motorola</literal> defines
+ the image internal characterset for JIS encoded user
+ comments if image is in motorola byte order (big-endian).
+ This setting cannot be empty but you can specify a list
+ of encodings supported by mbstring. The default is JIS.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry xml:id="ini.exif.decode-jis-intel">
+ <term>
+ <parameter>exif.decode_jis_intel</parameter>
+ <type>string</type>
+ </term>
+ <listitem>
+ <para>
+ <literal>exif.decode_jis_intel</literal> defines
+ the image internal characterset for JIS encoded user
+ comments if image is in intel byte order (little-endian).
+ This setting cannot be empty but you can specify a list
+ of encodings supported by mbstring. The default is JIS.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</section>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml