Commit graph

4 commits

Author SHA1 Message Date
Brian Wolff
7a5d1f4c4b (follow-up r86169) per Reedy, the $val = $val thing is weird.
Most of these were actually here going way way back to the dark ages
(although they were hidden as $tags[$tag] = $val; with $val being the same as $tags[$tag])
2011-04-16 17:25:48 +00:00
Sam Reed
5cdff32cd1 Followup r86169, move unreachable debug statement 2011-04-16 11:11:49 +00:00
Brian Wolff
e596cfcf78 (Follow-up r86169) Fix three minor issues Reedy found.
* Some strings were using double quotes needed the dollar sign escaped.
  (the strings had to do with detecting obscure text encodings for IPTC)
* FormatMetadata::collapseContactInfo should be static (for some reason I never got any E_STRICT on this. I think the api suppresses E_STRICT somehow...)
* Exif::get/makeFormattedMetadata method (which appears to no longer be used, and
  never was used, but kept in for compatability just in case) called
  another function without required argument. Also got changed from public
  to private somehow (which is generally a bad idea, especially when its only
  reason for being there is to preserve back-compat). Marked these functions
  as deprecated while I'm at it since they really should not be used.
2011-04-16 02:19:05 +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