clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,714 Commits 491 Branches 1,363 Tags 837 MiB
79e4f5fd22
Commit Graph

239 Commits

Author SHA1 Message Date
Rasmus Lerdorf
0779da509b Don't use long as a type 2002-08-13 04:11:51 +00:00
Marcus Boerger
4294f2a93d use of php_error_docref 2002-08-12 20:18:25 +00:00
Marcus Boerger
abb280e9f7 left on debug infos 
#overlooked that in diff
 2002-08-07 16:35:48 +00:00
Marcus Boerger
36986742ae Ignore additional thumbnails 
#anybody interested in expansion to support multiple thumbnails?
 2002-08-07 16:19:43 +00:00
Dan Kalowsky
e410749014 Keeping function prototype variables the same 2002-08-06 03:48:15 +00:00
Marcus Boerger
7477baf33a datatype inconsistency found by Dan Kalowsky 2002-08-06 03:32:16 +00:00
Marcus Boerger
dfe1a65faf -fix warnings in windows build 2002-07-31 21:34:37 +00:00
Marcus Boerger
0383426860 -decode several MarkerNotes 
-correct offset information in debug mode
@exif_read_data() can decode MarkerNote of several Cameras. (Marcus)
 2002-07-28 17:21:51 +00:00
Marcus Boerger
8b853592b1 Missing Photoshop tags 2002-07-26 17:09:02 +00:00
Marcus Boerger
4a8dd1255f -handling of thumbnails in sub IFDs (the Photoshopway for TIFF) 
-Some Photoshop specific tags
#after the last patches this finally fixes all warnings and errors in bug #18405
 2002-07-25 00:52:30 +00:00
Marcus Boerger
837fa41da5 -naming convention 
-better notices
-(D)WORD are unsigned datatypes
-started to split tygs into different arrays that would allow to handle vendor specific tags after detection of their markers
#BUT simply i do not have any vendor specific image tags...
 2002-07-24 00:05:41 +00:00
Marcus Boerger
469266e4a2 added some more tags from WinXP 
changed conersion for TAG_FMT_SBYTE & BYTE
#second change fixes unnecessary conversion timeout
#found by Johan Hultgren <johan@6thgear.se>
 2002-07-22 15:07:12 +00:00
Marcus Boerger
b4c3a0f06e added EXIF Version 2.2 Tags 2002-07-22 11:36:17 +00:00
Marcus Boerger
21da93abe1 unify error messages & notices 
# this fixes exif again since it was broken by message unify
 2002-07-21 22:38:23 +00:00
Marcus Boerger
b634ec9e30 -fix datatypes for some vriables 
-fix comment for function exif_process_CME
-force return parameters to be passed by reference
#this should kill warnings on win systems as found by Edin
 2002-07-02 22:38:37 +00:00
Derick Rethans
dc900d4f77 Unify error messages part 1 2002-06-29 17:40:28 +00:00
Marcus Boerger
46a373ba70 modified test3 (old one had a warning) 2002-06-24 22:22:42 +00:00
Marcus Boerger
cccc4e3c5a register IMAGETYPE_<xxx> constants in image.c as they are needed 
there.
 2002-06-24 19:36:26 +00:00
Marcus Boerger
48bdf08edb @GetImageSize now allways set fields unknown to 0 and new Imagetype 
@iff. (Marcus)
 2002-06-24 19:19:08 +00:00
Marcus Boerger
1f56d4ba08 -imagetype2mimetype renamed to image_type_to_mime_type 2002-06-23 00:43:11 +00:00
Marcus Boerger
16a753d3c2 -new test for WinXP tags 2002-06-23 00:39:34 +00:00
Marcus Boerger
b21a4d7fa9 -fix test results 2002-06-23 00:38:25 +00:00
Marcus Boerger
966e1d450e -corrected test result 2002-06-23 00:26:34 +00:00
Marcus Boerger
d782c712ca -exif version 
-missing constant (and notice)
-corrected error messages
 2002-06-22 23:43:16 +00:00
