Brian Wolff
66c80ed6e4
follow-up r86195 - That $valid really was reachable :P
...
follow-up r86169 - It appears when merging PNGMetadataExtractor.php, I somehow deleted $duration (whoops!)
2011-04-16 16:23:08 +00:00
Brian Wolff
84148848f9
(Follow-up r86169) Needed supress warnings around iconv
...
Also make it try to detect if a jpeg file comment has textual data, or is random binary stuff.
2011-04-16 15:53:08 +00:00
Sam Reed
0bd50926ca
Remove some unused variables
...
Fix typo in wfDeprecated usage
Fix some more unreachable code
2011-04-16 11:17:14 +00:00
Brian Wolff
74f16767e7
Merge to trunk everything in img_metadata branch.
...
Hope I did this in an ok fashion. svn merge --re-integrate was giving me issues
so I just essentially over-wrote my working copy with the version at img_metadata.
2011-04-16 01:23:15 +00:00
