@@ -1117,14 +1117,8 @@ inlineToOpenXML opts (Image attr alt (src, tit)) = do
11171117 inlinesToOpenXML opts alt
11181118 Right (img, mt) -> do
11191119 ident <- ("rId"++) `fmap` getUniqueId
1120− (xpt,ypt) <- case imageSize img of
1121− Right size -> return $
1122− desiredSizeInPoints opts attr size
1123− Left msg -> do
1124− liftIO $ warn $
1125− "Could not determine image size in `" ++
1126− src ++ "': " ++ msg
1127− return (120,120)
1120+ let (xpt,ypt) = desiredSizeInPoints opts attr
1121+ (either (const def) id (imageSize img))
11281122 -- 12700 emu = 1 pt
11291123 let (xemu,yemu) = fitToPage (xpt * 12700, ypt * 12700) (pageWidth * 12700)
11301124 let cNvPicPr = mknode "pic:cNvPicPr" [] $