Marcus Boerger
4c53f954be @exif_read_data returns mime-type now for image and thumbnail And exif_thumbnail now optionally returns imagetype. (Marcus) 
#So now you can use imagetype2filetype with exif_thumbnail
 2002-06-22 18:38:33 +00:00
foobar
3b9401a3ed DO NOT use C++ comments! 2002-05-19 00:02:07 +00:00
Frank M. Kromann
45881d2b40 Fixing Win32 compilation of exit 2002-04-15 22:23:20 +00:00
Marcus Boerger
ef5c0f7cc6 support for WinXP tags (thanks to Rui Carmo) 2002-04-14 20:47:21 +00:00
foobar
8581de0fe2 Fix the build. 
# Marcus, do you TEST build at all before you commit?!
 2002-04-12 22:02:28 +00:00
Marcus Boerger
50d957cd7a Ini settings for internal encoding and decoding of Unicode and JIS formatted user comments. 
@- Ini settings for encoding/decoding Unicode/JIS user comments (Marcus)
 2002-04-12 16:35:56 +00:00
Rasmus Lerdorf
eb43795ccb This exif test was failing because the \0's in the expected output had 
disappeared.  It may be CVS doing this.  I have put the nulls back, but we
may have to mark this as a binary file in th cvswrappers, or rewrite the
test to not output nulls.
 2002-04-12 01:07:46 +00:00
Marcus Boerger
f140a8dd0d fix exif using vspprintf 2002-04-10 01:18:52 +00:00
Marcus Boerger
59f332800f correcting some more whitespace 
#hope that's it
 2002-04-07 23:30:01 +00:00
Marcus Boerger
bba604b3d8 -fix warnings 
-fix layout
 2002-04-07 18:45:30 +00:00
Marcus Boerger
313503aa92 -testing unicode user-comment 2002-04-05 18:05:48 +00:00
Marcus Boerger
8a388954ea -correct length for ASCII 
-global encoding variables
#will become ini settings explanation on what to set follows then
 2002-04-05 17:59:29 +00:00
Marcus Boerger
b3a96ba509 aligning # 
#mentioned by derick
 2002-04-05 16:02:54 +00:00
Marcus Boerger
d0de28ece4 Unicode is now based on php_mb_convert_encoding if available 
#currently only ISO-8859-15 is supported as result
#maybe this will become an ini setting
 2002-04-05 01:25:53 +00:00
Marcus Boerger
bc6d302fcf removed calls to wctomb, wcstombs 
#leave UNICODE to user
 2002-04-04 20:45:53 +00:00
Derick Rethans
755b8542e4 - Fix as suggested my Marcus 2002-04-03 19:50:02 +00:00
Markus Fischer
700b9eb734 - Nuke *FETCH macros. 2002-04-01 08:05:17 +00:00
Marcus Boerger
0fd732214a #cleanup source 2002-04-01 03:15:57 +00:00
Markus Fischer
ab2194d1da - Fix compilation. 
# Marcus, could you please fix the whitespace in this file?
 2002-03-31 23:00:31 +00:00
Marcus Boerger
e4f4386758 -compiler warnings 2002-03-30 14:28:05 +00:00
Marcus Boerger
efad4e4281 #and when the test does not result like you expect -> change test data 
-fix test image
 2002-03-29 01:33:30 +00:00
Marcus Boerger
d0be2aabe4 -fix possible problem on low memory 
-fix problem on failure
 2002-03-29 01:32:26 +00:00
Hartmut Holzgraefe
d2b8655775 pproto fix 2002-03-25 01:08:39 +00:00
Marcus Boerger
eb8c6b4696 -removed old streams test code 2002-03-21 20:16:22 +00:00
Marcus Boerger
ac6ae669e4 -fixed memory handling 2002-03-21 19:59:08 +00:00
Marcus Boerger
671829bff4 #ws 2002-03-21 13:16:03 +00:00
Wez Furlong
659a071e3d Streams are all tracked as resources now. 
Add some logic that will help track down leaks
when debug is enabled.
 2002-03-20 14:21:30 +00:00
