mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-15 12:54:57 +08:00
Code Issues Packages Projects Releases Wiki Activity
14d62c7b62
php-src/ext/exif/exif.c

3297 lines
104 KiB
C
Raw Normal View History

@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
/*
+----------------------------------------------------------------------+
Fix headers.
2002-02-28 14:26:50 +08:00
| PHP Version 4 |
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
+----------------------------------------------------------------------+
Fix headers.
2002-02-28 14:26:50 +08:00
| Copyright (c) 1997-2002 The PHP Group |
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
+----------------------------------------------------------------------+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Rasmus Lerdorf <rasmus@php.net> |
+Added UNICODE support for Comments +Added Description,Artist +Added missing memory deallocation +Corrected error with multiple comments +Corrected handling of ExifVersion, Tag has 4 ASCII characters *WITHOUT* NUL +Corrected handling of Thumbnailsize if current source detects size < 0 +Changed all fields to char* that do not have a maximum length in EXIF standard +Undocumented second Parameter ReadAll frees memory to early -> moved to third position default changed to false -> faster +New second Parameter [true|false] to specify whether or not to to read thumbnails -> reading is timeconsumpting suppose default should be false -> done so
2002-02-28 09:16:27 +08:00
| Marcus Boerger <helly@php.net> |
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
+----------------------------------------------------------------------+
*/
+Added UNICODE support for Comments +Added Description,Artist +Added missing memory deallocation +Corrected error with multiple comments +Corrected handling of ExifVersion, Tag has 4 ASCII characters *WITHOUT* NUL +Corrected handling of Thumbnailsize if current source detects size < 0 +Changed all fields to char* that do not have a maximum length in EXIF standard +Undocumented second Parameter ReadAll frees memory to early -> moved to third position default changed to false -> faster +New second Parameter [true|false] to specify whether or not to to read thumbnails -> reading is timeconsumpting suppose default should be false -> done so
2002-02-28 09:16:27 +08:00
/* $Id$ */
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* ToDos
*
* JIS encoding for comments
* See if example images from http://www.exif.org have illegal
* thumbnail sizes or if code is corrupt.
* Create/Update exif headers.
* Create/Remove/Update image thumbnails.
*/
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* Security
*
* At current time i do not see any security problems but a potential
* attacker could generate an image with recursive ifd pointers...(Marcus)
*/
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* Fragments of the code in this module were borrowed from the public domain
* jhead.c package with the author's consent.
*
* The original header from the jhead.c file was:
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
*
* --------------------------------------------------------------------------
* Program to pull the information out of various types of EFIF digital
* camera files and show it in a reasonably consistent way
*
* Version 0.9
*
* Compiles with MSVC on Windows, or with GCC on Linux
*
* Compileing under linux: Must include math library.
* Use: cc -lm -O3 -o jhead jhead.c
*
* Matthias Wandel, Dec 1999 - April 2000
* --------------------------------------------------------------------------
*/
* include "config.h" if HAVE_CONFIG_H is defined (for standalone dso build)
2001-05-24 18:07:29 +08:00
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
#include "php.h"
-streams are no longer an option
2002-03-18 13:32:25 +08:00
#include "ext/standard/file.h"
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
- Nuke COMPILE_DL. Modules that need to be compiled as dll's in Windows - need to define both COMPILE_DL_MODULE and HAVE_MODULE=1
2000-06-10 16:48:01 +08:00
#if HAVE_EXIF
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
- disabled debug information - added missing width/height from primary ifd for TIFF
2002-03-05 01:09:24 +08:00
/* When EXIF_DEBUG is defined the module generates a lot of debug messages
* that help understanding what is going on. This can and should be used
* while extending the module as it shows if you are at the right position.
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
* You are always considered to have a copy of TIFF6.0 and EXIF2.10 standard.
- disabled debug information - added missing width/height from primary ifd for TIFF
2002-03-05 01:09:24 +08:00
*/
-disabling debug #Wez: i have an error when closing the original file after stream copy...
2002-03-17 04:25:51 +08:00
#undef EXIF_DEBUG
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
#include "php_exif.h"
#include <math.h>
#include "php_ini.h"
#include "ext/standard/php_string.h"
-addition to last change: php_image.h must be included now
2002-03-04 17:29:06 +08:00
#include "ext/standard/php_image.h"
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
#include "ext/standard/info.h"
typedef unsigned char uchar;
#ifndef TRUE
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
#define TRUE 1
#define FALSE 0
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
#endif
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#ifndef max
#define max(a,b) ((a)>(b) ? (a) : (b))
#endif
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* {{{ exif_functions[]
*/
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
function_entry exif_functions[] = {
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
PHP_FE(exif_read_data, NULL)
PHP_FALIAS(read_exif_data, exif_read_data, NULL)
PHP_FE(exif_tagname, NULL)
PHP_FE(exif_thumbnail, NULL)
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
PHP_FE(exif_imagetype, NULL)
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
{NULL, NULL, NULL}
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
};
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#define EXIF_VERSION "1.3 $Id$"
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
PHP_MINFO_FUNCTION(exif);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* {{{ PHP_MINFO_FUNCTION
*/
PHP_MINFO_FUNCTION(exif)
{
php_info_print_table_start();
php_info_print_table_row(2, "EXIF Support", "enabled" );
php_info_print_table_row(2, "EXIF Version", EXIF_VERSION );
php_info_print_table_row(2, "Supported EXIF Version", "02100");
php_info_print_table_row(2, "Supported filetypes", "JPEG,TIFF");
php_info_print_table_end();
}
/* }}} */
/* {{{ PHP_MINIT_FUNCTION(exif)
Get the size of an image as 4-element array */
PHP_MINIT_FUNCTION(exif)
{
REGISTER_LONG_CONSTANT("IMAGETYPE_GIF", IMAGE_FILETYPE_GIF, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_JPEG", IMAGE_FILETYPE_JPEG, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_PNG", IMAGE_FILETYPE_PNG, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_SWF", IMAGE_FILETYPE_SWF, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_PSD", IMAGE_FILETYPE_PSD, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_BMP", IMAGE_FILETYPE_BMP, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_TIFF_II", IMAGE_FILETYPE_TIFF_II, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_TIFF_MM", IMAGE_FILETYPE_TIFF_MM, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_JPC", IMAGE_FILETYPE_JPC, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT);
-usability -tests
2002-03-13 00:43:29 +08:00
REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_CS | CONST_PERSISTENT);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
return SUCCESS;
}
/* }}} */
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* {{{ exif_module_entry
*/
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
zend_module_entry exif_module_entry = {
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
#if ZEND_MODULE_API_NO >= 20010901
STANDARD_MODULE_HEADER,
#endif
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
"exif",
exif_functions,
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
ZEND_MODULE_STARTUP_N(exif), NULL,
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
NULL, NULL,
PHP_MINFO(exif),
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
EXIF_VERSION,
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
STANDARD_MODULE_PROPERTIES
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
};
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
#ifdef COMPILE_DL_EXIF
ZEND_GET_MODULE(exif)
#endif
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
/* {{{ php_strnlen
* get length of string if buffer if less than buffer size or buffer size */
static size_t php_strnlen( char* str, size_t maxlen) {
size_t len = 0;
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
if ( str && maxlen && *str) {
do {
len++;
} while ( --maxlen && *(++str));
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
return len;
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
-support for out of section data
2002-03-09 04:56:44 +08:00
/* {{{ error messages
*/
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
static const char * EXIF_ERROR_EALLOC = "Cannot allocate memory for all data";
static const char * EXIF_ERROR_FILEEOF = "Unexpected end of file reached";
static const char * EXIF_ERROR_CORRUPT = "File structure corrupted";
static const char * EXIF_ERROR_THUMBEOF = "Thumbnail goes IFD boundary or end of file reached";
-support for out of section data
2002-03-09 04:56:44 +08:00
#define EXIF_ERRLOG_EALLOC php_error(E_ERROR,EXIF_ERROR_EALLOC);
#define EXIF_ERRLOG_FILEEOF php_error(E_WARNING,EXIF_ERROR_FILEEOF);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#define EXIF_ERRLOG_CORRUPT php_error(E_WARNING,EXIF_ERROR_CORRUPT);
#define EXIF_ERRLOG_THUMBEOF php_error(E_WARNING,EXIF_ERROR_THUMBEOF);
-support for out of section data
2002-03-09 04:56:44 +08:00
/* }}} */
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* {{{ format description defines
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
Describes format descriptor
*/
- disabled debug information - added missing width/height from primary ifd for TIFF
2002-03-05 01:09:24 +08:00
static int php_tiff_bytes_per_format[] = {0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8};
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
#define NUM_FORMATS 12
- Read IsColor for TIFF
2002-03-05 07:19:27 +08:00
#define TAG_FMT_BYTE 1
#define TAG_FMT_STRING 2
#define TAG_FMT_USHORT 3
#define TAG_FMT_ULONG 4
#define TAG_FMT_URATIONAL 5
#define TAG_FMT_SBYTE 6
#define TAG_FMT_UNDEFINED 7
#define TAG_FMT_SSHORT 8
#define TAG_FMT_SLONG 9
#define TAG_FMT_SRATIONAL 10
#define TAG_FMT_SINGLE 11
#define TAG_FMT_DOUBLE 12
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#ifdef EXIF_DEBUG
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
static char *exif_get_tagformat(int format)
{
switch(format) {
case TAG_FMT_BYTE: return "BYTE";
case TAG_FMT_STRING: return "STRING";
case TAG_FMT_USHORT: return "USHORT";
case TAG_FMT_ULONG: return "ULONG";
case TAG_FMT_URATIONAL: return "URATIONAL";
case TAG_FMT_SBYTE: return "SBYTE";
case TAG_FMT_UNDEFINED: return "UNDEFINED";
case TAG_FMT_SSHORT: return "SSHORT";
case TAG_FMT_SLONG: return "SLONG";
case TAG_FMT_SRATIONAL: return "SRATIONAL";
case TAG_FMT_SINGLE: return "SINGLE";
case TAG_FMT_DOUBLE: return "DOUBLE";
}
return "*Illegal";
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#endif
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
/* Describes tag values */
#define TAG_TIFF_COMMENT 0x00FE /* SHOUDLNT HAPPEN */
#define TAG_NEW_SUBFILE 0x00FE /* New version of subfile tag */
#define TAG_SUBFILE_TYPE 0x00FF /* Old version of subfile tag */
#define TAG_IMAGEWIDTH 0x0100
#define TAG_IMAGEHEIGHT 0x0101
#define TAG_BITS_PER_SAMPLE 0x0102
#define TAG_COMPRESSION 0x0103
#define TAG_PHOTOMETRIC_INTERPRETATION 0x0106
#define TAG_TRESHHOLDING 0x0107
#define TAG_CELL_WIDTH 0x0108
#define TAG_CELL_HEIGHT 0x0109
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
#define TAG_STRIP_OFFSETS 0x0111
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
#define TAG_FILL_ORDER 0x010A
#define TAG_DOCUMENT_NAME 0x010D
#define TAG_IMAGE_DESCRIPTION 0x010E
#define TAG_MAKE 0x010F
#define TAG_MODEL 0x0110
#define TAG_STRIP_OFFSETS 0x0111
#define TAG_ORIENTATION 0x0112
#define TAG_SAMPLES_PER_PIXEL 0x0115
#define TAG_ROWS_PER_STRIP 0x0116
#define TAG_STRIP_BYTE_COUNTS 0x0117
#define TAG_MIN_SAMPPLE_VALUE 0x0118
#define TAG_MAX_SAMPLE_VALUE 0x0119
#define TAG_X_RESOLUTION 0x011A
#define TAG_Y_RESOLUTION 0x011B
#define TAG_PLANAR_CONFIGURATION 0x011C
#define TAG_PAGE_NAME 0x011D
#define TAG_X_POSITION 0x011E
#define TAG_Y_POSITION 0x011F
#define TAG_FREE_OFFSETS 0x0120
#define TAG_FREE_BYTE_COUNTS 0x0121
#define TAG_GRAY_RESPONSE_UNIT 0x0122
#define TAG_GRAY_RESPONSE_CURVE 0x0123
#define TAG_RESOLUTION_UNIT 0x0128
#define TAG_PAGE_NUMBER 0x0129
#define TAG_TRANSFER_FUNCTION 0x012D
#define TAG_SOFTWARE 0x0131
#define TAG_DATETIME 0x0132
#define TAG_ARTIST 0x013B
#define TAG_HOST_COMPUTER 0x013C
#define TAG_PREDICATOR 0x013D
#define TAG_WHITE_POINT 0x013E
#define TAG_PRIMARY_CHROMATICITIES 0x013F
#define TAG_COLOR_MAP 0x0140
#define TAG_HALFTONE_HINTS 0x0141
#define TAG_TILE_WIDTH 0x0142
#define TAG_TILE_LENGTH 0x0143
#define TAG_TILE_OFFSETS 0x0144
#define TAG_TILE_BYTE_COUNTS 0x0145
#define TAG_INK_SETMPUTER 0x014C
#define TAG_NUMBER_OF_INKS 0x014E
#define TAG_INK_NAMES 0x014D
#define TAG_DOT_RANGE 0x0150
#define TAG_TARGET_PRINTER 0x0151
#define TAG_EXTRA_SAMPLE 0x0152
#define TAG_SAMPLE_FORMAT 0x0153
#define TAG_S_MIN_SAMPLE_VALUE 0x0154
#define TAG_S_MAX_SAMPLE_VALUE 0x0155
#define TAG_TRANSFER_RANGE 0x0156
#define TAG_JPEG_PROC 0x0200
#define TAG_JPEG_INTERCHANGE_FORMAT 0x0201
#define TAG_JPEG_INTERCHANGE_FORMAT_LEN 0x0202
#define TAG_JPEG_RESTART_INTERVAL 0x0203
#define TAG_JPEG_LOSSLESS_PREDICTOR 0x0205
#define TAG_JPEG_POINT_TRANSFORMS 0x0206
#define TAG_JPEG_Q_TABLES 0x0207
#define TAG_JPEG_DC_TABLES 0x0208
#define TAG_JPEG_AC_TABLES 0x0209
#define TAG_YCC_COEFFICIENTS 0x0211
#define TAG_YCC_SUB_SAMPLING 0x0212
#define TAG_YCC_POSITIONING 0x0213
#define TAG_REFERENCE_BLACK_WHITE 0x0214
#define TAG_COPYRIGHT 0x8298
#define TAG_EXPOSURETIME 0x829A
#define TAG_FNUMBER 0x829D
#define TAG_EXIF_IFD_POINTER 0x8769
#define TAG_GPS_IFD_POINTER 0x8825
#define TAG_ISOSPEED 0x8827
#define TAG_EXIFVERSION 0x9000
#define TAG_SHUTTERSPEED 0x9201
#define TAG_APERTURE 0x9202
#define TAG_DATETIME_ORIGINAL 0x9003
#define TAG_MAXAPERTURE 0x9205
#define TAG_SUBJECT_DISTANCE 0x9206
#define TAG_LIGHT_SOURCE 0x9208
#define TAG_FLASH 0x9209
#define TAG_FOCALLENGTH 0x920A
#define TAG_MARKER_NOTE 0x927C
#define TAG_USERCOMMENT 0x9286
#define TAG_FLASH_PIX_VERSION 0xA000
#define TAG_COLOR_SPACE 0xA001
#define TAG_COMP_IMAGEWIDTH 0xA002 /* compressed images only */
#define TAG_COMP_IMAGEHEIGHT 0xA003
#define TAG_INTEROP_IFD_POINTER 0xA005 /* IFD pointer */
#define TAG_FOCALPLANEXRES 0xA20E
#define TAG_FOCALPLANEUNITS 0xA210
Clean up EXIF code and give up on extracting the embedded thumbnail for now. Will return to it when I find some real specs on it. Also added a couple of missing copyright headers
2000-05-30 00:34:19 +08:00
Add Olympus-specific tags to read_exif_data() @ Add Olympus-specific tags to read_exif_data() (Rasmus)
2000-08-02 06:05:15 +08:00
/* Olympus specific tags */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
#define TAG_OLYMPUS_SPECIALMODE 0x0200
#define TAG_OLYMPUS_JPEGQUAL 0x0201
#define TAG_OLYMPUS_MACRO 0x0202
#define TAG_OLYMPUS_DIGIZOOM 0x0204
#define TAG_OLYMPUS_SOFTWARERELEASE 0x0207
#define TAG_OLYMPUS_PICTINFO 0x0208
#define TAG_OLYMPUS_CAMERAID 0x0209
Add Olympus-specific tags to read_exif_data() @ Add Olympus-specific tags to read_exif_data() (Rasmus)
2000-08-02 06:05:15 +08:00
/* end Olympus specific tags */
Clean up EXIF code and give up on extracting the embedded thumbnail for now. Will return to it when I find some real specs on it. Also added a couple of missing copyright headers
2000-05-30 00:34:19 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* Internal */
#define TAG_NONE -1 /* note that -1 <> 0xFFFF */
#define TAG_COMPUTED_VALUE -2
- Read IsColor for TIFF
2002-03-05 07:19:27 +08:00
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
/* Values for TAG_PHOTOMETRIC_INTERPRETATION */
- Read IsColor for TIFF
2002-03-05 07:19:27 +08:00
#define PMI_BLACK_IS_ZERO 0
#define PMI_WHITE_IS_ZERO 1
#define PMI_RGB 2
#define PMI_PALETTE_COLOR 3
#define PMI_TRANSPARENCY_MASK 4
#define PMI_SEPARATED 5
#define PMI_YCBCR 6
#define PMI_CIELAB 8
+Added UNICODE support for Comments +Added Description,Artist +Added missing memory deallocation +Corrected error with multiple comments +Corrected handling of ExifVersion, Tag has 4 ASCII characters *WITHOUT* NUL +Corrected handling of Thumbnailsize if current source detects size < 0 +Changed all fields to char* that do not have a maximum length in EXIF standard +Undocumented second Parameter ReadAll frees memory to early -> moved to third position default changed to false -> faster +New second Parameter [true|false] to specify whether or not to to read thumbnails -> reading is timeconsumpting suppose default should be false -> done so
2002-02-28 09:16:27 +08:00
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* {{{ TabTable[]
*/
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
static const struct {
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
unsigned short Tag;
char *Desc;
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
} TagTable[] = {
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{ 0x00FE, "NewSubFile"},
{ 0x00FF, "SubFile"},
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{ 0x0100, "ImageWidth"},
{ 0x0101, "ImageLength"},
{ 0x0102, "BitsPerSample"},
{ 0x0103, "Compression"},
{ 0x0106, "PhotometricInterpretation"},
{ 0x010A, "FillOrder"},
{ 0x010D, "DocumentName"},
{ 0x010E, "ImageDescription"},
{ 0x010F, "Make"},
{ 0x0110, "Model"},
{ 0x0111, "StripOffsets"},
{ 0x0112, "Orientation"},
{ 0x0115, "SamplesPerPixel"},
{ 0x0116, "RowsPerStrip"},
{ 0x0117, "StripByteCounts"},
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{ 0x0118, "MinSampleValue"},
{ 0x0119, "MaxSampleValue"},
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{ 0x011A, "XResolution"},
{ 0x011B, "YResolution"},
{ 0x011C, "PlanarConfiguration"},
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{ 0x011D, "PageName"},
{ 0x011E, "XPosition"},
{ 0x011F, "YPosition"},
{ 0x0120, "FreeOffsets"},
{ 0x0121, "FreeByteCounts"},
{ 0x0122, "GrayResponseUnit"},
{ 0x0123, "GrayResponseCurve"},
{ 0x0124, "T4Options"},
{ 0x0125, "T6Options"},
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{ 0x0128, "ResolutionUnit"},
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{ 0x0129, "PageNumber"},
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{ 0x012D, "TransferFunction"},
{ 0x0131, "Software"},
{ 0x0132, "DateTime"},
{ 0x013B, "Artist"},
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{ 0x013C, "HostComputer"},
{ 0x013D, "Predictor"},
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{ 0x013E, "WhitePoint"},
{ 0x013F, "PrimaryChromaticities"},
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{ 0x0140, "ColorMap"},
{ 0x0141, "HalfToneHints"},
{ 0x0142, "TileWidth"},
{ 0x0143, "TileLength"},
{ 0x0144, "TileOffsets"},
{ 0x0145, "TileByteCounts"},
{ 0x014C, "InkSet"},
{ 0x014D, "InkNames"},
{ 0x014E, "NumberOfInks"},
{ 0x0150, "DotRange"},
{ 0x0151, "TargetPrinter"},
{ 0x0152, "ExtraSample"},
{ 0x0153, "SampleFormat"},
{ 0x0154, "SMinSampleValue"},
{ 0x0155, "SMaxSampleValue"},
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{ 0x0156, "TransferRange"},
{ 0x0200, "JPEGProc"},
{ 0x0201, "JPEGInterchangeFormat"},
{ 0x0202, "JPEGInterchangeFormatLength"},
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{ 0x0203, "JPEGRestartInterval"},
{ 0x0205, "JPEGLosslessPredictors"},
{ 0x0206, "JPEGPointTransforms"},
{ 0x0207, "JPEGQTables"},
{ 0x0208, "JPEGDCTables"},
{ 0x0209, "JPEGACTables"},
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{ 0x0211, "YCbCrCoefficients"},
{ 0x0212, "YCbCrSubSampling"},
{ 0x0213, "YCbCrPositioning"},
{ 0x0214, "ReferenceBlackWhite"},
Add Olympus-specific tags to read_exif_data() @ Add Olympus-specific tags to read_exif_data() (Rasmus)
2000-08-02 06:05:15 +08:00
{ 0x1000, "RelatedImageFileFormat"},
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
{ 0x828D, "CFARepeatPatternDim"},
{ 0x828E, "CFAPattern"},
{ 0x828F, "BatteryLevel"},
{ 0x8298, "Copyright"},
{ 0x829A, "ExposureTime"},
{ 0x829D, "FNumber"},
{ 0x83BB, "IPTC/NAA"},
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{ 0x8769, "Exif_IFD_Pointer"},
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
{ 0x8773, "InterColorProfile"},
{ 0x8822, "ExposureProgram"},
{ 0x8824, "SpectralSensitivity"},
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{ 0x8825, "GPS_IFD_Pointer"},
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
{ 0x8827, "ISOSpeedRatings"},
{ 0x8828, "OECF"},
{ 0x9000, "ExifVersion"},
{ 0x9003, "DateTimeOriginal"},
{ 0x9004, "DateTimeDigitized"},
{ 0x9101, "ComponentsConfiguration"},
{ 0x9102, "CompressedBitsPerPixel"},
{ 0x9201, "ShutterSpeedValue"},
{ 0x9202, "ApertureValue"},
{ 0x9203, "BrightnessValue"},
{ 0x9204, "ExposureBiasValue"},
{ 0x9205, "MaxApertureValue"},
{ 0x9206, "SubjectDistance"},
{ 0x9207, "MeteringMode"},
{ 0x9208, "LightSource"},
{ 0x9209, "Flash"},
{ 0x920A, "FocalLength"},
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{ 0x920B, "FlashEnergy"}, /* 0xA20B in JPEG */
{ 0x920C, "SpatialFrequencyResponse"}, /* 0xA20C - - */
{ 0x920E, "FocalPlaneXResolution"}, /* 0xA20E - - */
{ 0x920F, "FocalPlaneYResolution"}, /* 0xA20F - - */
{ 0x9210, "FocalPlaneResolutionUnit"}, /* 0xA210 - - */
{ 0x9214, "SubjectLocation"}, /* 0xA214 - - */
{ 0x9215, "ExposureIndex"}, /* 0xA215 - - */
{ 0x9217, "SensingMethod"}, /* 0xA217 - - */
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
{ 0x927C, "MakerNote"},
{ 0x9286, "UserComment"},
{ 0x9290, "SubSecTime"},
{ 0x9291, "SubSecTimeOriginal"},
{ 0x9292, "SubSecTimeDigitized"},
{ 0xA000, "FlashPixVersion"},
{ 0xA001, "ColorSpace"},
{ 0xA002, "ExifImageWidth"},
{ 0xA003, "ExifImageLength"},
{ 0xA005, "InteroperabilityOffset"},
{ 0xA20B, "FlashEnergy"}, /* 0x920B in TIFF/EP */
{ 0xA20C, "SpatialFrequencyResponse"}, /* 0x920C - - */
{ 0xA20E, "FocalPlaneXResolution"}, /* 0x920E - - */
{ 0xA20F, "FocalPlaneYResolution"}, /* 0x920F - - */
{ 0xA210, "FocalPlaneResolutionUnit"}, /* 0x9210 - - */
{ 0xA214, "SubjectLocation"}, /* 0x9214 - - */
{ 0xA215, "ExposureIndex"}, /* 0x9215 - - */
{ 0xA217, "SensingMethod"}, /* 0x9217 - - */
{ 0xA300, "FileSource"},
{ 0xA301, "SceneType"},
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
{TAG_NONE, "no tag value"},
{TAG_COMPUTED_VALUE, "computed value"},
{ 0, ""} /* Important for exif_get_tagname() IF value != "" functionresult is != false */
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
} ;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* }}} */
/* {{{ exif_get_tagname
Get headername for tag_num or NULL if not defined */
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
static char * exif_get_tagname(int tag_num, char *ret, int len)
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
{
int i,t;
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
char tmp[32];
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
for (i=0;;i++) {
if ( (t=TagTable[i].Tag) == tag_num || !t) {
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
if (ret && len) {
if ( !t) break;
strncpy(ret,TagTable[i].Desc,abs(len));
if ( len<0) {
len = -len;
ret[len-1]='\0';
for(i=strlen(ret);i<len;i++)ret[i]=' ';
}
ret[len-1]='\0';
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
return ret;
}
return TagTable[i].Desc;
}
}
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
if (ret && len) {
sprintf(tmp,"UndefinedTag:0x%04X", tag_num);
strncpy(ret,tmp,abs(len));
if ( len<0) {
len = -len;
ret[len-1]='\0';
for(i=strlen(ret);i<len;i++)ret[i]=' ';
}
ret[len-1]='\0';
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
return ret;
}
return "";
}
/* }}} */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* {{{ exif_char_dump
* Do not use! This is a debug function... */
#ifdef EXIF_DEBUG
static unsigned char* exif_char_dump( unsigned char * addr, int len, int hex)
{
static unsigned char buf[1024+1];
int c, i, p=0, n = hex ? 5 : 3;
for(i=0; i<len && p+n<=sizeof(buf); i++)
{
if ( i%64==0) buf[p++] = '\n';
c = *addr++;
if ( hex)
{
sprintf(buf+p,"%02X ",c);
p += 3;
} else {
if (c>=32)
{
buf[p++] = c;
} else {
buf[p++] = '?';
}
}
}
buf[sizeof(buf)-1]=0;
return buf;
}
#endif
/* }}} */
/* {{{ php_jpg_get16
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
Get 16 bits motorola order (always) for jpeg header stuff.
*/
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
static int php_jpg_get16(void *value)
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
{
return (((uchar *)value)[0] << 8) | ((uchar *)value)[1];
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
/* {{{ php_ifd_get16u
* Convert a 16 bit unsigned value from file's native byte order */
static int php_ifd_get16u(void *value, int motorola_intel)
{
if (motorola_intel) {
return (((uchar *)value)[0] << 8) | ((uchar *)value)[1];
} else {
return (((uchar *)value)[1] << 8) | ((uchar *)value)[0];
}
}
/* }}} */
/* {{{ php_ifd_get16s
* Convert a 16 bit signed value from file's native byte order */
static signed short php_ifd_get16s(void *value, int motorola_intel)
{
return (signed short)php_ifd_get16u(value, motorola_intel);
}
/* }}} */
/* {{{ php_ifd_get32s
* Convert a 32 bit signed value from file's native byte order */
static int php_ifd_get32s(void *value, int motorola_intel)
{
if (motorola_intel) {
return ((( char *)value)[0] << 24)
| (((uchar *)value)[1] << 16)
| (((uchar *)value)[2] << 8 )
| (((uchar *)value)[3] );
} else {
return ((( char *)value)[3] << 24)
| (((uchar *)value)[2] << 16)
| (((uchar *)value)[1] << 8 )
| (((uchar *)value)[0] );
}
}
/* }}} */
/* {{{ php_ifd_get32u
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
* Write 32 bit unsigned value to data */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
static unsigned php_ifd_get32u(void *value, int motorola_intel)
{
return (unsigned)php_ifd_get32s(value, motorola_intel) & 0xffffffff;
}
/* }}} */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* {{{ php_ifd_set16u
* Write 16 bit unsigned value to data */
static void php_ifd_set16u(char *data, unsigned int value, int motorola_intel)
{
if (motorola_intel) {
data[0] = (value & 0xFF00) >> 8;
data[1] = (value & 0x00FF);
} else {
data[1] = (value & 0xFF00) >> 8;
data[0] = (value & 0x00FF);
}
}
/* }}} */
/* {{{ php_ifd_set32u
* Convert a 32 bit unsigned value from file's native byte order */
static void php_ifd_set32u(char *data, size_t value, int motorola_intel)
{
if (motorola_intel) {
data[0] = (value & 0xFF000000) >> 24;
data[1] = (value & 0x00FF0000) >> 16;
data[2] = (value & 0x0000FF00) >> 8;
data[3] = (value & 0x000000FF);
} else {
data[3] = (value & 0xFF000000) >> 24;
data[2] = (value & 0x00FF0000) >> 16;
data[1] = (value & 0x0000FF00) >> 8;
data[0] = (value & 0x000000FF);
}
}
/* }}} */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
/* {{{ exif_convert_any_format
* Evaluate number, be it int, rational, or float from directory. */
static double exif_convert_any_format(void *value, int format, int motorola_intel)
{
int s_den;
unsigned u_den;
switch(format) {
case TAG_FMT_SBYTE: return *(signed char *)value;
case TAG_FMT_BYTE: return *(uchar *)value;
case TAG_FMT_USHORT: return php_ifd_get16u(value, motorola_intel);
case TAG_FMT_ULONG: return php_ifd_get32u(value, motorola_intel);
case TAG_FMT_URATIONAL:
u_den = php_ifd_get32u(4+(char *)value, motorola_intel);
if (u_den == 0) {
return 0;
} else {
return (double)php_ifd_get32u(value, motorola_intel) / u_den;
}
case TAG_FMT_SRATIONAL:
s_den = php_ifd_get32s(4+(char *)value, motorola_intel);
if (s_den == 0) {
return 0;
} else {
return (double)php_ifd_get32s(value, motorola_intel) / s_den;
}
case TAG_FMT_SSHORT: return (signed short)php_ifd_get16u(value, motorola_intel);
case TAG_FMT_SLONG: return php_ifd_get32s(value, motorola_intel);
/* Not sure if this is correct (never seen float used in Exif format) */
case TAG_FMT_SINGLE:
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
php_error(E_NOTICE, "Found value of type single");
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
return (double)*(float *)value;
case TAG_FMT_DOUBLE:
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
php_error(E_NOTICE, "Found value of type double");
return *(double *)value;
}
return 0;
}
/* }}} */
/* {{{ exif_convert_any_to_int
* Evaluate number, be it int, rational, or float from directory. */
static size_t exif_convert_any_to_int(void *value, int format, int motorola_intel)
{
int s_den;
unsigned u_den;
switch(format) {
case TAG_FMT_SBYTE: return *(signed char *)value;
case TAG_FMT_BYTE: return *(uchar *)value;
case TAG_FMT_USHORT: return php_ifd_get16u(value, motorola_intel);
case TAG_FMT_ULONG: return php_ifd_get32u(value, motorola_intel);
case TAG_FMT_URATIONAL:
u_den = php_ifd_get32u(4+(char *)value, motorola_intel);
if (u_den == 0) {
return 0;
} else {
return php_ifd_get32u(value, motorola_intel) / u_den;
}
case TAG_FMT_SRATIONAL:
s_den = php_ifd_get32s(4+(char *)value, motorola_intel);
if (s_den == 0) {
return 0;
} else {
return php_ifd_get32s(value, motorola_intel) / s_den;
}
case TAG_FMT_SSHORT: return php_ifd_get16u(value, motorola_intel);
case TAG_FMT_SLONG: return php_ifd_get32s(value, motorola_intel);
/* Not sure if this is correct (never seen float used in Exif format) */
case TAG_FMT_SINGLE:
php_error(E_NOTICE, "Found value of type single");
return *(float *)value;
case TAG_FMT_DOUBLE:
php_error(E_NOTICE, "Found value of type double");
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
return *(double *)value;
}
return 0;
}
/* }}} */
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* {{{ struct image_info_value, image_info_list
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
*/
#ifndef WORD
#define WORD short
#endif
#ifndef DWORD
#define DWORD int
#endif
typedef struct {
int num;
int den;
} signed_rational;
typedef struct {
unsigned int num;
unsigned int den;
} unsigned_rational;
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
typedef union _image_info_value {
char *s;
unsigned u;
int i;
float f;
double d;
signed_rational sr;
unsigned_rational ur;
union _image_info_value *list;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
} image_info_value;
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
typedef struct {
WORD tag;
WORD format;
DWORD length;
DWORD dummy; /* value ptr of tiff directory entry */
char *name;
image_info_value value;
} image_info_data;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
typedef struct {
int count;
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
image_info_data *list;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
} image_info_list;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* }}} */
/* {{{ exif_get_sectionname
Returns the name of a section
*/
#define SECTION_FILE 0
#define SECTION_COMPUTED 1
#define SECTION_ANY_TAG 2
#define SECTION_IFD0 3
#define SECTION_THUMBNAIL 4
#define SECTION_COMMENT 5
#define SECTION_APP0 6
#define SECTION_EXIF 7
#define SECTION_FPIX 8
#define SECTION_GPS 9
#define SECTION_INTEROP 10
#define SECTION_APP12 11
#define SECTION_COUNT 12
#define FOUND_FILE (1<<SECTION_FILE)
#define FOUND_COMPUTED (1<<SECTION_COMPUTED)
#define FOUND_ANY_TAG (1<<SECTION_ANY_TAG)
#define FOUND_IFD0 (1<<SECTION_IFD0)
#define FOUND_THUMBNAIL (1<<SECTION_THUMBNAIL)
#define FOUND_COMMENT (1<<SECTION_COMMENT)
#define FOUND_APP0 (1<<SECTION_APP0)
#define FOUND_EXIF (1<<SECTION_EXIF)
#define FOUND_FPIX (1<<SECTION_FPIX)
#define FOUND_GPS (1<<SECTION_GPS)
#define FOUND_INTEROP (1<<SECTION_INTEROP)
#define FOUND_APP12 (1<<SECTION_APP12)
static char *exif_get_sectionname(int section)
{
switch(section) {
case SECTION_FILE: return "FILE";
case SECTION_COMPUTED: return "COMPUTED";
case SECTION_ANY_TAG: return "ANY_TAG";
case SECTION_IFD0: return "IFD0";
case SECTION_THUMBNAIL: return "THUMBNAIL";
case SECTION_COMMENT: return "COMMENT";
case SECTION_APP0: return "APP0";
case SECTION_EXIF: return "EXIF";
case SECTION_FPIX: return "FPIX";
case SECTION_GPS: return "GPS";
case SECTION_INTEROP: return "INTEROP";
case SECTION_APP12: return "APP12";
}
return "";
}
/* }}} */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* {{{ exif_get_sectionlist
Return list of sectionnames specified by sectionlist. Return value must be freed
*/
static char *exif_get_sectionlist(int sectionlist)
{
int i,len=0;
char *sections;
for(i=0; i<SECTION_COUNT; i++) len += strlen(exif_get_sectionname(i))+2;
sections = emalloc(len+1);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
if ( !sections) {
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
return NULL;
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
sections[0] = '\0';
len = 0;
for(i=0; i<SECTION_COUNT; i++) {
if (sectionlist&(1<<i)) {
sprintf(sections+len,"%s, ",exif_get_sectionname(i));
len = strlen(sections);
}
}
if (len>2) sections[len-2] = '\0';
return sections;
}
/* }}} */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* {{{ struct image_info_type
This structure stores Exif header image elements in a simple manner
Used to store camera data as extracted from the various ways that it can be
stored in a nexif header
*/
typedef struct {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
int type;
size_t size;
uchar *data;
} file_section;
typedef struct {
int count;
file_section *list;
} file_section_list;
typedef struct {
image_filetype filetype;
size_t width, height;
size_t size;
size_t offset;
char *data;
} thumbnail_data;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* EXIF standard defines Copyright as "<Photographer> [ '\0' <Editor> ] ['\0']" */
/* This structure is used to store a section of a Jpeg file. */
typedef struct {
-fix bug for not correct terminated comments -switch to streams @exif functions now support streams using memory streams where @necessary (marcus)
2002-03-17 04:12:17 +08:00
php_stream *infile;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
char *FileName;
time_t FileDateTime;
size_t FileSize;
image_filetype FileType;
int Height, Width;
int IsColor;
float ApertureFNumber;
float ExposureTime;
double FocalplaneUnits;
float CCDWidth;
double FocalplaneXRes;
size_t ExifImageWidth;
float FocalLength;
float Distance;
int motorola_intel; /* 1 Motorola; 0 Intel */
char *UserComment;
char *UserCommentEncoding;
-usability -tests
2002-03-13 00:43:29 +08:00
char *Copyright;
char *CopyrightPhotographer;
char *CopyrightEditor;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
thumbnail_data Thumbnail;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* other */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
int sections_found; /* FOUND_<marker> */
image_info_list info_list[SECTION_COUNT];
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* for parsing */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
int read_thumbnail;
int read_all;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* internal */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
file_section_list file;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
} image_info_type;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
/* }}} */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* {{{ jpeg_sof_info
*/
typedef struct {
int bits_per_sample;
size_t width;
size_t height;
int num_components;
} jpeg_sof_info;
/* }}} */
/* {{{ exif_file_sections_add
Add a file_section to image_info
returns the used block or -1. if size>0 and data == NULL buffer of size is allocated
*/
int exif_file_sections_add(image_info_type *ImageInfo, int type, size_t size, uchar *data)
{
file_section *tmp;
int count = ImageInfo->file.count;
tmp = erealloc(ImageInfo->file.list,(count+1)*sizeof(file_section));
if ( tmp == NULL) return 0;
ImageInfo->file.list = tmp;
ImageInfo->file.list[count].type = type;
if ( !size) {
data = NULL;
} else if ( data == NULL) {
if ( (data = emalloc(size)) == NULL) {
return -1;
}
}
ImageInfo->file.list[count].data = data;
ImageInfo->file.list[count].size = size;
ImageInfo->file.count = count+1;
return count;
}
/* }}} */
/* {{{ exif_file_section_add
Discard all file_sections in ImageInfo
*/
int exif_file_sections_free(image_info_type *ImageInfo)
{
int i;
if ( ImageInfo->file.count) {
for (i=0;i<ImageInfo->file.count-1;i++)
{
if ( ImageInfo->file.list[i].data)
{
efree(ImageInfo->file.list[i].data);
}
}
}
if ( ImageInfo->file.list)
{
efree(ImageInfo->file.list);
}
ImageInfo->file.count = 0;
return TRUE;
}
/* }}} */
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
/* {{{ exif_iif_add_value
Add a value to image_info
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
*/
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
void exif_iif_add_value( image_info_type *image_info, int section_index, char *name, int tag, int format, int length, void* value, int motorola_intel)
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
int index;
image_info_value *info_value;
image_info_data *info_data;
image_info_data *list;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
list = erealloc(image_info->info_list[section_index].list,(image_info->info_list[section_index].count+1)*sizeof(image_info_data));
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
if ( !list) {
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
return;
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
image_info->info_list[section_index].list = list;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
info_data = &image_info->info_list[section_index].list[image_info->info_list[section_index].count];
info_data->tag = tag;
info_data->format = format;
info_data->length = length;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
info_data->name = estrdup(name);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
if ( !info_data->name) {
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
return;
}
info_value = &info_data->value;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
switch (format) {
case TAG_FMT_STRING:
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( value) {
length = php_strnlen(value,length);
info_data->length = length;
info_value->s = estrndup(value,length);
} else {
info_data->length = 0;
info_value->s = estrdup("");
}
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
if ( !info_value->s) {
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
info_data->length = 0;
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
return;
}
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
break;
default:
/* Standard says more types possible but skip them...
* but allow users to handle data if they know how to
* So not return but use type UNDEFINED
* return;
*/
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
info_data->tag = TAG_FMT_UNDEFINED;/* otherwise not freed from memory */
case TAG_FMT_SBYTE:
case TAG_FMT_BYTE:
/* in contrast to strings bytes do not need to allocate buffer for NULL if length==0 */
if ( length<1)
break;
if ( format==TAG_FMT_BYTE && length==1)
{
info_value->u = *(uchar*)value;
break;
}
if ( format==TAG_FMT_SBYTE && length==1)
{
info_value->i = *(char*)value;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
info_data->length = 0;
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
break;
}
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
case TAG_FMT_UNDEFINED:
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( value) {
info_value->s = estrndup(value,length);
} else {
info_data->length = 0;
info_value->s = estrdup("");
}
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
if ( !info_value->s) {
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
return;
}
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
break;
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
case TAG_FMT_USHORT:
case TAG_FMT_ULONG:
case TAG_FMT_URATIONAL:
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
case TAG_FMT_SSHORT:
case TAG_FMT_SLONG:
case TAG_FMT_SRATIONAL:
case TAG_FMT_SINGLE:
case TAG_FMT_DOUBLE:
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
if ( length==0) {
break;
} else
if ( length>1) {
info_data->value.list = emalloc(length*sizeof(image_info_value));
if ( !info_data->value.list) {
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
return;
}
} else {
info_value = &info_data->value;
}
for (index=0; index<length; index++) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( length>1) {
info_value = &info_data->value.list[index];
}
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
switch (format) {
case TAG_FMT_USHORT:
info_value->u = php_ifd_get16u(value,motorola_intel);
break;
case TAG_FMT_ULONG:
info_value->u = php_ifd_get32u(value,motorola_intel);
break;
case TAG_FMT_URATIONAL:
info_value->ur.num = php_ifd_get32u(value, motorola_intel);
info_value->ur.den = php_ifd_get32u(4+(char *)value, motorola_intel);
break;
case TAG_FMT_SSHORT:
info_value->i = php_ifd_get16s(value,motorola_intel);
break;
case TAG_FMT_SLONG:
info_value->i = php_ifd_get32s(value,motorola_intel);
break;
case TAG_FMT_SRATIONAL:
info_value->sr.num = php_ifd_get32u(value, motorola_intel);
info_value->sr.den = php_ifd_get32u(4+(char *)value, motorola_intel);
break;
case TAG_FMT_SINGLE:
php_error(E_WARNING, "Found value of type single");
info_value->f = (double)*(float *)value;
case TAG_FMT_DOUBLE:
php_error(E_WARNING, "Found value of type double");
info_value->d = *(double *)value;
break;
}
}
}
image_info->sections_found |= 1<<section_index;
image_info->info_list[section_index].count++;
}
/* }}} */
/* {{{ exif_iif_add_tag
Add a tag from IFD to image_info
*/
void exif_iif_add_tag( image_info_type *image_info, int section_index, char *name, int tag, int format, int length, void* value)
{
exif_iif_add_value( image_info, section_index, name, tag, format, length, value, image_info->motorola_intel);
}
/* }}} */
/* {{{ exif_iif_add_int
-usability -tests
2002-03-13 00:43:29 +08:00
Add an int value to image_info
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
*/
void exif_iif_add_int( image_info_type *image_info, int section_index, char *name, int value)
{
image_info_data *info_data;
image_info_data *list;
list = erealloc(image_info->info_list[section_index].list,(image_info->info_list[section_index].count+1)*sizeof(image_info_data));
if ( !list) {
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
return;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
}
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
image_info->info_list[section_index].list = list;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
info_data = &image_info->info_list[section_index].list[image_info->info_list[section_index].count];
info_data->tag = TAG_NONE;
info_data->format = TAG_FMT_SLONG;
info_data->length = 1;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
info_data->name = estrdup(name);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
if ( !info_data->name) {
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
return;
}
info_data->value.i = value;
image_info->sections_found |= 1<<section_index;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
image_info->info_list[section_index].count++;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
}
/* }}} */
-usability -tests
2002-03-13 00:43:29 +08:00
/* {{{ exif_iif_add_str
Add a string value to image_info MUST BE NUL TERMINATED
*/
void exif_iif_add_str( image_info_type *image_info, int section_index, char *name, char *value, ...)
{
image_info_data *info_data;
image_info_data *list;
char tmp[1024];
va_list arglist;
va_start( arglist, value );
if ( value) vsnprintf( tmp, sizeof(tmp), value, arglist);
va_end( arglist);
if ( value) {
list = erealloc(image_info->info_list[section_index].list,(image_info->info_list[section_index].count+1)*sizeof(image_info_data));
if ( !list) {
EXIF_ERRLOG_EALLOC
return;
}
image_info->info_list[section_index].list = list;
info_data = &image_info->info_list[section_index].list[image_info->info_list[section_index].count];
info_data->tag = TAG_NONE;
info_data->format = TAG_FMT_STRING;
info_data->length = 1;
info_data->name = estrdup(name);
if ( !info_data->name) {
EXIF_ERRLOG_EALLOC
return;
}
info_data->value.s = estrdup(tmp);
if ( !info_data->value.s) {
EXIF_ERRLOG_EALLOC
return;
}
image_info->sections_found |= 1<<section_index;
image_info->info_list[section_index].count++;
}
}
/* }}} */
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
/* {{{ exif_iif_free
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
Free memory allocated for image_info
*/
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
void exif_iif_free( image_info_type *image_info, int section_index)
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
int i;
void *f; /* faster */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
if (image_info->info_list[section_index].count)
{
for (i=0; i < image_info->info_list[section_index].count; i++)
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( (f=image_info->info_list[section_index].list[i].name) != NULL)
{
efree(f);
}
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
switch(image_info->info_list[section_index].list[i].format)
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
case TAG_FMT_SBYTE:
case TAG_FMT_BYTE:
/* in contrast to strings bytes do not need to allocate buffer for NULL if length==0 */
if (image_info->info_list[section_index].list[i].length<=1)
break;
default:
case TAG_FMT_UNDEFINED:
case TAG_FMT_STRING:
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( (f=image_info->info_list[section_index].list[i].value.s) != NULL)
{
efree(f);
}
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
break;
case TAG_FMT_USHORT:
case TAG_FMT_ULONG:
case TAG_FMT_URATIONAL:
case TAG_FMT_SSHORT:
case TAG_FMT_SLONG:
case TAG_FMT_SRATIONAL:
case TAG_FMT_SINGLE:
case TAG_FMT_DOUBLE:
/* nothing to do here */
break;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
}
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( (f=image_info->info_list[section_index].list) != NULL)
{
efree(f);
}
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
}
}
/* }}} */
/* {{{ add_assoc_image_info
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
* Add image_info to associative array value. */
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
void add_assoc_image_info( pval *value, int sub_array, image_info_type *image_info, int section_index)
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
char buffer[64], *val, *name, uname[64];
int i, ap, l, b, idx=0, done, unknown=0;
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
image_info_value *info_value;
image_info_data *info_data;
pval *tmpi, *array;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
if ( image_info->info_list[section_index].count)
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{
if ( sub_array) {
MAKE_STD_ZVAL(tmpi);
array_init(tmpi);
} else {
tmpi = value;
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
for(i=0; i<image_info->info_list[section_index].count; i++)
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
done = 0;
info_data = &image_info->info_list[section_index].list[i];
info_value = &info_data->value;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( !(name = info_data->name)) {
sprintf(uname,"%d", unknown++);
name = uname;
}
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
if (info_data->length==0)
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
add_assoc_null(tmpi, name);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
} else {
switch (info_data->format)
{
default:
/* Standard says more types possible but skip them...
* but allow users to handle data if they know how to
* So not return but use type UNDEFINED
* return;
*/
case TAG_FMT_UNDEFINED:
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( !info_value->s) {
add_assoc_stringl(tmpi, name, "", 0, 1);
} else {
add_assoc_stringl(tmpi, name, info_value->s, info_data->length, 1);
}
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
break;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
case TAG_FMT_STRING:
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( !(val = info_value->s)) val = "";
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
if (section_index==SECTION_COMMENT) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
add_index_string(tmpi, idx++, val, 1);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
} else {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
add_assoc_string(tmpi, name, val, 1);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
}
break;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
case TAG_FMT_URATIONAL:
case TAG_FMT_SRATIONAL:
case TAG_FMT_BYTE:
case TAG_FMT_SBYTE:
case TAG_FMT_USHORT:
case TAG_FMT_SSHORT:
case TAG_FMT_SINGLE:
case TAG_FMT_DOUBLE:
case TAG_FMT_ULONG:
case TAG_FMT_SLONG:
/* now the rest, first see if it becomes an array */
if ( (l = info_data->length) > 1) {
array = NULL;
MAKE_STD_ZVAL(array);
array_init(array);
}
for(ap=0; ap<l; ap++)
{
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( l>1) {
info_value = &info_data->value.list[ap];
}
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
switch (info_data->format)
{
case TAG_FMT_BYTE:
if (l>1) {
info_value = &info_data->value;
for (b=0;b<l;b++)
{
add_index_long(array, b, (int)(info_value->s[b]));
}
break;
}
case TAG_FMT_USHORT:
case TAG_FMT_ULONG:
if (l==1) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
add_assoc_long(tmpi, name, (int)info_value->u);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
} else {
add_index_long(array, ap, (int)info_value->u);
}
break;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
case TAG_FMT_URATIONAL:
sprintf(buffer,"%i/%i", info_value->ur.num, info_value->ur.den);
if (l==1) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
add_assoc_string(tmpi, name, buffer, 1);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
} else {
add_index_string(array, ap, buffer, 1);
}
break;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
case TAG_FMT_SBYTE:
if (l>1) {
info_value = &info_data->value;
for (b=0;b<l;b++)
{
add_index_long(array, ap, (int)info_value->s[b]);
}
break;
}
case TAG_FMT_SSHORT:
case TAG_FMT_SLONG:
if (l==1) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
add_assoc_long(tmpi, name, info_value->i);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
} else {
add_index_long(array, ap, info_value->i);
}
break;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
case TAG_FMT_SRATIONAL:
sprintf(buffer,"%i/%i", info_value->sr.num, info_value->sr.den);
if (l==1) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
add_assoc_string(tmpi, name, buffer, 1);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
} else {
add_index_string(array, ap, buffer, 1);
}
break;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
case TAG_FMT_SINGLE:
if (l==1) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
add_assoc_double(tmpi, name, info_value->f);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
} else {
add_index_double(array, ap, info_value->f);
}
break;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
case TAG_FMT_DOUBLE:
if (l==1) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
add_assoc_double(tmpi, name, info_value->d);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
} else {
add_index_double(array, ap, info_value->d);
}
break;
}
info_value = &info_data->value.list[ap];
}
if ( l>1) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
add_assoc_zval(tmpi, name, array);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
}
break;
}
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
}
}
if ( sub_array) {
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
add_assoc_zval(value, exif_get_sectionname(section_index), tmpi);
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
}
}
}
/* }}} */
/* {{{ Markers
JPEG markers consist of one or more 0xFF bytes, followed by a marker
code byte (which is not an FF). Here are the marker codes of interest
in this program. (See jdmarker.c for a more complete list.)
*/
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#define M_TEM 0x01 /* temp for arithmetic coding */
#define M_RES 0x02 /* reserved */
#define M_SOF0 0xC0 /* Start Of Frame N */
#define M_SOF1 0xC1 /* N indicates which compression process */
#define M_SOF2 0xC2 /* Only SOF0-SOF2 are now in common use */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
#define M_SOF3 0xC3
#define M_DHT 0xC4
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#define M_SOF5 0xC5 /* NB: codes C4 and CC are NOT SOF markers */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
#define M_SOF6 0xC6
#define M_SOF7 0xC7
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#define M_JPEG 0x08 /* reserved for extensions */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
#define M_SOF9 0xC9
#define M_SOF10 0xCA
#define M_SOF11 0xCB
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#define M_DAC 0xCC /* arithmetic table */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
#define M_SOF13 0xCD
#define M_SOF14 0xCE
#define M_SOF15 0xCF
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#define M_RST0 0xD0 /* restart segment */
#define M_RST1 0xD1
#define M_RST2 0xD2
#define M_RST3 0xD3
#define M_RST4 0xD4
#define M_RST5 0xD5
#define M_RST6 0xD6
#define M_RST7 0xD7
#define M_SOI 0xD8 /* Start Of Image (beginning of datastream) */
#define M_EOI 0xD9 /* End Of Image (end of datastream) */
#define M_SOS 0xDA /* Start Of Scan (begins compressed data) */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
#define M_DQT 0xDB
#define M_DNL 0xDC
#define M_DRI 0xDD
#define M_DHP 0xDE
#define M_EXP 0xDF
#define M_APP0 0xE0
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#define M_EXIF 0xE1 /* Exif Attribute Information */
#define M_APP2 0xE2 /* Flash Pix Extension Data? */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
#define M_APP3 0xE3
#define M_APP4 0xE4
#define M_APP5 0xE5
#define M_APP6 0xE6
#define M_APP7 0xE7
#define M_APP8 0xE8
#define M_APP9 0xE9
#define M_APP10 0xEA
#define M_APP11 0xEB
#define M_APP12 0xEC
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#define M_APP13 0xED /* IPTC International Press Telecommunications Council */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
#define M_APP14 0xEE
#define M_APP15 0xEF
#define M_JPG0 0xF0
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#define M_JPG1 0xF1
#define M_JPG2 0xF2
#define M_JPG3 0xF3
#define M_JPG4 0xF4
#define M_JPG5 0xF5
#define M_JPG6 0xF6
#define M_JPG7 0xF7
#define M_JPG8 0xF8
#define M_JPG9 0xF9
#define M_JPG10 0xFA
#define M_JPG11 0xFB
#define M_JPG12 0xFC
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
#define M_JPG13 0xFD
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#define M_COM 0xFE /* COMment */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#define M_PSEUDO 0x123 /* Extra value. */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
/* }}} */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* {{{ jpeg2000 markers
*/
/* Markers x30 - x3F do not have a segment */
/* Markers x00, x01, xFE, xC0 - xDF ISO/IEC 10918-1 -> M_<xx> */
/* Markers xF0 - xF7 ISO/IEC 10918-3 */
/* Markers xF7 - xF8 ISO/IEC 14495-1 */
/* XY=Main/Tile-header:(R:required, N:not_allowed, O:optional, L:last_marker) */
#define JC_SOC 0x4F /* NN, Start of codestream */
#define JC_SIZ 0x51 /* RN, Image and tile size */
#define JC_COD 0x52 /* RO, Codeing style defaulte */
#define JC_COC 0x53 /* OO, Coding style component */
#define JC_TLM 0x55 /* ON, Tile part length main header */
#define JC_PLM 0x57 /* ON, Packet length main header */
#define JC_PLT 0x58 /* NO, Packet length tile part header */
#define JC_QCD 0x5C /* RO, Quantization default */
#define JC_QCC 0x5D /* OO, Quantization component */
#define JC_RGN 0x5E /* OO, Region of interest */
#define JC_POD 0x5F /* OO, Progression order default */
#define JC_PPM 0x60 /* ON, Packed packet headers main header */
#define JC_PPT 0x61 /* NO, Packet packet headers tile part header */
#define JC_CME 0x64 /* OO, Comment: "LL E <text>" E=0:binary, E=1:ascii */
#define JC_SOT 0x90 /* NR, Start of tile */
#define JC_SOP 0x91 /* NO, Start of packeter default */
#define JC_EPH 0x92 /* NO, End of packet header */
#define JC_SOD 0x93 /* NL, Start of data */
#define JC_EOC 0xD9 /* NN, End of codestream */
/* }}} */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
/* {{{ exif_process_COM
Process a COM marker.
We want to print out the marker contents as legible text;
we must guard against random junk and varying newline representations.
*/
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
static void exif_process_COM (image_info_type *image_info, uchar *value, int length)
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{
-fix bug for not correct terminated comments -switch to streams @exif functions now support streams using memory streams where @necessary (marcus)
2002-03-17 04:12:17 +08:00
exif_iif_add_tag( image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_STRING, length-2, value+2);
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
}
/* }}} */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* {{{ exif_process_COM
Process a COM marker.
We want to print out the marker contents as legible text;
we must guard against random junk and varying newline representations.
*/
static void exif_process_CME (image_info_type *image_info, uchar *value, int length)
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
{
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if (length>3) {
switch(value[2]) {
case 0:
exif_iif_add_tag( image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_UNDEFINED, length, value);
break;
case 1:
exif_iif_add_tag( image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_STRING, length, value);
break;
default:
php_error(E_NOTICE,"Undefined JPEG2000 comment encoding");
break;
}
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
} else {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
exif_iif_add_tag( image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_UNDEFINED, 0, NULL);
php_error(E_NOTICE,"JPEG2000 comment section to small");
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
}
/* }}} */
/* {{{ exif_process_SOFn
* Process a SOFn marker. This is useful for the image dimensions */
static void exif_process_SOFn (uchar *Data, int marker, jpeg_sof_info *result)
{
/* 0xFF SOSn SectLen(2) Bits(1) Height(2) Width(2) Channels(1) 3*Channels (1) */
result->bits_per_sample = Data[2];
result->height = php_jpg_get16(Data+3);
result->width = php_jpg_get16(Data+5);
result->num_components = Data[7];
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* switch (marker) {
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
case M_SOF0: process = "Baseline"; break;
case M_SOF1: process = "Extended sequential"; break;
case M_SOF2: process = "Progressive"; break;
case M_SOF3: process = "Lossless"; break;
case M_SOF5: process = "Differential sequential"; break;
case M_SOF6: process = "Differential progressive"; break;
case M_SOF7: process = "Differential lossless"; break;
case M_SOF9: process = "Extended sequential, arithmetic coding"; break;
case M_SOF10: process = "Progressive, arithmetic coding"; break;
case M_SOF11: process = "Lossless, arithmetic coding"; break;
case M_SOF13: process = "Differential sequential, arithmetic coding"; break;
case M_SOF14: process = "Differential progressive, arithmetic coding"; break;
case M_SOF15: process = "Differential lossless, arithmetic coding"; break;
default: process = "Unknown"; break;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
}*/
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
}
/* }}} */
-support for out of section data
2002-03-09 04:56:44 +08:00
static int exif_process_IFD_in_JPEG(image_info_type *ImageInfo, char *DirStart, char *OffsetBase, unsigned IFDlength, int sub_section_index);
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* {{{ exif_get_markername
Get name of marker */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
//#ifdef EXIF_DEBUG
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
char * exif_get_markername(int marker)
{
switch(marker) {
case 0xC0: return "SOF0";
case 0xC1: return "SOF1";
case 0xC2: return "SOF2";
case 0xC3: return "SOF3";
case 0xC4: return "DHT";
case 0xC5: return "SOF5";
case 0xC6: return "SOF6";
case 0xC7: return "SOF7";
case 0xC9: return "SOF9";
case 0xCA: return "SOF10";
case 0xCB: return "SOF11";
case 0xCD: return "SOF13";
case 0xCE: return "SOF14";
case 0xCF: return "SOF15";
case 0xD8: return "SOI";
case 0xD9: return "EOI";
case 0xDA: return "SOS";
case 0xDB: return "DQT";
case 0xDC: return "DNL";
case 0xDD: return "DRI";
case 0xDE: return "DHP";
case 0xDF: return "EXP";
case 0xE0: return "APP0";
case 0xE1: return "EXIF";
case 0xE2: return "FPIX";
case 0xE3: return "APP3";
case 0xE4: return "APP4";
case 0xE5: return "APP5";
case 0xE6: return "APP6";
case 0xE7: return "APP7";
case 0xE8: return "APP8";
case 0xE9: return "APP9";
case 0xEA: return "APP10";
case 0xEB: return "APP11";
case 0xEC: return "APP12";
case 0xED: return "APP13";
case 0xEE: return "APP14";
case 0xEF: return "APP15";
case 0xF0: return "JPG0";
case 0xFD: return "JPG13";
case 0xFE: return "COM";
case 0x01: return "TEM";
}
return "Unknown";
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
//#endif
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* }}} */
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* {{{ proto string|false exif_tagname(index)
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
Get headername for index or false if not defined */
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
PHP_FUNCTION(exif_tagname)
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
{
pval **p_num;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
int tag, ac = ZEND_NUM_ARGS();
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
char *szTemp;
if ((ac < 1 || ac > 1) || zend_get_parameters_ex(ac, &p_num) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(p_num);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
tag = Z_LVAL_PP(p_num);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
szTemp = exif_get_tagname(tag,NULL,0);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
if ( tag<0 || !szTemp || !szTemp[0]) {
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
RETURN_BOOL(FALSE);
} else {
RETURN_STRING(szTemp, 1)
}
}
/* }}} */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* {{{ exif_ifd_make_value
* Create a value for an ifd from an info_data pointer */
static void* exif_ifd_make_value( image_info_data *info_data,int motorola_intel) {
size_t byte_count;
char *value_ptr, *data_ptr;
int i;
image_info_value *info_value;
byte_count = php_tiff_bytes_per_format[info_data->format] * info_data->length;
value_ptr = emalloc(max(byte_count,4));
if ( !value_ptr) {
EXIF_ERRLOG_EALLOC
return NULL;
}
memset(value_ptr,0,4);
if ( !info_data->length) {
return value_ptr;
}
if ( info_data->format == TAG_FMT_UNDEFINED || info_data->format == TAG_FMT_STRING
|| ( byte_count>1 && (info_data->format == TAG_FMT_BYTE || info_data->format == TAG_FMT_SBYTE)))
{
memmove( value_ptr, info_data->value.s, byte_count);
return value_ptr;
} else if (info_data->format == TAG_FMT_BYTE) {
*value_ptr = info_data->value.u;
return value_ptr;
} else if (info_data->format == TAG_FMT_SBYTE) {
*value_ptr = info_data->value.i;
return value_ptr;
} else {
data_ptr = value_ptr;
for(i=0; i<info_data->length; i++) {
if ( info_data->length==1) {
info_value = &info_data->value;
} else {
info_value = &info_data->value.list[i];
}
switch( info_data->format) {
case TAG_FMT_USHORT:
php_ifd_set16u( data_ptr, info_value->u, motorola_intel);
data_ptr += 2;
break;
case TAG_FMT_ULONG:
php_ifd_set32u( data_ptr, info_value->u, motorola_intel);
data_ptr += 4;
break;
case TAG_FMT_SSHORT:
php_ifd_set16u( data_ptr, info_value->i, motorola_intel);
data_ptr += 2;
break;
case TAG_FMT_SLONG:
php_ifd_set32u( data_ptr, info_value->i, motorola_intel);
data_ptr += 4;
break;
case TAG_FMT_URATIONAL:
php_ifd_set32u( data_ptr, info_value->sr.num, motorola_intel);
php_ifd_set32u( data_ptr+4, info_value->sr.den, motorola_intel);
data_ptr += 8;
break;
case TAG_FMT_SRATIONAL:
php_ifd_set32u( data_ptr, info_value->ur.num, motorola_intel);
php_ifd_set32u( data_ptr+4, info_value->ur.den, motorola_intel);
data_ptr += 8;
break;
case TAG_FMT_SINGLE:
memmove( data_ptr, &info_data->value.f, byte_count);
data_ptr += 4;
break;
case TAG_FMT_DOUBLE:
memmove( data_ptr, &info_data->value.d, byte_count);
data_ptr += 8;
break;
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
}
return value_ptr;
}
/* }}} */
/* {{{ exif_thumbnail_build
* Check and build thumbnail */
static void exif_thumbnail_build(image_info_type *ImageInfo) {
size_t new_size, new_move, new_value;
char *new_data;
void *value_ptr;
int i, byte_count;
image_info_list *info_list;
image_info_data *info_data;
#ifdef EXIF_DEBUG
char tagname[64];
#endif
if ( !ImageInfo->read_thumbnail || !ImageInfo->Thumbnail.offset || !ImageInfo->Thumbnail.size)
{
return; /* ignore this call */
}
switch(ImageInfo->Thumbnail.filetype) {
default:
case IMAGE_FILETYPE_JPEG:
/* done */
break;
case IMAGE_FILETYPE_TIFF_II:
case IMAGE_FILETYPE_TIFF_MM:
info_list = &ImageInfo->info_list[SECTION_THUMBNAIL];
new_size = 8 + 2 + info_list->count * 12 + 4;
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"thumbnail: size of signature + directory(%d): 0x%02X", info_list->count, new_size);
#endif
new_value= new_size; /* offset for ifd values outside ifd directory */
for (i=0; i<info_list->count; i++) {
info_data = &info_list->list[i];
byte_count = php_tiff_bytes_per_format[info_data->format] * info_data->length;
if ( byte_count > 4) {
new_size += byte_count;
}
}
new_move = new_size;
new_data = erealloc(ImageInfo->Thumbnail.data,ImageInfo->Thumbnail.size+new_size);
if (!ImageInfo->Thumbnail.data) {
EXIF_ERRLOG_EALLOC
efree(ImageInfo->Thumbnail.data);
ImageInfo->Thumbnail.data = NULL;
ImageInfo->Thumbnail.size = 0;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
return;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
}
ImageInfo->Thumbnail.data = new_data;
memmove(ImageInfo->Thumbnail.data + new_move, ImageInfo->Thumbnail.data, ImageInfo->Thumbnail.size);
ImageInfo->Thumbnail.size += new_size;
/* fill in data */
if ( ImageInfo->motorola_intel) {
memmove( new_data, "MM\x00\x2a\x00\x00\x00\x08", 8);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
} else {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
memmove( new_data, "II\x2a\x00\x08\x00\x00\x00", 8);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
new_data += 8;
php_ifd_set16u( new_data, info_list->count, ImageInfo->motorola_intel);
new_data += 2;
for (i=0; i<info_list->count; i++) {
info_data = &info_list->list[i];
byte_count = php_tiff_bytes_per_format[info_data->format] * info_data->length;
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"thumbnail: process tag(x%04X=%s): %s%s (%d bytes)", info_data->tag, exif_get_tagname(info_data->tag,tagname,-12), (info_data->length>1)&&info_data->format!=TAG_FMT_UNDEFINED&&info_data->format!=TAG_FMT_STRING?"ARRAY OF ":"", exif_get_tagformat(info_data->format), byte_count);
#endif
if ( info_data->tag==TAG_STRIP_OFFSETS || info_data->tag==TAG_JPEG_INTERCHANGE_FORMAT) {
php_ifd_set16u( new_data + 0, info_data->tag, ImageInfo->motorola_intel);
php_ifd_set16u( new_data + 2, TAG_FMT_ULONG, ImageInfo->motorola_intel);
php_ifd_set32u( new_data + 4, 1, ImageInfo->motorola_intel);
php_ifd_set32u( new_data + 8, new_move, ImageInfo->motorola_intel);
} else {
php_ifd_set16u( new_data + 0, info_data->tag, ImageInfo->motorola_intel);
php_ifd_set16u( new_data + 2, info_data->format, ImageInfo->motorola_intel);
php_ifd_set32u( new_data + 4, info_data->length, ImageInfo->motorola_intel);
value_ptr = exif_ifd_make_value( info_data, ImageInfo->motorola_intel);
if ( !value_ptr) {
EXIF_ERRLOG_EALLOC
efree(ImageInfo->Thumbnail.data);
ImageInfo->Thumbnail.data = NULL;
ImageInfo->Thumbnail.size = 0;
return;
}
if ( byte_count <= 4) {
memmove( new_data+8, value_ptr, 4);
} else {
php_ifd_set32u( new_data+8, new_value, ImageInfo->motorola_intel);
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"thumbnail: writing with value offset: 0x%04X + 0x%02X", new_value, byte_count);
#endif
memmove( ImageInfo->Thumbnail.data+new_value, value_ptr, byte_count);
new_value += byte_count;
}
efree(value_ptr);
}
new_data += 12;
}
memset( new_data, 0, 4); /* next ifd pointer */
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"thumbnail: created");
#endif
break;
Attempt by Matt Bonneau to get thumbnail extraction working (no need to bring this into the 4.0.4 branch)
2000-12-16 01:25:20 +08:00
}
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
Attempt by Matt Bonneau to get thumbnail extraction working (no need to bring this into the 4.0.4 branch)
2000-12-16 01:25:20 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* {{{ exif_thumbnail_extract
* Grab the thumbnail, corrected */
static void exif_thumbnail_extract(image_info_type *ImageInfo, char *offset, size_t length) {
/* according to exif2.1, the thumbnail is not supposed to be greater than 64K */
if ( !ImageInfo->read_thumbnail)
{
return; /* ignore this call */
}
if ( ImageInfo->Thumbnail.size >= 65536
|| ImageInfo->Thumbnail.size <= 0
|| ImageInfo->Thumbnail.offset <= 0)
{
php_error(E_WARNING, "Illegal thumbnail size/offset");
return;
}
/* Check to make sure we are not going to go past the ExifLength */
if ( (ImageInfo->Thumbnail.offset + ImageInfo->Thumbnail.size) > length) {
EXIF_ERRLOG_THUMBEOF
return;
}
ImageInfo->Thumbnail.data = estrndup(offset + ImageInfo->Thumbnail.offset, ImageInfo->Thumbnail.size);
if (!ImageInfo->Thumbnail.data) {
EXIF_ERRLOG_EALLOC
}
exif_thumbnail_build( ImageInfo);
}
/* }}} */
-usability -tests
2002-03-13 00:43:29 +08:00
/* {{{ exif_process_undefined
* Copy a string/buffer in Exif header to a character string and return length of allocated buffer if any. */
static int exif_process_undefined(char **result,char *value,size_t byte_count) {
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
/* we cannot use strlcpy - here the problem is that we have to copy NUL
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
* chars up to byte_count, we also have to add a single NUL character to
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
* force end of string.
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
* estrndup does not return length
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
*/
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
if (byte_count) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
(*result) = estrndup(value,byte_count); /* NULL @ byte_count!!! */
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
if ( !*result) {
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
return 0;
}
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
return byte_count+1;
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
}
return 0;
}
/* }}} */
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* {{{ exif_process_string
-usability -tests
2002-03-13 00:43:29 +08:00
* Copy a string in Exif header to a character string and return length of allocated buffer if any.
* In contrast to exif_process_undefined this function does allways return a string buffer */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
static int exif_process_string(char **result,char *value,size_t byte_count) {
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
/* we cannot use strlcpy - here the problem is that we cannot use strlen to
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
* determin length of string and we cannot use strlcpy with len=byte_count+1
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
* because then we might get into an EXCEPTION if we exceed an allocated
* memory page...so we use php_strnlen in conjunction with memcpy and add the NUL
* char.
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
* estrdup would sometimes allocate more memory and does not return length
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
*/
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
if ((byte_count=php_strnlen(value,byte_count)) > 0) {
-usability -tests
2002-03-13 00:43:29 +08:00
return exif_process_undefined(result,value,byte_count);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
-usability -tests
2002-03-13 00:43:29 +08:00
(*result) = estrndup("",1); /* force empty string */
if ( !*result) {
EXIF_ERRLOG_EALLOC
return 0;
}
return byte_count+1;
+Added UNICODE support for Comments +Added Description,Artist +Added missing memory deallocation +Corrected error with multiple comments +Corrected handling of ExifVersion, Tag has 4 ASCII characters *WITHOUT* NUL +Corrected handling of Thumbnailsize if current source detects size < 0 +Changed all fields to char* that do not have a maximum length in EXIF standard +Undocumented second Parameter ReadAll frees memory to early -> moved to third position default changed to false -> faster +New second Parameter [true|false] to specify whether or not to to read thumbnails -> reading is timeconsumpting suppose default should be false -> done so
2002-02-28 09:16:27 +08:00
}
/* }}} */
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* {{{ exif_process_user_comment
* Process UserComment in IFD. */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
static int exif_process_user_comment(char **pszInfoPtr,char **szEncoding,char *szValuePtr,int ByteCount)
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
{
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
int a,l;
char mbBuffer[MB_CUR_MAX];
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* Copy the comment */
if ( ByteCount>=8) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if (!memcmp(szValuePtr, "UNICODE\0", 8)) {
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* treat JIS encoding as if it where UNICODE */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
*szEncoding= estrdup((const char*)szValuePtr);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
szValuePtr = szValuePtr+8;
ByteCount -= 8;
l = 0;
a = 0;
while(((wchar_t*)szValuePtr)[a]) {
l += (int)wctomb( mbBuffer, *((wchar_t*)szValuePtr));
if (sizeof(wchar_t)*a++ >= ByteCount) break; /* avoiding problems with corrupt headers */
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if (l>1) {
*pszInfoPtr = emalloc(l+1);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
if ( !*pszInfoPtr) {
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
return 0;
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
wcstombs(*pszInfoPtr, (wchar_t*)(szValuePtr), l+1);
(*pszInfoPtr)[l] = '\0';
return l+1;
}
return 0;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
} else
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if ( !memcmp(szValuePtr, "ASCII\0\0\0", 8)) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
*szEncoding= estrdup((const char*)szValuePtr);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
szValuePtr = szValuePtr+8;
ByteCount -= 8;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
} else
if ( !memcmp(szValuePtr, "JIS\0\0\0\0\0", 8)) {
/* JIS should be tanslated to MB or we leave it to the user - leave it to the user */
*szEncoding= estrdup((const char*)szValuePtr);
szValuePtr = szValuePtr+8;
ByteCount -= 8;
} else
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if ( !memcmp(szValuePtr,"\0\0\0\0\0\0\0\0",8)) {
/* 8 NULL means undefined and should be ASCII... */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
*szEncoding= estrdup((const char*)szValuePtr);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
szValuePtr = szValuePtr+8;
ByteCount -= 8;
}
}
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* Olympus has this padded with trailing spaces. Remove these first. */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if (ByteCount>0) for (a=ByteCount-1;a && szValuePtr[a]==' ';a--) (szValuePtr)[a] = '\0';
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* normal text without encoding */
return exif_process_string(pszInfoPtr,szValuePtr,ByteCount);
}
/* }}} */
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* {{{ exif_process_IFD_TAG
* Process one of the nested IFDs directories. */
-support for out of section data
2002-03-09 04:56:44 +08:00
static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, char *offset_base, size_t IFDlength, int section_index, int ReadNextIFD)
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
int l;
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
int tag, format, components;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
char *value_ptr, tagname[64], cbuf[32], *outside=NULL;
-support for out of section data
2002-03-09 04:56:44 +08:00
size_t byte_count, offset_val, fpos, fgot;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
tag = php_ifd_get16u(dir_entry, ImageInfo->motorola_intel);
format = php_ifd_get16u(dir_entry+2, ImageInfo->motorola_intel);
components = php_ifd_get32u(dir_entry+4, ImageInfo->motorola_intel);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if (!format || format >= NUM_FORMATS) {
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* (-1) catches illegal zero case as unsigned underflows to positive large. */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
php_error(E_WARNING, "Illegal format code in IFD: 0x%04X", format);
-support for out of section data
2002-03-09 04:56:44 +08:00
return TRUE;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
byte_count = components * php_tiff_bytes_per_format[format];
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
if (byte_count > 4) {
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
offset_val = php_ifd_get32u(dir_entry+8, ImageInfo->motorola_intel);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* If its bigger than 4 bytes, the dir entry contains an offset. */
TIFF support for 'non' digicam files # same as in standard/image.c but here it's more complex
2002-03-08 09:06:59 +08:00
value_ptr = offset_base+offset_val;
if (offset_val+byte_count > IFDlength || value_ptr < dir_entry) {
-support for out of section data
2002-03-09 04:56:44 +08:00
// It is important to check for IMAGE_FILETYPE_TIFF
// JPEG does not use absolute pointers instead its pointers are relative to the start
// of the TIFF header in APP1 section.
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if (offset_val<0 || offset_val+byte_count>ImageInfo->FileSize || (ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_II && ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_MM)) {
-support for out of section data
2002-03-09 04:56:44 +08:00
if (value_ptr < dir_entry) {
/* we can read this if offset_val > 0 */
/* some files have their values in other parts of the file */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
php_error(E_WARNING, "process tag(x%04X=%s): Illegal pointer offset(x%04X < x%04X)", tag, exif_get_tagname(tag,tagname,-12), offset_val, dir_entry);
-support for out of section data
2002-03-09 04:56:44 +08:00
} else {
/* this is for sure not allowed */
/* exception are IFD pointers */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
php_error(E_WARNING, "process tag(x%04X=%s): Illegal pointer offset(x%04X + x%04X = x%04X > x%04X)", tag, exif_get_tagname(tag,tagname,-12), offset_val, byte_count, offset_val+byte_count, IFDlength);
-support for out of section data
2002-03-09 04:56:44 +08:00
}
return TRUE;
}
if ( byte_count>sizeof(cbuf)) {
// mark as outside range and get buffer
value_ptr = emalloc(byte_count);
if ( !value_ptr) {
EXIF_ERRLOG_EALLOC
return FALSE;
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
outside = value_ptr;
TIFF support for 'non' digicam files # same as in standard/image.c but here it's more complex
2002-03-08 09:06:59 +08:00
} else {
-support for out of section data
2002-03-09 04:56:44 +08:00
// in most cases we only access a small range so
// it is faster to use a static buffer there
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
// BUT it offers also the possibility to have
-support for out of section data
2002-03-09 04:56:44 +08:00
// pointers read without the need to free them
// explicitley before returning.
value_ptr = cbuf;
TIFF support for 'non' digicam files # same as in standard/image.c but here it's more complex
2002-03-08 09:06:59 +08:00
}
-fix bug for not correct terminated comments -switch to streams @exif functions now support streams using memory streams where @necessary (marcus)
2002-03-17 04:12:17 +08:00
-streams are no longer an option
2002-03-18 13:32:25 +08:00
fpos = php_stream_tell(ImageInfo->infile);
php_stream_seek(ImageInfo->infile, offset_val, SEEK_SET);
fgot = php_stream_tell(ImageInfo->infile);
-support for out of section data
2002-03-09 04:56:44 +08:00
if ( fgot!=offset_val) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( outside) efree( outside);
-support for out of section data
2002-03-09 04:56:44 +08:00
php_error(E_WARNING,"Wrong file pointer: 0x%08X != 0x08X", fgot, offset_val);
return FALSE;
}
-streams are no longer an option
2002-03-18 13:32:25 +08:00
fgot = php_stream_read(ImageInfo->infile, value_ptr, byte_count);
php_stream_seek(ImageInfo->infile, fpos, SEEK_SET);
-support for out of section data
2002-03-09 04:56:44 +08:00
if ( fgot<byte_count) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( outside) efree( outside);
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_FILEEOF
return FALSE;
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
} else {
/* 4 bytes or less and value is in the dir entry itself */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
value_ptr = dir_entry+8;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
offset_val= value_ptr-offset_base;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
ImageInfo->sections_found |= FOUND_ANY_TAG;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
php_error(E_NOTICE,"process tag(x%04X=%s,@x%04X + x%04X(=%d)): %s%s", tag, exif_get_tagname(tag,tagname,-12), offset_val, byte_count, byte_count, (components>1)&&format!=TAG_FMT_UNDEFINED&&format!=TAG_FMT_STRING?"ARRAY OF ":"", format==TAG_FMT_STRING?(value_ptr?value_ptr:"<no data>"):exif_get_tagformat(format));
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
if (section_index==SECTION_THUMBNAIL) {
switch(tag) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
case TAG_IMAGEWIDTH:
case TAG_COMP_IMAGEWIDTH:
ImageInfo->Thumbnail.width = exif_convert_any_to_int(value_ptr, format, ImageInfo->motorola_intel);
break;
case TAG_IMAGEHEIGHT:
case TAG_COMP_IMAGEHEIGHT:
ImageInfo->Thumbnail.height = exif_convert_any_to_int(value_ptr, format, ImageInfo->motorola_intel);
break;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
case TAG_STRIP_OFFSETS:
case TAG_JPEG_INTERCHANGE_FORMAT:
/* accept both formats */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
ImageInfo->Thumbnail.offset = exif_convert_any_to_int(value_ptr, format, ImageInfo->motorola_intel);
break;
case TAG_STRIP_BYTE_COUNTS:
if ( ImageInfo->FileType == IMAGE_FILETYPE_TIFF_II || ImageInfo->FileType == IMAGE_FILETYPE_TIFF_MM) {
ImageInfo->Thumbnail.filetype = ImageInfo->FileType;
} else {
/* motorola is easier to read */
ImageInfo->Thumbnail.filetype = IMAGE_FILETYPE_TIFF_MM;
}
ImageInfo->Thumbnail.size = exif_convert_any_to_int(value_ptr, format, ImageInfo->motorola_intel);
-support for out of section data
2002-03-09 04:56:44 +08:00
break;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
case TAG_JPEG_INTERCHANGE_FORMAT_LEN:
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( ImageInfo->Thumbnail.filetype == IMAGE_FILETYPE_UNKNOWN) {
ImageInfo->Thumbnail.filetype = IMAGE_FILETYPE_JPEG;
ImageInfo->Thumbnail.size = exif_convert_any_to_int(value_ptr, format, ImageInfo->motorola_intel);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
}
break;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
} else {
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
switch(tag) {
case TAG_COPYRIGHT:
-usability -tests
2002-03-13 00:43:29 +08:00
/* check for "<photographer> NUL <editor> NUL" */
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
if (byte_count>1 && (l=php_strnlen(value_ptr,byte_count)) > 0) {
if ( l<byte_count-1) {
/* When there are any characters after the first NUL */
-usability -tests
2002-03-13 00:43:29 +08:00
ImageInfo->CopyrightPhotographer = estrdup( value_ptr);
ImageInfo->CopyrightEditor = estrdup( value_ptr);
ImageInfo->Copyright = emalloc(byte_count+3);
if ( !ImageInfo->Copyright) {
EXIF_ERRLOG_EALLOC
} else {
sprintf( ImageInfo->Copyright, "%s, %s", value_ptr, value_ptr+l+1);
}
/* format = TAG_FMT_UNDEFINED; this musn't be ASCII */
/* but we are not supposed to change this */
/* keep in mind that image_info does not store editor value */
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"added copyrights: %s, %s", value_ptr, value_ptr+l+1);
#endif
-usability -tests
2002-03-13 00:43:29 +08:00
} else {
ImageInfo->Copyright = estrdup(value_ptr);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
}
}
break;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
case TAG_USERCOMMENT:
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
exif_process_user_comment(&(ImageInfo->UserComment),&(ImageInfo->UserCommentEncoding),value_ptr,byte_count);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
break;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
case TAG_FNUMBER:
/* Simplest way of expressing aperture, so I trust it the most.
(overwrite previously computd value if there is one) */
ImageInfo->ApertureFNumber = (float)exif_convert_any_format(value_ptr, format, ImageInfo->motorola_intel);
break;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
case TAG_APERTURE:
case TAG_MAXAPERTURE:
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* More relevant info always comes earlier, so only use this field if we don't
have appropriate aperture information yet. */
if ( ImageInfo->ApertureFNumber == 0) {
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
ImageInfo->ApertureFNumber
= (float)exp(exif_convert_any_format(value_ptr, format, ImageInfo->motorola_intel)*log(2)*0.5);
}
break;
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
case TAG_SHUTTERSPEED:
/* More complicated way of expressing exposure time, so only use
this value if we don't already have it from somewhere else.
SHUTTERSPEED comes after EXPOSURE TIME
*/
if (ImageInfo->ExposureTime == 0) {
ImageInfo->ExposureTime
= (float)(1/exp(exif_convert_any_format(value_ptr, format, ImageInfo->motorola_intel)*log(2)));
}
break;
case TAG_EXPOSURETIME:
ImageInfo->ExposureTime = -1;
break;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
case TAG_COMP_IMAGEWIDTH:
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
ImageInfo->ExifImageWidth = exif_convert_any_to_int(value_ptr, format, ImageInfo->motorola_intel);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
break;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
case TAG_FOCALPLANEXRES:
ImageInfo->FocalplaneXRes = exif_convert_any_format(value_ptr, format, ImageInfo->motorola_intel);
break;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
case TAG_SUBJECT_DISTANCE:
/* Inidcates the distacne the autofocus camera is focused to.
Tends to be less accurate as distance increases. */
ImageInfo->Distance = (float)exif_convert_any_format(value_ptr, format, ImageInfo->motorola_intel);
break;
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
case TAG_FOCALPLANEUNITS:
switch((int)exif_convert_any_format(value_ptr, format, ImageInfo->motorola_intel)) {
case 1: ImageInfo->FocalplaneUnits = 25.4; break; /* inch */
case 2:
/* According to the information I was using, 2 measn meters.
But looking at the Cannon powershot's files, inches is the only
sensible value. */
ImageInfo->FocalplaneUnits = 25.4;
break;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
case 3: ImageInfo->FocalplaneUnits = 10; break; /* centimeter */
case 4: ImageInfo->FocalplaneUnits = 1; break; /* milimeter */
case 5: ImageInfo->FocalplaneUnits = .001; break; /* micrometer */
}
break;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
case TAG_EXIF_IFD_POINTER:
case TAG_GPS_IFD_POINTER:
case TAG_INTEROP_IFD_POINTER:
if ( ReadNextIFD) {
char *SubdirStart;
int sub_section_index;
switch(tag) {
case TAG_EXIF_IFD_POINTER:
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"found EXIF");
#endif
ImageInfo->sections_found |= FOUND_EXIF;
sub_section_index = SECTION_EXIF;
break;
case TAG_GPS_IFD_POINTER:
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"found GPS");
#endif
ImageInfo->sections_found |= FOUND_GPS;
sub_section_index = SECTION_GPS;
break;
case TAG_INTEROP_IFD_POINTER:
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"found INTEROPERABILITY");
#endif
ImageInfo->sections_found |= FOUND_INTEROP;
sub_section_index = SECTION_INTEROP;
- Fixed some compile warnings and removed bogus comments.
2002-03-08 05:41:51 +08:00
break;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
}
SubdirStart = offset_base + php_ifd_get32u(value_ptr, ImageInfo->motorola_intel);
if (SubdirStart < offset_base || SubdirStart > offset_base+IFDlength) {
php_error(E_WARNING, "Illegal IFD Pointer");
-support for out of section data
2002-03-09 04:56:44 +08:00
return FALSE;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
}
exif_process_IFD_in_JPEG(ImageInfo, SubdirStart, offset_base, IFDlength, sub_section_index);
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"subsection %s done", exif_get_sectionname(sub_section_index));
#endif
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
exif_iif_add_tag( ImageInfo, section_index, exif_get_tagname(tag,tagname,sizeof(tagname)), tag, format, components, value_ptr);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( outside) efree( outside);
-support for out of section data
2002-03-09 04:56:44 +08:00
return TRUE;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
/* }}} */
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* {{{ exif_process_IFD_in_JPEG
* Process one of the nested IFDs directories. */
-support for out of section data
2002-03-09 04:56:44 +08:00
static int exif_process_IFD_in_JPEG(image_info_type *ImageInfo, char *DirStart, char *OffsetBase, unsigned IFDlength, int section_index)
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{
int de;
int NumDirEntries;
int NextDirOffset;
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
-missing efree -incorrect index/length computing: left from jhead #no errors left with test files - controlled manually with hexeditor
2002-03-07 02:11:57 +08:00
php_error(E_NOTICE,"exif_process_IFD_in_JPEG(x%04X(=%d))", IFDlength, IFDlength);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
ImageInfo->sections_found |= FOUND_IFD0;
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
NumDirEntries = php_ifd_get16u(DirStart, ImageInfo->motorola_intel);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if ((DirStart+2+NumDirEntries*12) > (OffsetBase+IFDlength)) {
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
php_error(E_WARNING, "Illegal directory size: x%04X + 2 + x%04X*12 = x%04X > x%04X", (int)DirStart+2-(int)OffsetBase, NumDirEntries, (int)DirStart+2+NumDirEntries*12-(int)OffsetBase, IFDlength);
-streams are no longer an option
2002-03-18 13:32:25 +08:00
return FALSE;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
for (de=0;de<NumDirEntries;de++) {
-support for out of section data
2002-03-09 04:56:44 +08:00
if ( !exif_process_IFD_TAG(ImageInfo,DirStart+2+12*de,OffsetBase,IFDlength,section_index,1)) {
return FALSE;
}
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
/*
* Hack to make it process IDF1 I hope
* There are 2 IDFs, the second one holds the keys (0x0201 and 0x0202) to the thumbnail
*/
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
NextDirOffset = php_ifd_get32u(DirStart+2+12*de, ImageInfo->motorola_intel);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
if (NextDirOffset) {
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* the next line seems false but here IFDlength means length of all IFDs */
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if (OffsetBase + NextDirOffset < OffsetBase || OffsetBase + NextDirOffset > OffsetBase+IFDlength) {
php_error(E_WARNING, "Illegal directory offset");
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
return FALSE;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* That is the IFD for the first thumbnail */
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"expect next IFD to be thumbnail");
#endif
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if (exif_process_IFD_in_JPEG(ImageInfo, OffsetBase + NextDirOffset, OffsetBase, IFDlength, SECTION_THUMBNAIL))
{
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"thumbnail size: 0x%04X", ImageInfo->Thumbnail.size);
#endif
if ( ImageInfo->Thumbnail.filetype != IMAGE_FILETYPE_UNKNOWN
&& ImageInfo->Thumbnail.size
&& ImageInfo->Thumbnail.offset
&& ImageInfo->read_thumbnail)
{
exif_thumbnail_extract(ImageInfo, OffsetBase, IFDlength);
}
return TRUE;
} else {
return FALSE;
}
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
return TRUE;
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* {{{ exif_process_TIFF_in_JPEG
Process a TIFF header in a JPEG file
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
*/
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
static void exif_process_TIFF_in_JPEG(image_info_type *ImageInfo, char *CharBuf, unsigned int length)
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
{
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
/* set the thumbnail stuff to nothing so we can test to see if they get set up */
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if (memcmp(CharBuf, "II", 2) == 0) {
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
ImageInfo->motorola_intel = 0;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
} else if (memcmp(CharBuf, "MM", 2) == 0) {
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
ImageInfo->motorola_intel = 1;
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
} else {
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
php_error(E_WARNING, "Invalid TIFF alignment marker.");
return;
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
/* Check the next two values for correctness. */
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
if (php_ifd_get16u(CharBuf+2, ImageInfo->motorola_intel) != 0x2a
|| php_ifd_get32u(CharBuf+4, ImageInfo->motorola_intel) != 0x08) {
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
php_error(E_WARNING, "Invalid TIFF start (1)");
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
return;
}
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
ImageInfo->sections_found |= FOUND_IFD0;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* First directory starts at offset 8. Offsets starts at 0. */
-missing efree -incorrect index/length computing: left from jhead #no errors left with test files - controlled manually with hexeditor
2002-03-07 02:11:57 +08:00
exif_process_IFD_in_JPEG(ImageInfo, CharBuf+8, CharBuf, length/*-14*/, SECTION_IFD0);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
php_error(E_NOTICE,"exif_process_TIFF_in_JPEG, done");
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
/* Compute the CCD width, in milimeters. */
if (ImageInfo->FocalplaneXRes != 0) {
ImageInfo->CCDWidth = (float)(ImageInfo->ExifImageWidth * ImageInfo->FocalplaneUnits / ImageInfo->FocalplaneXRes);
}
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* {{{ exif_process_APP1
Process an JPEG APP1 block marker
Describes all the drivel that most digital cameras include...
*/
static void exif_process_APP1(image_info_type *ImageInfo, char *CharBuf, unsigned int length)
{
/* Check the APP1 for Exif Identifier Code */
static const uchar ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00};
if (memcmp(CharBuf+2, ExifHeader, 6)) {
php_error(E_WARNING, "Incorrect APP1 Exif Identifier Code");
return;
}
exif_process_TIFF_in_JPEG(ImageInfo,CharBuf+8,length-8);
-comments #just another jhead.c line
2002-03-07 04:52:17 +08:00
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"process Exif done");
#endif
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
/* }}} */
/* {{{ exif_process_APP12
Process an JPEG APP12 block marker used by OLYMPUS
*/
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
static void exif_process_APP12(image_info_type *ImageInfo, char *buffer, unsigned int length)
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
int l1, l2=0;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
if ( (l1 = php_strnlen(buffer+2,length-2)) > 0) {
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
exif_iif_add_tag( ImageInfo, SECTION_APP12, "Company", TAG_NONE, TAG_FMT_STRING, l1, buffer+2);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if ( length > 2+l1+1) {
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
l2 = php_strnlen(buffer+2+l1+1,length-2-l1+1);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
exif_iif_add_tag( ImageInfo, SECTION_APP12, "Info", TAG_NONE, TAG_FMT_STRING, l2, buffer+2+l1+1);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
}
#ifdef EXIF_DEBUG
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
php_error(E_NOTICE,"process section APP12 with l1=%d, l2=%d done", l1, l2);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
}
/* }}} */
/* {{{ exif_scan_JPEG_header
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
* Parse the marker stream until SOS or EOI is seen; */
-support for out of section data
2002-03-09 04:56:44 +08:00
static int exif_scan_JPEG_header(image_info_type *ImageInfo)
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
{
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
int section, sn;
int itemlen;
int marker = 0, last_marker = M_PSEUDO, comment_correction;
int ll, lh, got;
uchar *Data;
size_t fpos, size;
jpeg_sof_info sof_info;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
for(section=0;;section++)
{
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
-streams are no longer an option
2002-03-18 13:32:25 +08:00
fpos = php_stream_tell(ImageInfo->infile);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
php_error(E_NOTICE,"needing section %d @ 0x%08X", ImageInfo->file.count, fpos);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* get marker byte, swallowing possible padding */
/* some software does not count the length bytes of COM section */
/* one company doing so is very much envolved in JPEG... so we accept too */
if ( last_marker==M_COM && comment_correction) comment_correction = 2;
do {
-streams are no longer an option
2002-03-18 13:32:25 +08:00
if ((marker = php_stream_getc(ImageInfo->infile)) == EOF)
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
{
EXIF_ERRLOG_CORRUPT
return FALSE;
}
if ( last_marker==M_COM && comment_correction>0)
{
if ( marker!=0xFF)
{
marker = 0xff;
comment_correction--;
} else {
last_marker = M_PSEUDO; /* stop skipping 0 for M_COM */
}
}
} while (marker == 0xff);
if ( last_marker==M_COM && comment_correction)
return M_EOI; /* ah illegal: char after COM section not 0xFF */
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
-streams are no longer an option
2002-03-18 13:32:25 +08:00
fpos = php_stream_tell(ImageInfo->infile);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
if (marker == 0xff) {
/* 0xff is legal padding, but if we get that many, something's wrong. */
php_error(E_WARNING, "too many padding bytes!");
return FALSE;
}
/* Read the length of the section. */
-streams are no longer an option
2002-03-18 13:32:25 +08:00
lh = php_stream_getc(ImageInfo->infile);
ll = php_stream_getc(ImageInfo->infile);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
itemlen = (lh << 8) | ll;
if (itemlen < 2) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
EXIF_ERRLOG_CORRUPT
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
return FALSE;
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( (sn=exif_file_sections_add(ImageInfo, marker, itemlen+1, NULL))==-1) {
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
return FALSE;
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
Data = ImageInfo->file.list[sn].data;
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
/* Store first two pre-read bytes. */
Data[0] = (uchar)lh;
Data[1] = (uchar)ll;
-streams are no longer an option
2002-03-18 13:32:25 +08:00
got = php_stream_read(ImageInfo->infile, Data+2, itemlen-2); /* Read the whole section. */
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
if (got != itemlen-2) {
-missing efree -incorrect index/length computing: left from jhead #no errors left with test files - controlled manually with hexeditor
2002-03-07 02:11:57 +08:00
php_error(E_WARNING, "error reading from file: got=x%04X(=%d) != itemlen-2=x%04X(=%d)",got, got, itemlen-2, itemlen-2);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
return FALSE;
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
-missing efree -incorrect index/length computing: left from jhead #no errors left with test files - controlled manually with hexeditor
2002-03-07 02:11:57 +08:00
php_error(E_NOTICE,"process section(x%02X=%s) @ x%04X + x%04X(=%d)", marker, exif_get_markername(marker), fpos, itemlen, itemlen);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
switch(marker) {
case M_SOS: /* stop before hitting compressed data */
/* If reading entire image is requested, read the rest of the data. */
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if (ImageInfo->read_all) {
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
/* Determine how much file is left. */
-streams are no longer an option
2002-03-18 13:32:25 +08:00
fpos = php_stream_tell(ImageInfo->infile);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
size = ImageInfo->FileSize - fpos;
if ( (sn=exif_file_sections_add(ImageInfo, M_PSEUDO, size, NULL))==-1)
{
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
return FALSE;
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
Data = ImageInfo->file.list[sn].data;
-streams are no longer an option
2002-03-18 13:32:25 +08:00
got = php_stream_read(ImageInfo->infile, Data, size);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
if (got != size) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
EXIF_ERRLOG_FILEEOF
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
return FALSE;
}
}
return TRUE;
case M_EOI: /* in case it's a tables-only JPEG stream */
php_error(E_WARNING, "No image in jpeg!");
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
return (ImageInfo->sections_found&(~FOUND_COMPUTED)) ? TRUE : FALSE;
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
case M_COM: /* Comment section */
-fix bug for not correct terminated comments -switch to streams @exif functions now support streams using memory streams where @necessary (marcus)
2002-03-17 04:12:17 +08:00
exif_process_COM(ImageInfo, (char *)Data, itemlen);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
break;
case M_EXIF:
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
if ( !(ImageInfo->sections_found&FOUND_IFD0)) {
/*ImageInfo->sections_found |= FOUND_EXIF;*/
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
/* Seen files from some 'U-lead' software with Vivitar scanner
that uses marker 31 later in the file (no clue what for!) */
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
exif_process_APP1(ImageInfo, (char *)Data, itemlen);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
break;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
case M_APP12:
exif_process_APP12(ImageInfo,(char *)Data,itemlen);
break;
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
case M_SOF0:
case M_SOF1:
case M_SOF2:
case M_SOF3:
case M_SOF5:
case M_SOF6:
case M_SOF7:
case M_SOF9:
case M_SOF10:
case M_SOF11:
case M_SOF13:
case M_SOF14:
case M_SOF15:
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
exif_process_SOFn(Data, marker, &sof_info);
ImageInfo->Width = sof_info.width;
ImageInfo->Height = sof_info.height;
if (sof_info.num_components == 3) {
ImageInfo->IsColor = 1;
} else {
ImageInfo->IsColor = 0;
}
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
break;
default:
/* skip any other marker silently. */
break;
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* keep track of last marker */
last_marker = marker;
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"exif_scan_JPEG_header, done");
#endif
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
return TRUE;
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* {{{ exif_scan_thumbnail
* scan JPEG in thumbnail (memory) */
static int exif_scan_thumbnail(image_info_type *ImageInfo)
{
uchar c, *data = ImageInfo->Thumbnail.data;
int n, marker;
size_t length=2, pos=0;
jpeg_sof_info sof_info;
-usability -tests
2002-03-13 00:43:29 +08:00
if ( !data)
{
return FALSE; /* nothing to do here */
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( memcmp(data,"\xFF\xD8\xFF",3))
{
if ( !ImageInfo->Thumbnail.width && !ImageInfo->Thumbnail.height)
{
php_error(E_WARNING,"Thumbnail is not a jpeg image");
}
return FALSE;
}
for (;;) {
pos += length;
if ( pos>=ImageInfo->Thumbnail.size) return FALSE;
c = data[pos++];
if ( pos>=ImageInfo->Thumbnail.size) return FALSE;
if ( c != 0xFF) return FALSE;
n = 8;
while ( (c = data[pos++]) == 0xFF && n--)
{
if ( pos+3>=ImageInfo->Thumbnail.size) return FALSE;
/* +3 = pos++ of next check when reaching marker + 2 bytes for length */
}
if ( c == 0xFF) return FALSE;
marker = c;
length = php_jpg_get16(data+pos);
if ( pos+length>=ImageInfo->Thumbnail.size) return FALSE;
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"Thumnail: process section(x%02X=%s) @ x%04X + x%04X", marker, exif_get_markername(marker), pos, length);
#endif
switch (marker) {
case M_SOF0:
case M_SOF1:
case M_SOF2:
case M_SOF3:
case M_SOF5:
case M_SOF6:
case M_SOF7:
case M_SOF9:
case M_SOF10:
case M_SOF11:
case M_SOF13:
case M_SOF14:
case M_SOF15:
/* handle SOFn block */
exif_process_SOFn(data+pos, marker, &sof_info);
ImageInfo->Thumbnail.height = sof_info.height;
ImageInfo->Thumbnail.width = sof_info.width;
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"Thumnail: size: %d * %d", sof_info.width, sof_info.height);
#endif
return TRUE;
case M_SOS:
case M_EOI:
php_error(E_WARNING,"could not compute size of thumbnail");
return FALSE;
break;
default:
/* just skip */
break;
}
}
php_error(E_WARNING,"could not compute size of thumbnail");
return FALSE;
}
/* }}} */
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* {{{ exif_process_IFD_in_TIFF
* Parse the TIFF header; */
-support for out of section data
2002-03-09 04:56:44 +08:00
static int exif_process_IFD_in_TIFF(image_info_type *ImageInfo, size_t dir_offset, int section_index)
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
int i, sn, num_entries, sub_section_index;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
unsigned char *dir_entry, *tmp;
size_t ifd_size, dir_size, entry_offset, next_offset, entry_length, entry_value, fgot;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
int entry_tag , entry_type;
if ( ImageInfo->FileSize >= dir_offset+2) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( (sn=exif_file_sections_add(ImageInfo, M_PSEUDO, 2, NULL))==-1) {
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
return FALSE;
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
php_error(E_NOTICE,"Read from TIFF: filesize(x%04X), IFD dir(x%04X + x%04X)", ImageInfo->FileSize, dir_offset, 2);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
-streams are no longer an option
2002-03-18 13:32:25 +08:00
php_stream_seek(ImageInfo->infile,dir_offset,SEEK_SET); /* we do not know the order of sections */
php_stream_read(ImageInfo->infile, ImageInfo->file.list[sn].data, 2);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
num_entries = php_ifd_get16u(ImageInfo->file.list[sn].data, ImageInfo->motorola_intel);
dir_size = 2/*num dir entries*/ +12/*length of entry*/*num_entries +4/* offset to next ifd (points to thumbnail or NULL)*/;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if ( ImageInfo->FileSize >= dir_offset+dir_size) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"Read from TIFF: filesize(x%04X), IFD dir(x%04X + x%04X), IFD entries(%d)", ImageInfo->FileSize, dir_offset+2, dir_size-2, num_entries);
#endif
ImageInfo->file.list[sn].size = dir_size;
if ( !(tmp = erealloc(ImageInfo->file.list[sn].data,ImageInfo->file.list[sn].size)))
{
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
return FALSE;
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
ImageInfo->file.list[sn].data = tmp;
-streams are no longer an option
2002-03-18 13:32:25 +08:00
php_stream_read(ImageInfo->infile, ImageInfo->file.list[sn].data+2, dir_size-2);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/*php_error(E_NOTICE,"Dump: %s", exif_char_dump(ImageInfo->file.list[sn].data, dir_size, 1));*/
next_offset = php_ifd_get32u(ImageInfo->file.list[sn].data + dir_size - 4, ImageInfo->motorola_intel);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
php_error(E_NOTICE,"Read from TIFF done, next offset x%04X", next_offset);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
/* now we have the directory we can look how long it should be */
ifd_size = dir_size;
for(i=0;i<num_entries;i++) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
dir_entry = ImageInfo->file.list[sn].data+2+i*12;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
entry_tag = php_ifd_get16u(dir_entry+0, ImageInfo->motorola_intel);
entry_type = php_ifd_get16u(dir_entry+2, ImageInfo->motorola_intel);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if ( entry_type > NUM_FORMATS) {
php_error(E_WARNING,"Error in TIFF: Illegal format, suppose bytes");
- Read IsColor for TIFF
2002-03-05 07:19:27 +08:00
entry_type = TAG_FMT_BYTE;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
entry_length = php_ifd_get32u(dir_entry+4, ImageInfo->motorola_intel) * php_tiff_bytes_per_format[entry_type];
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( entry_length <= 4) {
- disabled debug information - added missing width/height from primary ifd for TIFF
2002-03-05 01:09:24 +08:00
switch(entry_type) {
case TAG_FMT_USHORT:
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
entry_value = php_ifd_get16u(dir_entry+8, ImageInfo->motorola_intel);
- disabled debug information - added missing width/height from primary ifd for TIFF
2002-03-05 01:09:24 +08:00
break;
case TAG_FMT_SSHORT:
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
entry_value = php_ifd_get16s(dir_entry+8, ImageInfo->motorola_intel);
- disabled debug information - added missing width/height from primary ifd for TIFF
2002-03-05 01:09:24 +08:00
break;
case TAG_FMT_ULONG:
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
entry_value = php_ifd_get32u(dir_entry+8, ImageInfo->motorola_intel);
- disabled debug information - added missing width/height from primary ifd for TIFF
2002-03-05 01:09:24 +08:00
break;
case TAG_FMT_SLONG:
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
entry_value = php_ifd_get32s(dir_entry+8, ImageInfo->motorola_intel);
- disabled debug information - added missing width/height from primary ifd for TIFF
2002-03-05 01:09:24 +08:00
break;
}
switch(entry_tag) {
case TAG_IMAGEWIDTH:
case TAG_COMP_IMAGEWIDTH:
ImageInfo->Width = entry_value;
break;
case TAG_IMAGEHEIGHT:
case TAG_COMP_IMAGEHEIGHT:
ImageInfo->Height = entry_value;
break;
- Read IsColor for TIFF
2002-03-05 07:19:27 +08:00
case TAG_PHOTOMETRIC_INTERPRETATION:
switch (entry_value) {
case PMI_BLACK_IS_ZERO:
case PMI_WHITE_IS_ZERO:
case PMI_TRANSPARENCY_MASK:
ImageInfo->IsColor = 0;
break;
case PMI_RGB:
case PMI_PALETTE_COLOR:
case PMI_SEPARATED:
case PMI_YCBCR:
case PMI_CIELAB:
ImageInfo->IsColor = 1;
break;
}
break;
- disabled debug information - added missing width/height from primary ifd for TIFF
2002-03-05 01:09:24 +08:00
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
} else {
entry_offset = php_ifd_get32u(dir_entry+8, ImageInfo->motorola_intel);
/* if entry needs expading ifd cache and entry is at end of current ifd cache. */
/* otherwise there may be huge holes between two entries */
if ( entry_offset + entry_length > dir_offset + ifd_size
&& entry_offset == dir_offset + ifd_size)
{
ifd_size = entry_offset + entry_length - dir_offset;
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"Correcting: 0x%08X + 0x%08X - 0x%08X", entry_offset, entry_length, dir_offset);
#endif
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( ImageInfo->FileSize >= dir_offset + ImageInfo->file.list[sn].size) {
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if ( ifd_size > dir_size) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
ImageInfo->file.list[sn].size = ifd_size;
if ( !(tmp = erealloc(ImageInfo->file.list[sn].data,ImageInfo->file.list[sn].size)))
{
EXIF_ERRLOG_EALLOC
return FALSE;
}
ImageInfo->file.list[sn].data = tmp;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* read values not stored in directory itself */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( dir_offset + ImageInfo->file.list[sn].size > ImageInfo->FileSize) {
php_error(E_WARNING,"1 Error in TIFF: filesize(x%04X) less than size of IFD(x%04X + x%04X)", ImageInfo->FileSize, dir_offset, ifd_size);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
return FALSE;
}
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"Read from TIFF: filesize(x%04X), IFD(x%04X + x%04X)", ImageInfo->FileSize, dir_offset, ifd_size);
#endif
-streams are no longer an option
2002-03-18 13:32:25 +08:00
php_stream_read(ImageInfo->infile, ImageInfo->file.list[sn].data+dir_size, ifd_size-dir_size);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"Read from TIFF, done");
#endif
}
/* now process the tags */
for(i=0;i<num_entries;i++) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
dir_entry = ImageInfo->file.list[sn].data+2+i*12;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
entry_tag = php_ifd_get16u(dir_entry+0, ImageInfo->motorola_intel);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
entry_type = php_ifd_get16u(dir_entry+2, ImageInfo->motorola_intel);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/*entry_length = php_ifd_get32u(dir_entry+4, ImageInfo->motorola_intel);*/
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if (entry_tag == TAG_EXIF_IFD_POINTER ||
entry_tag == TAG_INTEROP_IFD_POINTER ||
entry_tag == TAG_GPS_IFD_POINTER
)
{
switch(entry_tag) {
case TAG_EXIF_IFD_POINTER:
ImageInfo->sections_found |= FOUND_EXIF;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
sub_section_index = SECTION_EXIF;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
break;
case TAG_GPS_IFD_POINTER:
ImageInfo->sections_found |= FOUND_GPS;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
sub_section_index = SECTION_GPS;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
break;
case TAG_INTEROP_IFD_POINTER:
ImageInfo->sections_found |= FOUND_INTEROP;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
sub_section_index = SECTION_INTEROP;
- Fixed some compile warnings and removed bogus comments.
2002-03-08 05:41:51 +08:00
break;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
entry_offset = php_ifd_get32u(dir_entry+8, ImageInfo->motorola_intel);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
php_error(E_NOTICE,"Next IFD %s at x%04X", exif_get_sectionname(sub_section_index), entry_offset);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
#endif
-support for out of section data
2002-03-09 04:56:44 +08:00
exif_process_IFD_in_TIFF(ImageInfo,entry_offset,sub_section_index);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
#ifdef EXIF_DEBUG
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
php_error(E_NOTICE,"Next IFD %s done", exif_get_sectionname(sub_section_index));
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
} else {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( !exif_process_IFD_TAG(ImageInfo,dir_entry,ImageInfo->file.list[sn].data-dir_offset,ifd_size,section_index,0)) {
-support for out of section data
2002-03-09 04:56:44 +08:00
return FALSE;
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
if (next_offset && section_index != SECTION_THUMBNAIL) {
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
/* this should be a thumbnail IFD */
/* the thumbnail itself is stored at Tag=StripOffsets */
#ifdef EXIF_DEBUG
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
php_error(E_NOTICE,"Read next IFD (THUMBNAIL) at x%04X", next_offset);
#endif
-support for out of section data
2002-03-09 04:56:44 +08:00
exif_process_IFD_in_TIFF(ImageInfo,next_offset,SECTION_THUMBNAIL);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
#ifdef EXIF_DEBUG
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
php_error(E_NOTICE,"Read THUMBNAIL @0x%04X + 0x%04X", ImageInfo->Thumbnail.offset, ImageInfo->Thumbnail.size);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
#endif
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if (ImageInfo->Thumbnail.offset && ImageInfo->Thumbnail.size && ImageInfo->read_thumbnail) {
ImageInfo->Thumbnail.data = emalloc(ImageInfo->Thumbnail.size);
if (!ImageInfo->Thumbnail.data) {
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
} else {
-streams are no longer an option
2002-03-18 13:32:25 +08:00
php_stream_seek(ImageInfo->infile,ImageInfo->Thumbnail.offset,SEEK_SET);
fgot = php_stream_read(ImageInfo->infile, ImageInfo->Thumbnail.data, ImageInfo->Thumbnail.size);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( fgot < ImageInfo->Thumbnail.size)
{
EXIF_ERRLOG_THUMBEOF
}
exif_thumbnail_build( ImageInfo);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
}
}
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"Read next IFD (THUMBNAIL) done");
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
}
return TRUE;
} else {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
php_error(E_WARNING,"2 Error in TIFF: filesize(x%04X) less than size of IFD(x%04X)", ImageInfo->FileSize, dir_offset+ImageInfo->file.list[sn].size);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
return FALSE;
}
} else {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
php_error(E_WARNING,"Error in TIFF: filesize(x%04X) less than size of IFD dir(x%04X)", ImageInfo->FileSize, dir_offset+dir_size);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
return FALSE;
}
} else {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
php_error(E_WARNING,"Error in TIFF: filesize(x%04X) less than start of IFD dir(x%04X)", ImageInfo->FileSize, dir_offset+2);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
return FALSE;
}
}
/* }}} */
/* {{{ exif_scan_FILE_header
* Parse the marker stream until SOS or EOI is seen; */
-support for out of section data
2002-03-09 04:56:44 +08:00
static int exif_scan_FILE_header (image_info_type *ImageInfo)
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{
unsigned char file_header[8];
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
int ret = FALSE;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
ImageInfo->FileType = IMAGE_FILETYPE_UNKNOWN;
if ( ImageInfo->FileSize >= 2) {
-streams are no longer an option
2002-03-18 13:32:25 +08:00
php_stream_seek(ImageInfo->infile, 0, SEEK_SET);
php_stream_read(ImageInfo->infile, file_header, 2);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if ( (file_header[0]==0xff) && (file_header[1]==M_SOI)) {
ImageInfo->FileType = IMAGE_FILETYPE_JPEG;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if (exif_scan_JPEG_header(ImageInfo)) {
ret = TRUE;
} else {
php_error(E_WARNING, "Invalid JPEG file: '%s'", ImageInfo->FileName);
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
} else if ( ImageInfo->FileSize >= 8) {
-streams are no longer an option
2002-03-18 13:32:25 +08:00
php_stream_read(ImageInfo->infile, file_header+2, 6);
TIFF support for 'non' digicam files # same as in standard/image.c but here it's more complex
2002-03-08 09:06:59 +08:00
if ( !memcmp(file_header,"II\x2A\x00", 4))
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
ImageInfo->FileType = IMAGE_FILETYPE_TIFF_II;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
ImageInfo->motorola_intel = 0;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"File(%s) has TIFF/II format", ImageInfo->FileName);
#endif
ImageInfo->sections_found |= FOUND_IFD0;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if (exif_process_IFD_in_TIFF(ImageInfo,php_ifd_get32u(file_header+4,ImageInfo->motorola_intel),SECTION_IFD0)) {
ret = TRUE;
} else {
php_error(E_WARNING, "Invalid TIFF file: '%s'", ImageInfo->FileName);
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
else
TIFF support for 'non' digicam files # same as in standard/image.c but here it's more complex
2002-03-08 09:06:59 +08:00
if ( !memcmp(file_header,"MM\x00\x2a", 4))
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
ImageInfo->FileType = IMAGE_FILETYPE_TIFF_MM;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
ImageInfo->motorola_intel = 1;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"File(%s) has TIFF/MM format", ImageInfo->FileName);
#endif
ImageInfo->sections_found |= FOUND_IFD0;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if (exif_process_IFD_in_TIFF(ImageInfo,php_ifd_get32u(file_header+4,ImageInfo->motorola_intel),SECTION_IFD0)) {
ret = TRUE;
} else {
php_error(E_WARNING, "Invalid TIFF file: '%s'", ImageInfo->FileName);
}
TIFF support for 'non' digicam files # same as in standard/image.c but here it's more complex
2002-03-08 09:06:59 +08:00
} else {
php_error(E_WARNING,"File(%s) not supported", ImageInfo->FileName);
return FALSE;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
} else {
php_error(E_WARNING,"File(%s) to small (%d)", ImageInfo->FileName, ImageInfo->FileSize);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
return ret;
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* {{{ exif_discard_imageinfo
Discard data scanned by exif_read_file.
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
*/
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
int exif_discard_imageinfo(image_info_type *ImageInfo)
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
{
int i;
-usability -tests
2002-03-13 00:43:29 +08:00
if (ImageInfo->FileName) efree(ImageInfo->FileName);
if (ImageInfo->UserComment) efree(ImageInfo->UserComment);
if (ImageInfo->UserCommentEncoding) efree(ImageInfo->UserCommentEncoding);
if (ImageInfo->Copyright) efree(ImageInfo->Copyright);
if (ImageInfo->CopyrightPhotographer) efree(ImageInfo->CopyrightPhotographer);
if (ImageInfo->CopyrightEditor) efree(ImageInfo->CopyrightEditor);
if (ImageInfo->Thumbnail.data) efree(ImageInfo->Thumbnail.data);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
for (i=0; i<SECTION_COUNT; i++) {
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
exif_iif_free( ImageInfo, i);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
exif_file_sections_free(ImageInfo);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
memset(ImageInfo, 0, sizeof(*ImageInfo));
return TRUE;
}
/* }}} */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* {{{ exif_read_file
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
*/
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_thumbnail, int read_all TSRMLS_DC)
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
{
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
int ret;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
struct stat st;
-support for out of section data
2002-03-09 04:56:44 +08:00
/* Start with an empty image information structure. */
memset(ImageInfo, 0, sizeof(*ImageInfo));
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
ImageInfo->motorola_intel = 0;
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
-streams are no longer an option
2002-03-18 13:32:25 +08:00
ImageInfo->infile = php_stream_open_wrapper(FileName, "rb", STREAM_MUST_SEEK|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL);
-fix bug for not correct terminated comments -switch to streams @exif functions now support streams using memory streams where @necessary (marcus)
2002-03-17 04:12:17 +08:00
if (!ImageInfo->infile) {
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
php_error(E_WARNING, "Unable to open '%s'", FileName);
return FALSE;
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
ImageInfo->FileName = php_basename(FileName, strlen(FileName), NULL, 0);
ImageInfo->read_thumbnail = read_thumbnail;
ImageInfo->read_all = read_all;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
ImageInfo->Thumbnail.filetype = IMAGE_FILETYPE_UNKNOWN;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-use php_stream_make_seekable
2002-03-18 08:12:47 +08:00
if ( php_stream_is(ImageInfo->infile, PHP_STREAM_IS_STDIO)) {
if (VCWD_STAT(FileName, &st) >= 0) {
/* Store file date/time. */
ImageInfo->FileDateTime = st.st_mtime;
ImageInfo->FileSize = st.st_size;
-streams are no longer an option
2002-03-18 13:32:25 +08:00
php_error(E_NOTICE,"open stream is file: %d", ImageInfo->FileSize);
-use php_stream_make_seekable
2002-03-18 08:12:47 +08:00
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
} else {
-streams are no longer an option
2002-03-18 13:32:25 +08:00
/* *
php_stream *mem_stream;
mem_stream = php_stream_temp_create(TEMP_STREAM_DEFAULT, 20000000);
-use php_stream_make_seekable
2002-03-18 08:12:47 +08:00
ImageInfo->FileSize = php_stream_copy_to_stream(ImageInfo->infile, mem_stream, PHP_STREAM_COPY_ALL);
-streams are no longer an option
2002-03-18 13:32:25 +08:00
php_stream_close(ImageInfo->infile);
ImageInfo->infile = mem_stream;
*
* Use one of these two versions if not using STREAM_MUST_SEEK in php_stream_open_wrapper
*
php_stream *mem_stream;
switch(php_stream_make_seekable( ImageInfo->infile, &mem_stream))
{
default:
case PHP_STREAM_FAILED:
case PHP_STREAM_CRITICAL:
php_stream_close(ImageInfo->infile);
return FALSE;
case PHP_STREAM_UNCHANGED:
case PHP_STREAM_RELEASED:
ImageInfo->infile = mem_stream;
break;
}
-use php_stream_make_seekable
2002-03-18 08:12:47 +08:00
*/
-streams are no longer an option
2002-03-18 13:32:25 +08:00
/* end of second */
-use php_stream_make_seekable
2002-03-18 08:12:47 +08:00
if ( !ImageInfo->FileSize) {
-streams are no longer an option
2002-03-18 13:32:25 +08:00
php_stream_seek(ImageInfo->infile,0,SEEK_END);
ImageInfo->FileSize = php_stream_tell(ImageInfo->infile);
php_stream_seek(ImageInfo->infile,0,SEEK_SET);
-fix bug for not correct terminated comments -switch to streams @exif functions now support streams using memory streams where @necessary (marcus)
2002-03-17 04:12:17 +08:00
}
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
/* Scan the JPEG headers. */
-support for out of section data
2002-03-09 04:56:44 +08:00
ret = exif_scan_FILE_header(ImageInfo);
-fix bug for not correct terminated comments -switch to streams @exif functions now support streams using memory streams where @necessary (marcus)
2002-03-17 04:12:17 +08:00
-streams are no longer an option
2002-03-18 13:32:25 +08:00
php_stream_close(ImageInfo->infile);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
return ret;
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* {{{ proto array|false exif_read_data(string filename [, sections_needed [, sub_arrays[, read_thumbnail]]])
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
Reads header data from the JPEG/TIFF image filename and optionally reads the internal thumbnails */
PHP_FUNCTION(exif_read_data)
Added an optional 2nd parameter 'readall' to read_exif_data.
2001-06-26 17:52:54 +08:00
{
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
pval **p_name, **p_sections_needed, **p_sub_arrays, **p_read_thumbnail, **p_read_all;
-usability -tests
2002-03-13 00:43:29 +08:00
int i, ac = ZEND_NUM_ARGS(), ret, sections_needed=0, sub_arrays=0, read_thumbnail=0, read_all=0;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
image_info_type ImageInfo;
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
char tmp[64], *sections_str, *s;
memset(&ImageInfo, 0, sizeof(ImageInfo));
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
if ((ac < 1 || ac > 4) || zend_get_parameters_ex(ac, &p_name, &p_sections_needed, &p_sub_arrays, &p_read_thumbnail, &p_read_all) == FAILURE) {
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
WRONG_PARAM_COUNT;
}
convert_to_string_ex(p_name);
if(ac >= 2) {
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
convert_to_string_ex(p_sections_needed);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
sections_str = emalloc(strlen(Z_STRVAL_PP(p_sections_needed))+3);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
if ( !sections_str) {
-support for out of section data
2002-03-09 04:56:44 +08:00
EXIF_ERRLOG_EALLOC
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
RETURN_FALSE;
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
sprintf(sections_str,",%s,",Z_STRVAL_PP(p_sections_needed));
/* sections_str DOES start with , and SPACES are NOT allowed in names */
s = sections_str;
while(*++s)
{
if(*s==' ') *s = ',';
}
for (i=0; i<SECTION_COUNT; i++)
{
sprintf(tmp,",%s,",exif_get_sectionname(i));
if ( strstr(sections_str,tmp))
{
sections_needed |= 1<<i;
}
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( sections_str) efree(sections_str);
-missing efree -incorrect index/length computing: left from jhead #no errors left with test files - controlled manually with hexeditor
2002-03-07 02:11:57 +08:00
/* now see what we need */
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
sections_str = exif_get_sectionlist(sections_needed);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( !sections_str) {
RETURN_FALSE;
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
php_error(E_NOTICE,"Sections needed: %s", sections_str[0] ? sections_str : "None");
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( sections_str) efree(sections_str);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if(ac >= 3) {
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
convert_to_long_ex(p_sub_arrays);
sub_arrays = Z_LVAL_PP(p_sub_arrays);
}
if(ac >= 4) {
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
convert_to_long_ex(p_read_thumbnail);
read_thumbnail = Z_LVAL_PP(p_read_thumbnail);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
if(ac >= 5) {
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
convert_to_long_ex(p_read_all);
read_all = Z_LVAL_PP(p_read_all);
}
/* parameters 3,4 will be working in later versions.... */
read_all = 0; /* just to make function work for 4.2 tree */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
ret = exif_read_file(&ImageInfo, Z_STRVAL_PP(p_name), read_thumbnail, read_all TSRMLS_CC);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
sections_str = exif_get_sectionlist(ImageInfo.sections_found);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( sections_str) php_error(E_NOTICE,"sections found: %s", sections_str[0] ? sections_str : "None");
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
ImageInfo.sections_found |= FOUND_COMPUTED;/* do not inform about in debug*/
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if (ret==FALSE || array_init(return_value) == FAILURE || (sections_needed && !(sections_needed&ImageInfo.sections_found))) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
exif_discard_imageinfo(&ImageInfo);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
RETURN_FALSE;
}
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
php_error(E_NOTICE,"generate section FILE");
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
/* now we can add our information */
-usability -tests
2002-03-13 00:43:29 +08:00
exif_iif_add_str( &ImageInfo, SECTION_FILE, "FileName", ImageInfo.FileName);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
exif_iif_add_int( &ImageInfo, SECTION_FILE, "FileDateTime", ImageInfo.FileDateTime);
exif_iif_add_int( &ImageInfo, SECTION_FILE, "FileSize", ImageInfo.FileSize);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
exif_iif_add_int( &ImageInfo, SECTION_FILE, "FileType", ImageInfo.FileType);
-usability -tests
2002-03-13 00:43:29 +08:00
exif_iif_add_str( &ImageInfo, SECTION_FILE, "SectionsFound", sections_str ? sections_str : "NONE");
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"generate section COMPUTED");
#endif
-missing efree -incorrect index/length computing: left from jhead #no errors left with test files - controlled manually with hexeditor
2002-03-07 02:11:57 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
if (ImageInfo.Width>0 && ImageInfo.Height>0) {
-usability -tests
2002-03-13 00:43:29 +08:00
exif_iif_add_str( &ImageInfo, SECTION_COMPUTED, "html", "width=\"%d\" height=\"%d\"", ImageInfo.Width, ImageInfo.Height);
-Support for IFD Arrays #necessary for update/write operations
2002-03-08 09:09:54 +08:00
exif_iif_add_int( &ImageInfo, SECTION_COMPUTED, "Height", ImageInfo.Height);
exif_iif_add_int( &ImageInfo, SECTION_COMPUTED, "Width", ImageInfo.Width);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
-change IsColor from non zero to 1 -new test and example for documentation
2002-03-08 19:33:46 +08:00
exif_iif_add_int( &ImageInfo, SECTION_COMPUTED, "IsColor", ImageInfo.IsColor);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
if (ImageInfo.FocalLength) {
-usability -tests
2002-03-13 00:43:29 +08:00
exif_iif_add_str( &ImageInfo, SECTION_COMPUTED, "FocalLength", "%4.1fmm", ImageInfo.FocalLength);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
if(ImageInfo.CCDWidth) {
-usability -tests
2002-03-13 00:43:29 +08:00
exif_iif_add_str( &ImageInfo, SECTION_COMPUTED, "35mmFocalLength", "%dmm", (int)(ImageInfo.FocalLength/ImageInfo.CCDWidth*35+0.5));
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
if(ImageInfo.CCDWidth) {
-usability -tests
2002-03-13 00:43:29 +08:00
exif_iif_add_str( &ImageInfo, SECTION_COMPUTED, "CCDWidth", "%dmm", (int)ImageInfo.CCDWidth);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
}
if(ImageInfo.ExposureTime>0) {
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
if(ImageInfo.ExposureTime <= 0.5) {
-usability -tests
2002-03-13 00:43:29 +08:00
exif_iif_add_str( &ImageInfo, SECTION_COMPUTED, "ExposureTime", "%0.3f s (1/%d)", ImageInfo.ExposureTime, (int)(0.5 + 1/ImageInfo.ExposureTime));
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
} else {
-usability -tests
2002-03-13 00:43:29 +08:00
exif_iif_add_str( &ImageInfo, SECTION_COMPUTED, "ExposureTime", "%0.3f s", ImageInfo.ExposureTime);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
}
if(ImageInfo.ApertureFNumber) {
-usability -tests
2002-03-13 00:43:29 +08:00
exif_iif_add_str( &ImageInfo, SECTION_COMPUTED, "ApertureFNumber", "f/%.1f", ImageInfo.ApertureFNumber);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
if(ImageInfo.Distance) {
if(ImageInfo.Distance<0) {
-usability -tests
2002-03-13 00:43:29 +08:00
exif_iif_add_str( &ImageInfo, SECTION_COMPUTED, "FocusDistance", "Infinite");
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
} else {
-usability -tests
2002-03-13 00:43:29 +08:00
exif_iif_add_str( &ImageInfo, SECTION_COMPUTED, "FocusDistance", "%0.2fm", ImageInfo.Distance);
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
if (ImageInfo.UserComment) {
-usability -tests
2002-03-13 00:43:29 +08:00
exif_iif_add_str( &ImageInfo, SECTION_COMPUTED, "UserComment", ImageInfo.UserComment);
if ( ImageInfo.UserCommentEncoding && strlen(ImageInfo.UserCommentEncoding)) {
exif_iif_add_str( &ImageInfo, SECTION_COMPUTED, "UserCommentEncoding", ImageInfo.UserCommentEncoding);
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
}
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
+Support for Photographer/Editor Copyright as associative array as this is a new feature the change (optionally being an array) has to be mentioned in documentation. +New function exif_headername can be used to read the internal Tag namelist (was mainly created for debugging purpose but maybe somone writes code to create/update exif headers here). +An internal version number is present. +A testpage is supplied test.txt describes how the test works. +The oldfunction read_exif_data has got an alias exif_read_data As the old version of this module is very buggy i decided to implement the testpage (test.txt) and to create the alias. The test script only works with the alias as the old version does not pass tests. By the way it seems a good way to prepend 'exif_' to all functions in the module.
2002-03-01 12:01:26 +08:00
-usability -tests
2002-03-13 00:43:29 +08:00
exif_iif_add_str( &ImageInfo, SECTION_COMPUTED, "Copyright", ImageInfo.Copyright);
exif_iif_add_str( &ImageInfo, SECTION_COMPUTED, "Copyright.Photographer", ImageInfo.CopyrightPhotographer);
exif_iif_add_str( &ImageInfo, SECTION_COMPUTED, "Copyright.Editor", ImageInfo.CopyrightEditor);
-return size of thumbnail even if it not read
2002-03-12 21:49:40 +08:00
if ( ImageInfo.Thumbnail.size) {
if ( read_thumbnail) {
-usability -tests
2002-03-13 00:43:29 +08:00
/* not exif_iif_add_str : this is a buffer */
-return size of thumbnail even if it not read
2002-03-12 21:49:40 +08:00
exif_iif_add_tag( &ImageInfo, SECTION_THUMBNAIL, "THUMBNAIL", TAG_NONE, TAG_FMT_UNDEFINED, ImageInfo.Thumbnail.size, ImageInfo.Thumbnail.data);
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( !ImageInfo.Thumbnail.width || !ImageInfo.Thumbnail.height) {
-usability -tests
2002-03-13 00:43:29 +08:00
/* try to evaluate if thumbnail data is present */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
exif_scan_thumbnail( &ImageInfo);
}
-handling
2002-03-13 08:21:51 +08:00
}
if ( ImageInfo.Thumbnail.width && ImageInfo.Thumbnail.height) {
exif_iif_add_int( &ImageInfo, SECTION_COMPUTED, "Thumbnail.Height", ImageInfo.Thumbnail.height);
exif_iif_add_int( &ImageInfo, SECTION_COMPUTED, "Thumbnail.Width", ImageInfo.Thumbnail.width);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( sections_str) efree(sections_str);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"adding image infos");
#endif
add_assoc_image_info( return_value, sub_arrays, &ImageInfo, SECTION_FILE);
add_assoc_image_info( return_value, 1, &ImageInfo, SECTION_COMPUTED);
add_assoc_image_info( return_value, sub_arrays, &ImageInfo, SECTION_ANY_TAG);
add_assoc_image_info( return_value, sub_arrays, &ImageInfo, SECTION_IFD0);
add_assoc_image_info( return_value, 1, &ImageInfo, SECTION_THUMBNAIL);
add_assoc_image_info( return_value, sub_arrays, &ImageInfo, SECTION_COMMENT);
add_assoc_image_info( return_value, sub_arrays, &ImageInfo, SECTION_EXIF);
add_assoc_image_info( return_value, sub_arrays, &ImageInfo, SECTION_GPS);
add_assoc_image_info( return_value, sub_arrays, &ImageInfo, SECTION_INTEROP);
add_assoc_image_info( return_value, sub_arrays, &ImageInfo, SECTION_FPIX);
add_assoc_image_info( return_value, sub_arrays, &ImageInfo, SECTION_APP12);
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"Discarding info");
#endif
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
exif_discard_imageinfo(&ImageInfo);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"read_exif_data done");
#endif
}
/* }}} */
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* {{{ proto string|false exif_thumbnail(string filename [, &width, &height])
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
Reads the embedded thumbnail */
PHP_FUNCTION(exif_thumbnail)
{
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
zval **p_name, **p_width, **p_height;
int ret, arg_c = ZEND_NUM_ARGS();
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
image_info_type ImageInfo;
memset(&ImageInfo, 0, sizeof(ImageInfo));
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( (arg_c != 1 && arg_c != 3) || zend_get_parameters_ex(arg_c, &p_name, &p_width, &p_height) == FAILURE) {
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
WRONG_PARAM_COUNT;
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
convert_to_string_ex(p_name);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( arg_c == 3) {
zval_dtor(*p_width);
zval_dtor(*p_height);
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
ret = exif_read_file(&ImageInfo, Z_STRVAL_PP(p_name), 1, 0 TSRMLS_CC);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
if (ret==FALSE) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
exif_discard_imageinfo(&ImageInfo);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
RETURN_FALSE;
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
}
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
if ( !ImageInfo.Thumbnail.data || !ImageInfo.Thumbnail.size) {
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"No thumbnail data %d %d, %d x %d", ImageInfo.Thumbnail.data, ImageInfo.Thumbnail.size, ImageInfo.Thumbnail.width, ImageInfo.Thumbnail.height);
#endif
if ( arg_c == 3)
{
ZVAL_LONG( *p_width, ImageInfo.Thumbnail.width);
ZVAL_LONG( *p_height, ImageInfo.Thumbnail.height);
}
exif_discard_imageinfo(&ImageInfo);
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
RETURN_FALSE;
Changed file to match CODING_STANDARDS except function names that match jhead.c project. I think it is acceptable using naming conventions of other projects when borrowing code.
2002-02-28 20:20:17 +08:00
}
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
php_error(E_NOTICE,"Returning thumbnail(%d)", ImageInfo.Thumbnail.size);
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
ZVAL_STRINGL( return_value, ImageInfo.Thumbnail.data, ImageInfo.Thumbnail.size, 1);
if ( arg_c == 3)
{
-usability -tests
2002-03-13 00:43:29 +08:00
if ( !ImageInfo.Thumbnail.width || !ImageInfo.Thumbnail.height)
{
exif_scan_thumbnail( &ImageInfo);
}
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
ZVAL_LONG( *p_width, ImageInfo.Thumbnail.width);
ZVAL_LONG( *p_height, ImageInfo.Thumbnail.height);
}
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
php_error(E_NOTICE,"Discarding info");
#endif
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
exif_discard_imageinfo(&ImageInfo);
-fixes -changed internal data structures #nearly stripped off all jhead code
2002-03-06 03:47:19 +08:00
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#ifdef EXIF_DEBUG
-new working thumbnail code -everything uses new data structures -new function exif_thumbnail #nearly stripped off all jhead code @read_exif_data is now an alias for exif_read_data @ important to differenciate old/new version for tests) @new function exif_tagname returns the names of tags @new function exif_thumbnail extracts embedded thumbnail (Marcus) #switched to internal version 1.2
2002-03-06 17:31:32 +08:00
php_error(E_NOTICE,"exif_thumbnail done");
-Added TIFF support -Changed parameters after checking bugdatabase and discussion with Rasmus: 1st=Filename, 2nd=NeededSections # 3rd=Thumbnail, 4th=All # 3rd and 4th parameter are currently diabled because the code # does not work correctly (will correct this in later versions). # Changing the parameters will not cause any problems because the # old parameter functions never found their way in documentation # and the they did not work... @-Added TIFF support @-Changed parameters after checking bugdatabase and discussion with Rasmus @ 1st=Filename, 2nd=NeededSections @ If the 2nd parameter is not present or 0 or '' the function will return @ a result array even if no data was read from file. # Personally i consider a default behaviour to generate no array if # no data is present as a bad idea because here we can generate as # much information as possible.... @ If the 2nd parameter is a string then that string describes which @ sections have to be present in the file to generate a result array. @ If none of the needed section is found the result will be false. @ Section strings are "ANY_TAG","IFD0","COMMENT","EXIF","GPS","INTEROP" @ "FPIX","APP12". Each string has to be separated by a colon. So @ "COMMENT,EXIF" returns an array if either a comment or an Exif @ section is present. "IFD0" is standard datastructure in a TIFF/JPEG @ file that contains image information. "EXIF" is the Exif structure @ of TIFF/JPEG (IFD0 subdirectory). "GPS", "INTEROP", "FPIX", "APP12" @ are additional IFD0 subdirectories. The APP12 support is an @ experimental Olympus support. # Do not worry this is no problem, it is safe. @(Marcus)
2002-03-04 14:21:58 +08:00
#endif
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
/* {{{ proto long getimagesize(string imagefile)
Get the type of an image */
PHP_FUNCTION(exif_imagetype)
{
zval **arg1;
New PHP streams...
2002-03-16 05:03:08 +08:00
php_stream * stream;
int rsrc_id;
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
int itype = 0;
if (ZEND_NUM_ARGS() != 1)
WRONG_PARAM_COUNT;
if (zend_get_parameters_ex(1, &arg1) == FAILURE)
WRONG_PARAM_COUNT;
Streams now make more use of the memory manager, so tracking down leaking streams should be easier. # I hate these big commits
2002-03-18 06:50:59 +08:00
stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb", IGNORE_PATH|ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
New PHP streams...
2002-03-16 05:03:08 +08:00
if (stream == NULL) {
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
RETURN_FALSE;
}
New PHP streams...
2002-03-16 05:03:08 +08:00
rsrc_id = ZEND_REGISTER_RESOURCE(NULL, stream, php_file_le_stream());
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
TSRMLS related work on streams, as discussed with Zeev. # Should be the last "broad" commit for a while # Don't forget to make clean ; make
2002-03-19 02:54:32 +08:00
itype = itype = php_getimagetype(stream, NULL TSRMLS_CC);
-support for array tags -better memory handling -support for thumbnails in TIFF format -new functions exif_imagetype @-new function exif_imagetype @-exif_thumbnail fupports thumbnails in TIFF format and can return size @ of thumbnail
2002-03-12 14:14:45 +08:00
zend_list_delete(rsrc_id);
if ( itype == IMAGE_FILETYPE_UNKNOWN) {
RETURN_FALSE;
} else {
ZVAL_LONG( return_value, itype);
}
}
/* }}} */
@ New module for reading EXIF header data from JPEG files. Most digital @ cameras will embed all sorts of information about a picture inside the @ jpeg images it generates. (Rasmus) exif module
2000-05-24 18:33:18 +08:00
#endif
Clean up EXIF code and give up on extracting the embedded thumbnail for now. Will return to it when I find some real specs on it. Also added a couple of missing copyright headers
2000-05-30 00:34:19 +08:00
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
+Added UNICODE support for Comments +Added Description,Artist +Added missing memory deallocation +Corrected error with multiple comments +Corrected handling of ExifVersion, Tag has 4 ASCII characters *WITHOUT* NUL +Corrected handling of Thumbnailsize if current source detects size < 0 +Changed all fields to char* that do not have a maximum length in EXIF standard +Undocumented second Parameter ReadAll frees memory to early -> moved to third position default changed to false -> faster +New second Parameter [true|false] to specify whether or not to to read thumbnails -> reading is timeconsumpting suppose default should be false -> done so
2002-02-28 09:16:27 +08:00
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
Clean up EXIF code and give up on extracting the embedded thumbnail for now. Will return to it when I find some real specs on it. Also added a couple of missing copyright headers
2000-05-30 00:34:19 +08:00
*/
-fix bug for not correct terminated comments -switch to streams @exif functions now support streams using memory streams where @necessary (marcus)
2002-03-17 04:12:17 +08:00
Reference in New Issue Copy Permalink