From 2318c33673f2f1b39756de97971501e7dec54d2e Mon Sep 17 00:00:00 2001
From: Philip Olson <philip@php.net>
Date: Mon, 21 Feb 2005 20:59:54 +0000
Subject: [PATCH] Document that jpeg and wbmp support requires GD-1.8 or later.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@180390 c90b9560-bf6c-de11-be94-00142212c4b1
---
 language-snippets.ent                             |  7 ++++++-
 reference/image/functions/imagecreatefromjpeg.xml |  3 ++-
 reference/image/functions/imagecreatefromwbmp.xml |  9 ++-------
 reference/image/functions/imagejpeg.xml           | 11 ++++-------
 reference/image/functions/jpeg2wbmp.xml           | 14 +++++---------
 reference/image/functions/png2wbmp.xml            | 11 ++---------
 6 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/language-snippets.ent b/language-snippets.ent
index 7ada01c01f..0855822781 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -186,12 +186,17 @@ function.</simpara></warning>'>
 if PHP is compiled using <option role="configure">--with-t1lib[=DIR]</option>.
 </simpara></note>'>
 
+<!ENTITY note.config.jpeg '<note><simpara>JPEG support is only available if 
+PHP was compiled against GD-1.8 or later.</simpara></note>'>
+
+<!ENTITY note.config.wbmp '<note><simpara>WBMP support is only available if 
+PHP was compiled against GD-1.8 or later.</simpara></note>'>
+
 <!ENTITY note.bundled.gd '<note><simpara>This function is only available if
 PHP is compiled with the bundled version of the GD library.</simpara></note>'>
 
 <!ENTITY note.gd.2 '<note><simpara>This function requires GD 2.0.1 or later.</simpara></note>'>
 
-
 <!-- DomXml Notes -->
 <!ENTITY node.inserted 'This node will not show up in the document unless it
 is inserted with e.g. <function>domnode_append_child</function>.'>
diff --git a/reference/image/functions/imagecreatefromjpeg.xml b/reference/image/functions/imagecreatefromjpeg.xml
index d9ab2f2a08..b7f3ae90eb 100644
--- a/reference/image/functions/imagecreatefromjpeg.xml
+++ b/reference/image/functions/imagecreatefromjpeg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.4 -->
   <refentry id="function.imagecreatefromjpeg">
    <refnamediv>
@@ -47,6 +47,7 @@ function LoadJpeg($imgname)
       </programlisting>
      </example>
     </para>
+    &note.config.jpeg;
     &tip.fopen-wrapper;
     &warn.no-win32-fopen-wrapper;
    </refsect1>
diff --git a/reference/image/functions/imagecreatefromwbmp.xml b/reference/image/functions/imagecreatefromwbmp.xml
index e65745754f..ac98d4fdf6 100644
--- a/reference/image/functions/imagecreatefromwbmp.xml
+++ b/reference/image/functions/imagecreatefromwbmp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.30 -->
   <refentry id="function.imagecreatefromwbmp">
    <refnamediv>
@@ -47,12 +47,7 @@ function LoadWBMP($imgname)
       </programlisting>
      </example>
     </para>
-    <note>
-     <para>
-      WBMP support is only available if PHP was compiled
-      against GD-1.8 or later.
-     </para>
-    </note>
+    &note.config.wbmp;
     &tip.fopen-wrapper;
     &warn.no-win32-fopen-wrapper;
    </refsect1>
diff --git a/reference/image/functions/imagejpeg.xml b/reference/image/functions/imagejpeg.xml
index 7352ed1818..f29dd0330f 100644
--- a/reference/image/functions/imagejpeg.xml
+++ b/reference/image/functions/imagejpeg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.30 -->
   <refentry id="function.imagejpeg">
    <refnamediv>
@@ -28,12 +28,9 @@
      <function>header</function>, you can create a PHP script that
      outputs JPEG images directly.
     </para>
-    <note>
-     <para>
-      JPEG support is only available if PHP was compiled
-      against GD-1.8 or later.
-     </para>
-    </note>
+    
+    &note.config.jpeg;
+    
     <para>
      <parameter>quality</parameter> is optional, and ranges from
      0 (worst quality, smaller file) to 100 (best quality, biggest file).
diff --git a/reference/image/functions/jpeg2wbmp.xml b/reference/image/functions/jpeg2wbmp.xml
index 9b60c9d02e..9bab28dd72 100644
--- a/reference/image/functions/jpeg2wbmp.xml
+++ b/reference/image/functions/jpeg2wbmp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.61 -->
   <refentry id="function.jpeg2wbmp">
    <refnamediv>
@@ -23,14 +23,10 @@
      <parameter>d_width</parameter> you specify the height
      and width of the destination image.
     </para>
-    <para>
-     <note>
-      <para>
-       WBMP support is only available if PHP was compiled
-       against GD-1.8 or later.
-      </para>
-     </note>
-    </para>
+
+    &note.config.jpeg;
+    &note.config.wbmp;
+
     <para>
      See also <function>png2wbmp</function>.
     </para>
diff --git a/reference/image/functions/png2wbmp.xml b/reference/image/functions/png2wbmp.xml
index 4213be8e86..8eccfd4481 100644
--- a/reference/image/functions/png2wbmp.xml
+++ b/reference/image/functions/png2wbmp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.13 -->
   <refentry id="function.png2wbmp">
    <refnamediv>
@@ -23,14 +23,7 @@
      <parameter>d_width</parameter> you specify the height
      and width of the destination image.
     </para>
-    <para>
-     <note>
-      <para>
-       WBMP support is only available if PHP was compiled
-       against GD-1.8 or later.
-      </para>
-     </note>
-    </para>
+    &note.config.wbmp;
     <para>
      See also <function>jpeg2wbmp</function>.
     </para>