Wez Furlong
c9d5e13738 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-18 18:54:32 +00:00
Marcus Boerger
68f4e7c328 -streams are no longer an option 2002-03-18 05:32:25 +00:00
Marcus Boerger
c645babd8a -use php_stream_make_seekable 2002-03-18 00:12:47 +00:00
Wez Furlong
d2d8762267 Streams now make more use of the memory manager, so tracking down 
leaking streams should be easier.
# I hate these big commits
 2002-03-17 22:50:59 +00:00
Marcus Boerger
20f2e63289 #removed code to track down error in streams 2002-03-17 12:16:29 +00:00
Marcus Boerger
bcad7a593a -quick hack to bug in streams....but where? 2002-03-16 21:19:17 +00:00
Marcus Boerger
d50102b6ab -disabling debug 
#Wez: i have an error when closing the original file after stream copy...
 2002-03-16 20:25:51 +00:00
Marcus Boerger
fe9cb020ae -fix bug for not correct terminated comments 
-switch to streams
@exif functions now support streams using memory streams where @necessary (marcus)
 2002-03-16 20:12:17 +00:00
Wez Furlong
0f65280cb5 New PHP streams... 2002-03-15 21:03:08 +00:00
Marcus Boerger
e03a8a995c -handling 2002-03-13 00:21:51 +00:00
Marcus Boerger
659833a066 -remove filetime from test 
# that's magic - now the test should work on all installations
 2002-03-13 00:20:48 +00:00
Sascha Schumann
5cba3a99c2 extension converted automatically to PHP_NEW_EXTENSION. Manually confirmed 2002-03-12 16:44:00 +00:00
Marcus Boerger
3c47fb91e8 -usability 
-tests
 2002-03-12 16:43:29 +00:00
Marcus Boerger
8a622d0668 -return size of thumbnail even if it not read 2002-03-12 13:49:40 +00:00
Marcus Boerger
f96696e2a1 -reflect changes 
-find image from run-tests.php
 2002-03-12 12:42:45 +00:00
Marcus Boerger
06a242169c -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 06:14:45 +00:00
Marcus Boerger
42e478c7aa -support for out of section data 2002-03-08 20:56:44 +00:00
Sander Roobol
58a52f93bc Fixed many tests, mostly incorrect paths. 2002-03-08 19:16:19 +00:00
Marcus Boerger
27242a7a46 -change IsColor from non zero to 1 
-new test and example for documentation
 2002-03-08 11:33:46 +00:00
Marcus Boerger
355150ebde -Changes according to exif.c 1.55 2002-03-08 01:11:03 +00:00
Marcus Boerger
9363bfad7e -Support for IFD Arrays 
#necessary for update/write operations
 2002-03-08 01:09:54 +00:00
Marcus Boerger
d994d0b47d TIFF support for 'non' digicam files 
# same as in standard/image.c but here it's more complex
 2002-03-08 01:06:59 +00:00
foobar
88750086cc - Fixed some compile warnings and removed bogus comments. 2002-03-07 21:41:51 +00:00
Marcus Boerger
ac80c9d00e - standard test scripts for exif 
#hope all problems in exif are resolved now
 2002-03-06 22:01:45 +00:00
Marcus Boerger
0a0942b193 -comments 
#just another jhead.c line
 2002-03-06 20:52:17 +00:00
Marcus Boerger
15d74e343b -comments 2002-03-06 20:24:29 +00:00
Marcus Boerger
3dc95db8b7 -updated test to reflect third parameter of exif_read_data 2002-03-06 18:21:50 +00:00
Marcus Boerger
0b5759f7bf -missing efree 
-incorrect index/length computing: left from jhead
#no errors left with test files - controlled manually with hexeditor
 2002-03-06 18:11:57 +00:00
Marcus Boerger
efddda3d6d -updated test 2002-03-06 09:32:02 +00:00
Marcus Boerger
0ecd2f0876 -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 09:31:32 +00:00
Marcus Boerger
088450efce -fixes 
-changed internal data structures
#nearly stripped off all jhead code
 2002-03-05 19:47:19 +00:00
