git.iko.soy/typeable/pandoc
on master help sign in
ImageSize: ignore unknown exif header tag rather than crashing.

Some images seem to have tag type of 256, which was causing a runtime error.

commit5cb53a48d541b97b5f60968715a5969133196d70 authorJohn MacFarlane <jgm@berkeley.edu> dateThu 19 Jun 2014, 14:30 (12 years ago) parent84391a8
1 file changed+2−1
compare with master
unifiedsplit
src/Text/Pandoc/ImageSize.hs+2−1
src/Text/Pandoc/ImageSize.hs+2−1
@@ -217,7 +217,7 @@ exifHeader hdr = do
217217 numentries <- getWord16
218218 let ifdEntry = do
219219 tag <- getWord16 >>= \t ->
220− maybe (fail $ "Unknown tag type " ++ show t) return
220+ maybe (return UnknownTagType) return
221221 (M.lookup t tagTypeTable)
222222 dataFormat <- getWord16
223223 numComponents <- getWord32
@@ -337,6 +337,7 @@ data TagType = ImageDescription
337337 | SensingMethod
338338 | FileSource
339339 | SceneType
340+ | UnknownTagType
340341 deriving (Show, Eq, Ord)
341342
342343tagTypeTable :: M.Map Word16 TagType