diff --git a/reference/exif/book.xml b/reference/exif/book.xml index 98b33a4c55..08cf95663e 100644 --- a/reference/exif/book.xml +++ b/reference/exif/book.xml @@ -1,7 +1,6 @@ - - + Exchangeable image information Exif @@ -9,22 +8,21 @@ &reftitle.intro; - + With the exif extension you are able to work with image meta data. For - example, you may use exif functions to read meta data of pictures taken - from digital cameras by working with information stored in the headers. - These are commonly found in JPEG and + example, you may use exif functions to read meta data of pictures taken + from digital cameras by working with information stored in the headers. + These are commonly found in JPEG and TIFF images. - + - + &reference.exif.setup; &reference.exif.constants; &reference.exif.reference; - - diff --git a/reference/exif/configure.xml b/reference/exif/configure.xml index 6617593e98..77bcd4b843 100644 --- a/reference/exif/configure.xml +++ b/reference/exif/configure.xml @@ -1,21 +1,19 @@ -
+
&reftitle.install; - - To enable exif-support configure PHP with + + To enable exif-support configure PHP with - - + + Windows users must enable both the php_mbstring.dll - and php_exif.dll DLL's in &php.ini;. The - php_mbstring.dll DLL must be loaded + and php_exif.dll DLL's in &php.ini;. The + php_mbstring.dll DLL must be loaded before the php_exif.dll DLL so adjust your &php.ini; accordingly. - +
- - - + diff --git a/reference/exif/functions/exif-read-data.xml b/reference/exif/functions/exif-read-data.xml index 93d83a0088..6cdc3e7dbd 100644 --- a/reference/exif/functions/exif-read-data.xml +++ b/reference/exif/functions/exif-read-data.xml @@ -15,24 +15,24 @@ boolas_arrays&false; boolread_thumbnail&false; - + exif_read_data reads the EXIF headers from an image file. This way you can read meta data generated by digital cameras. - - + + EXIF headers tend to be present in JPEG/TIFF images generated by digital cameras, but unfortunately each digital camera maker has a different idea of how to actually tag their images, so you can't always rely on a specific Exif header being present. - - + + Height and Width are computed the same way getimagesize does so their values must not be part of any header returned. Also, html is a height/width text string to be used inside normal HTML. - - + + When an Exif header contains a Copyright note, this itself can contain two values. As the solution is inconsistent in the Exif 2.10 standard, the COMPUTED section will return both entries @@ -43,8 +43,8 @@ of Exif). The COMPUTED will also contain the entry Copyright which is either the original copyright string, or a comma separated list of the photo and editor copyright. - - + + The tag UserComment has the same problem as the Copyright tag. It can store two values. First the encoding used, and second the value itself. If so the IFD section only contains the encoding @@ -53,11 +53,11 @@ UserComment. The entry UserComment is available in both cases so it should be used in preference to the value in IFD0 section. - - + + exif_read_data also validates EXIF data tags according to the EXIF specification (&url.exifspec;, page 20). - + &reftitle.parameters; @@ -65,11 +65,11 @@ file - + 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 resource. - + @@ -136,43 +136,43 @@ as_arrays - + Specifies whether or not each section becomes an array. The required_sections COMPUTED, THUMBNAIL, and COMMENT always become arrays as they may contain values whose names conflict with other sections. - + read_thumbnail - + When set to &true; the thumbnail itself is read. Otherwise, only the tagged data is read. - + &reftitle.returnvalues; - + It returns an associative array 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, exif_read_data will return &false;. - + &reftitle.errors; - + Errors of level E_WARNING and/or E_NOTICE may be raised for unsupported tags or other potential error conditions, but the function still tries to read all comprehensible information. - + @@ -245,9 +245,9 @@ foreach ($exif as $key => $section) { ?> ]]> - + The first call fails because the image has no header information. - + &example.outputs.similar; &reftitle.notes; - + If mbstring is enabled, exif will attempt to process the unicode and pick a charset as specified by exif.decode_unicode_motorola and @@ -341,13 +341,13 @@ EXIF Headers: 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 exif_read_data. - + - + If the file 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. - + diff --git a/reference/exif/functions/exif-tagname.xml b/reference/exif/functions/exif-tagname.xml index f830ed7371..3f5af3b78a 100644 --- a/reference/exif/functions/exif-tagname.xml +++ b/reference/exif/functions/exif-tagname.xml @@ -18,19 +18,19 @@ index - + The Tag ID for which a Tag Name will be looked up. - + &reftitle.returnvalues; - + Returns the header name, or &false; if index is not a defined EXIF tag id. - + &reftitle.examples; diff --git a/reference/exif/functions/exif-thumbnail.xml b/reference/exif/functions/exif-thumbnail.xml index da1d8cb0d6..f942d30806 100644 --- a/reference/exif/functions/exif-thumbnail.xml +++ b/reference/exif/functions/exif-thumbnail.xml @@ -15,19 +15,19 @@ intheight&null; intimage_type&null; - + exif_thumbnail reads the embedded thumbnail of an image. - - + + If you want to deliver thumbnails through this function, you should send the mimetype information using the header function. - - + + It is possible that exif_thumbnail cannot create an image but can determine its size. In this case, the return value is &false; but width and height are set. - + &reftitle.parameters; @@ -35,45 +35,45 @@ file - + The location of the image file. This can either be a path to the file or a stream resource. - + width - + The return width of the returned thumbnail. - + height - + The returned height of the returned thumbnail. - + image_type - + The returned image type of the returned thumbnail. This is either TIFF or JPEG. - + &reftitle.returnvalues; - + Returns the embedded thumbnail, or &false; if the image contains no thumbnail. - + @@ -125,10 +125,10 @@ if ($image!==false) { &reftitle.notes; - + If the file 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. - + diff --git a/reference/exif/ini.xml b/reference/exif/ini.xml index fbcdbb06f8..86f0452571 100644 --- a/reference/exif/ini.xml +++ b/reference/exif/ini.xml @@ -74,7 +74,7 @@ string - + exif.encode_unicode defines the characterset UNICODE user comments are handled. This defaults to ISO-8859-15 which should work for @@ -82,7 +82,7 @@ or must be an encoding supported by mbstring. If it is empty the current internal encoding of mbstring is used. - + @@ -91,13 +91,13 @@ string - + exif.decode_unicode_motorola 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. - + @@ -106,13 +106,13 @@ string - + exif.decode_unicode_intel 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. - + @@ -121,13 +121,13 @@ string - + exif.encode_jis 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. - + @@ -136,13 +136,13 @@ string - + exif.decode_jis_motorola 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. - + @@ -151,13 +151,13 @@ string - + exif.decode_jis_intel 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. - + diff --git a/reference/exif/setup.xml b/reference/exif/setup.xml index 2ba5c0be49..babecceb3b 100644 --- a/reference/exif/setup.xml +++ b/reference/exif/setup.xml @@ -1,18 +1,17 @@ - - + &reftitle.setup;
&reftitle.required; - + Your PHP must be compiled in with --enable-exif. To enable multibyte support in EXIF tags, the mbstring extension must be enabled by compiling PHP with --enable-mbstring. PHP does not require any additional library for the exif module. - +
@@ -25,7 +24,6 @@ - -