Marcus Boerger
ce4bf31268 - also test TIFF support in GetImageSize 2002-03-04 23:20:48 +00:00
Marcus Boerger
6b2a074330 - Read IsColor for TIFF 2002-03-04 23:19:27 +00:00
Marcus Boerger
a7403576e1 - disabled debug information 
- added missing width/height from primary ifd for TIFF
 2002-03-04 17:09:24 +00:00
Marcus Boerger
be5908b06c -addition to last change: php_image.h must be included now 2002-03-04 09:29:06 +00:00
Rasmus Lerdorf
83e6dbcf19 Let getimagesize() and read_exif_data() share the same constants to 
promote a little bit of code reuse here on two very similar problems.
 2002-03-04 07:21:30 +00:00
Marcus Boerger
9c8ad6614f -Updated test.txt and provided test.php 
# simply including test.txt
@Added test.php/txt to have a possibility to check ext/exif
@(Marcus)
 2002-03-04 06:26:07 +00:00
Marcus Boerger
642ab24df1 -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 06:21:58 +00:00
Marcus Boerger
442773abb3 Wrong brackets by rasmus...but sorry the fault was mine because i missed them... 
i also decided to call the first working version 1.0a

by the way: currently i am working on tiff files and it looks like it may work
 2002-03-02 15:43:19 +00:00
Rasmus Lerdorf
15ba6402bd Fix a couple of warnings 2002-03-02 08:37:28 +00:00
Marcus Boerger
0857bdbcde +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 04:01:26 +00:00
Marcus Boerger
05b13da525 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 12:20:17 +00:00
Sebastian Bergmann
7d983e5faf Fix headers. 2002-02-28 06:26:50 +00:00
Marcus Boerger
98ebd1c28b +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 01:16:27 +00:00
Sebastian Bergmann
38933514e1 Update headers. 2001-12-11 15:32:16 +00:00
foobar
f1397d5339 Unified the configure messages. 2001-11-30 19:00:13 +00:00
Stig Bakken
689252082c * zend_module_entry change: apino, debug and zts are moved first, 
see README.EXTENSIONS file for upgrade help.
@Introduced extension version numbers (Stig)
 2001-10-11 23:33:59 +00:00
Jeroen van Wolffelaar
c033288573 Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know. 2001-09-25 21:58:48 +00:00
Derick Rethans
78747bd2df - Don't wrap lines... this is annoying while coding. 2001-09-09 13:29:31 +00:00
foobar
5296d29b59 Killed a compile warning. 2001-08-22 08:34:04 +00:00
Rasmus Lerdorf
b732d8da35 Missing define 2001-08-16 23:31:54 +00:00
Rasmus Lerdorf
2b4c2a2ff5 Commit a bit of random plane hacking. 
- A slight exif fix from the latest version of jhead
 - Make ext_skel's confirm_module_compiled function consistent
 2001-08-16 00:16:00 +00:00
Zeev Suraski
f6f6c4d7e6 Whitespace 2001-08-11 16:39:07 +00:00
Frank M. Kromann
57946eb3be Adding missing TSRM macros. 
Kill signed/unsigned compiler warning
 2001-08-06 16:58:27 +00:00
Rasmus Lerdorf
628c21275f support for multiple exif comments 
@ - Enhance read_exif_data() to support multiple comment tags (Rasmus)
 2001-08-04 22:35:03 +00:00
Rasmus Lerdorf
cc40cdc7d7 Fix newly introduced crash on a file-not-found 2001-08-04 18:08:13 +00:00
foobar
a9f850f34e fixed a memleak. 2001-08-04 03:06:12 +00:00
foobar
faaeee3705 Fixed bug: #11784 (combined with fixes Rasmus committed..) 2001-08-04 01:56:40 +00:00
Rasmus Lerdorf
9b0df45da7 Change from E_ERROR to E_WARNING in the exif extension 
@ Change from E_ERROR to E_WARNING in the exif extension (Rasmus)
 2001-08-03 22:33:10 +00:00
