Merge fix for issue 1331 from 1.4.
authorDavid Shaw <dshaw@jabberwocky.com>
Thu, 15 Dec 2011 21:46:28 +0000 (16:46 -0500)
committerDavid Shaw <dshaw@jabberwocky.com>
Thu, 15 Dec 2011 21:46:28 +0000 (16:46 -0500)
commit5a0ed4a2cc809b8595c8907e91649987775731d2
treee4945e6d9b5907faee491e6d8156e765025c02e6
parent28c6cef128219ffdf548d6f5acf819aa2303fe0d
Merge fix for issue 1331 from 1.4.

* photoid.c (generate_photo_id): Check for the JPEG magic numbers
instead of JFIF since some programs generate an EXIF header first.
g10/photoid.c