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 22:00:40 +0000 (17:00 -0500)
commita98260c39f1c0ccdad004784cbc9440376766082
treef449c1b7adef0bf76d6616ee37b6db6589b3552f
parent27089564b6453deaf7b4ffe7cc5f5f290b6d892b
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