Zeev Suraski
797a079a95 More TSRMLS_FETCH work, and a bit of cleanup 2001-07-30 06:18:13 +00:00
foobar
0d3832ccdb Added an optional 2nd parameter 'readall' to read_exif_data. 2001-06-26 09:52:54 +00:00
foobar
087398621f fix build. 2001-06-23 11:26:24 +00:00
Rasmus Lerdorf
81e2cf03ac Fix folding and clean up some extensions 2001-06-06 13:06:12 +00:00
Rasmus Lerdorf
25c3a3a39d 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 13:12:10 +00:00
Stig Bakken
1beda9ee1e * include "config.h" if HAVE_CONFIG_H is defined (for standalone dso build) 2001-05-24 10:07:29 +00:00
Andi Gutmans
f84637d4b8 - Change strncpy()'s to strlcpy()'s 2001-05-02 22:49:48 +00:00
Andi Gutmans
4c823e8a89 - Change macros from V_ to VCWD_ because of AIX name clash 2001-04-30 12:45:02 +00:00
Daniel Beulshausen
f085ab8a33 use V_STAT 2001-04-03 22:36:27 +00:00
Daniel Beulshausen
a29dc27c1c resolve realpath if in v-dir mode 2001-04-03 21:39:18 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Rasmus Lerdorf
f74998a783 Kill a couple of warnings 2001-01-17 06:40:48 +00:00
Rasmus Lerdorf
808da6dbb5 Attempt by Matt Bonneau to get thumbnail extraction working 
(no need to bring this into the 4.0.4 branch)
 2000-12-15 17:25:20 +00:00
Hartmut Holzgraefe
df7c2eeabc make genfunclist in phpdoc happy 2000-11-23 12:16:35 +00:00
Hartmut Holzgraefe
1f6878e912 2nd step towards auto-credits 2000-11-20 10:33:33 +00:00
Daniel Beulshausen
b6f0d041f9 deleted a few unnecceasary defines and added the Release_TS_Inline path to the libpath 2000-08-24 17:48:30 +00:00
Rasmus Lerdorf
b8f6e9dd03 Add Olympus-specific tags to read_exif_data() 
@ Add Olympus-specific tags to read_exif_data() (Rasmus)
 2000-08-01 22:05:15 +00:00
Zeev Suraski
168ccfc133 Disable the hash_apply() protection on hashes that persist across requests - it's unsafe 
because we may be aborted at any point
@- Fixed a possible data corruption in case of a huge amount of aborted requests (Zeev)
 2000-07-11 14:29:38 +00:00
Zeev Suraski
10e0303620 Get rid of a warning 2000-06-25 17:54:52 +00:00
Zeev Suraski
a6b201c18c PHPAPI is invalid here... 2000-06-25 17:54:14 +00:00
Frank M. Kromann
618c98179b making exif module compile on win32 with new directory structure 2000-06-12 20:31:45 +00:00
Andi Gutmans
2b0a8049db - Update module project files to include: 
- HAVE_MODULE=1
- ZEND_WIN32
- PHP_WIN32
- COMPILE_DL_MODULE
- ZTS=1
 2000-06-10 09:00:31 +00:00
Andi Gutmans
a9d4cf9023 - 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 08:48:01 +00:00
Andi Gutmans
3701bc4207 - ARG_COUNT(ht) -> ZEND_NUM_ARGS() mega patch 2000-06-05 19:47:54 +00:00
Frank M. Kromann
2bfe0001da Getting exif module to compile on win32 2000-06-05 16:42:03 +00:00
Rasmus Lerdorf
ebd9e89fcf 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-29 16:34:19 +00:00
Frank M. Kromann
3d939af4a3 Adding PHP_EXIF directive to actually include the functions 2000-05-24 11:35:09 +00:00
Frank M. Kromann
f9fc8f78ab Adding project for new exif module 2000-05-24 11:32:44 +00:00
Rasmus Lerdorf
3c61d015c2 @ 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 10:33:18 +00:00