Hello community, here is the log from the commit of package ghc-JuicyPixels for openSUSE:Factory checked in at 2015-09-02 00:35:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-JuicyPixels (Old) and /work/SRC/openSUSE:Factory/.ghc-JuicyPixels.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-JuicyPixels" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-JuicyPixels/ghc-JuicyPixels.changes 2015-08-27 08:56:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-JuicyPixels.new/ghc-JuicyPixels.changes 2015-09-02 00:36:01.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 31 06:16:56 UTC 2015 - mimi.vx@gmail.com + +- update to 3.2.6.1 +* Fix: handling of negative height & width in bitmap format +* Fix: regression on Tiff parsing. + +------------------------------------------------------------------- Old: ---- JuicyPixels-3.2.6.tar.gz New: ---- JuicyPixels-3.2.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-JuicyPixels.spec ++++++ --- /var/tmp/diff_new_pack.tudBxX/_old 2015-09-02 00:36:02.000000000 +0200 +++ /var/tmp/diff_new_pack.tudBxX/_new 2015-09-02 00:36:02.000000000 +0200 @@ -20,7 +20,7 @@ # no useful debuginfo for Haskell packages without C sources %global debug_package %{nil} Name: ghc-JuicyPixels -Version: 3.2.6 +Version: 3.2.6.1 Release: 0 Summary: Picture loading/serialization License: BSD-3-Clause ++++++ JuicyPixels-3.2.6.tar.gz -> JuicyPixels-3.2.6.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JuicyPixels-3.2.6/JuicyPixels.cabal new/JuicyPixels-3.2.6.1/JuicyPixels.cabal --- old/JuicyPixels-3.2.6/JuicyPixels.cabal 2015-08-17 20:14:41.000000000 +0200 +++ new/JuicyPixels-3.2.6.1/JuicyPixels.cabal 2015-08-23 16:38:47.000000000 +0200 @@ -1,5 +1,5 @@ Name: JuicyPixels -Version: 3.2.6 +Version: 3.2.6.1 Synopsis: Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance) Description: <<data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMAAAADABAMAAACg8nE0AAAAElBMVEUAAABJqDSTWEL/qyb///8AAABH/1GTAAAAAXRSTlMAQObYZgAAAN5JREFUeF7s1sEJgFAQxFBbsAV72v5bEVYWPwT/XDxmCsi7zvHXavYREBDI3XP2GgICqBBYuwIC+/rVayPUAyAg0HvIXBcQoDFDGnUBgWQQ2Bx3AYFaRoBpAQHWb3bt2ARgGAiCYFFuwf3X5HA/McgGJWI2FdykCv4aBYzmKwDwvl6NVmUAAK2vlwEALK7fo88GANB6HQsAAAAAAAAA7P94AQCzswEAAAAAAAAAAAAAAAAAAICzh4UAO4zWAYBfRutHA4Bn5C69JhowAMGoBaMWDG0wCkbBKBgFo2AUAACPmegUST/IJAAAAABJRU5ErkJggg==>> @@ -28,7 +28,7 @@ Source-Repository this Type: git Location: git://github.com/Twinside/Juicy.Pixels.git - Tag: v3.2.6 + Tag: v3.2.6.1 Flag Mmap Description: Enable the file loading via mmap (memory map) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JuicyPixels-3.2.6/changelog new/JuicyPixels-3.2.6.1/changelog --- old/JuicyPixels-3.2.6/changelog 2015-08-17 20:14:41.000000000 +0200 +++ new/JuicyPixels-3.2.6.1/changelog 2015-08-23 16:38:47.000000000 +0200 @@ -1,6 +1,11 @@ Change log ========== +v3.2.6.1 AUgust 2015 +-------------------- + * Fix: handling of negative height & width in bitmap format. + * Fix: regression on Tiff parsing. + V3.2.6 August 2015 -------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JuicyPixels-3.2.6/src/Codec/Picture/Bitmap.hs new/JuicyPixels-3.2.6.1/src/Codec/Picture/Bitmap.hs --- old/JuicyPixels-3.2.6/src/Codec/Picture/Bitmap.hs 2015-08-17 20:14:40.000000000 +0200 +++ new/JuicyPixels-3.2.6.1/src/Codec/Picture/Bitmap.hs 2015-08-23 16:38:47.000000000 +0200 @@ -23,7 +23,7 @@ import Control.Applicative( (<$>) ) #endif -import Control.Monad( when, forM_ ) +import Control.Monad( when, foldM_, forM_ ) import Control.Monad.ST ( ST, runST ) import Data.Maybe( fromMaybe ) import qualified Data.Vector as V @@ -45,6 +45,7 @@ , skip ) +import Data.Int( Int32 ) import Data.Word( Word32, Word16, Word8 ) import qualified Data.ByteString as B import qualified Data.ByteString.Lazy as L @@ -93,14 +94,14 @@ data BmpInfoHeader = BmpInfoHeader { size :: !Word32 -- Header size in bytes - , width :: !Word32 - , height :: !Word32 + , width :: !Int32 + , height :: !Int32 , planes :: !Word16 -- Number of colour planes , bitPerPixel :: !Word16 , bitmapCompression :: !Word32 , byteImageSize :: !Word32 - , xResolution :: !Word32 -- ^ Pixels per meter - , yResolution :: !Word32 -- ^ Pixels per meter + , xResolution :: !Int32 -- ^ Pixels per meter + , yResolution :: !Int32 -- ^ Pixels per meter , colorCount :: !Word32 , importantColours :: !Word32 } @@ -113,27 +114,27 @@ instance Binary BmpInfoHeader where put hdr = do putWord32le $ size hdr - putWord32le $ width hdr - putWord32le $ height hdr + putWord32le . fromIntegral $ width hdr + putWord32le . fromIntegral $ height hdr putWord16le $ planes hdr putWord16le $ bitPerPixel hdr putWord32le $ bitmapCompression hdr putWord32le $ byteImageSize hdr - putWord32le $ xResolution hdr - putWord32le $ yResolution hdr + putWord32le . fromIntegral $ xResolution hdr + putWord32le . fromIntegral $ yResolution hdr putWord32le $ colorCount hdr putWord32le $ importantColours hdr get = do readSize <- getWord32le - readWidth <- getWord32le - readHeight <- getWord32le + readWidth <- fromIntegral <$> getWord32le + readHeight <- fromIntegral <$> getWord32le readPlanes <- getWord16le readBitPerPixel <- getWord16le readBitmapCompression <- getWord32le readByteImageSize <- getWord32le - readXResolution <- getWord32le - readYResolution <- getWord32le + readXResolution <- fromIntegral <$> getWord32le + readYResolution <- fromIntegral <$> getWord32le readColorCount <- getWord32le readImportantColours <- getWord32le return BmpInfoHeader { @@ -253,54 +254,54 @@ VS.unsafeFreeze buff decodeImageRGB8 :: BmpInfoHeader -> B.ByteString -> Image PixelRGB8 -decodeImageRGB8 (BmpInfoHeader { width = w, height = h }) str = Image wi hi stArray - where wi = fromIntegral w - hi = fromIntegral h - stArray = runST $ do - arr <- M.new (fromIntegral $ w * h * 3) - forM_ [hi - 1, hi - 2 .. 0] (readLine arr) - VS.unsafeFreeze arr - - stride = linePadding 24 wi - - readLine :: forall s. M.MVector s Word8 -> Int -> ST s () - readLine arr line = - let readIndex = (wi * 3 + stride) * line - lastIndex = wi * (hi - 1 - line + 1) * 3 - writeIndex = wi * (hi - 1 - line) * 3 - - inner _ writeIdx | writeIdx >= lastIndex = return () - inner readIdx writeIdx = do - (arr `M.unsafeWrite` writeIdx ) (str `B.index` (readIdx + 2)) - (arr `M.unsafeWrite` (writeIdx + 1)) (str `B.index` (readIdx + 1)) - (arr `M.unsafeWrite` (writeIdx + 2)) (str `B.index` readIdx) - inner (readIdx + 3) (writeIdx + 3) - - in inner readIndex writeIndex +decodeImageRGB8 (BmpInfoHeader { width = w, height = h }) str = Image wi hi stArray where + wi = fromIntegral w + hi = abs $ fromIntegral h + stArray = runST $ do + arr <- M.new (fromIntegral $ w * abs h * 3) + if h > 0 then + foldM_ (readLine arr) 0 [0 .. hi - 1] + else + foldM_ (readLine arr) 0 [hi - 1, hi - 2 .. 0] + VS.unsafeFreeze arr + + stride = linePadding 24 wi + + readLine :: forall s. M.MVector s Word8 -> Int -> Int -> ST s Int + readLine arr readIndex line = inner readIndex writeIndex where + lastIndex = wi * (hi - 1 - line + 1) * 3 + writeIndex = wi * (hi - 1 - line) * 3 + + inner readIdx writeIdx | writeIdx >= lastIndex = return $ readIdx + stride + inner readIdx writeIdx = do + (arr `M.unsafeWrite` writeIdx ) (str `B.index` (readIdx + 2)) + (arr `M.unsafeWrite` (writeIdx + 1)) (str `B.index` (readIdx + 1)) + (arr `M.unsafeWrite` (writeIdx + 2)) (str `B.index` readIdx) + inner (readIdx + 3) (writeIdx + 3) decodeImageY8 :: BmpInfoHeader -> B.ByteString -> Image Pixel8 -decodeImageY8 (BmpInfoHeader { width = w, height = h }) str = Image wi hi stArray - where wi = fromIntegral w - hi = fromIntegral h - stArray = runST $ do - arr <- M.new . fromIntegral $ w * h - forM_ [hi - 1, hi - 2 .. 0] (readLine arr) - VS.unsafeFreeze arr - - stride = linePadding 8 wi - - readLine :: forall s. M.MVector s Word8 -> Int -> ST s () - readLine arr line = - let readIndex = (wi + stride) * line - lastIndex = wi * (hi - 1 - line + 1) - writeIndex = wi * (hi - 1 - line) - - inner _ writeIdx | writeIdx >= lastIndex = return () - inner readIdx writeIdx = do - (arr `M.unsafeWrite` writeIdx) (str `B.index` readIdx) - inner (readIdx + 1) (writeIdx + 1) - - in inner readIndex writeIndex +decodeImageY8 (BmpInfoHeader { width = w, height = h }) str = Image wi hi stArray where + wi = fromIntegral w + hi = abs $ fromIntegral h + stArray = runST $ do + arr <- M.new . fromIntegral $ w * abs h + if h > 0 then + foldM_ (readLine arr) 0 [0 .. hi - 1] + else + foldM_ (readLine arr) 0 [hi - 1, hi - 2 .. 0] + VS.unsafeFreeze arr + + stride = linePadding 8 wi + + readLine :: forall s. M.MVector s Word8 -> Int -> Int -> ST s Int + readLine arr readIndex line = inner readIndex writeIndex where + lastIndex = wi * (hi - 1 - line + 1) + writeIndex = wi * (hi - 1 - line) + + inner readIdx writeIdx | writeIdx >= lastIndex = return $ readIdx + stride + inner readIdx writeIdx = do + (arr `M.unsafeWrite` writeIdx) (str `B.index` readIdx) + inner (readIdx + 1) (writeIdx + 1) pixelGet :: Get PixelRGB8 @@ -313,7 +314,7 @@ metadataOfHeader :: BmpInfoHeader -> Metadatas metadataOfHeader hdr = - Met.simpleMetadata Met.SourceBitmap (width hdr) (height hdr) dpiX dpiY + Met.simpleMetadata Met.SourceBitmap (width hdr) (abs $ height hdr) dpiX dpiY where dpiX = Met.dotsPerMeterToDotPerInch . fromIntegral $ xResolution hdr dpiY = Met.dotsPerMeterToDotPerInch . fromIntegral $ yResolution hdr @@ -337,6 +338,12 @@ readed <- bytesRead when (readed > fromIntegral (dataOffset hdr)) (fail "Invalid bmp image, data in header") + + when (width bmpHeader <= 0) + (fail $ "Invalid bmp width, " ++ show (width bmpHeader)) + + when (height bmpHeader == 0) + (fail $ "Invalid bmp height (0) ") let bpp = fromIntegral $ bitPerPixel bmpHeader :: Int paletteColorCount @@ -454,8 +461,8 @@ bitPerPixel = fromIntegral bpp, bitmapCompression = 0, -- no compression byteImageSize = imagePixelSize, - xResolution = dpiX, - yResolution = dpiY, + xResolution = fromIntegral dpiX, + yResolution = fromIntegral dpiY, colorCount = 0, importantColours = paletteSize } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JuicyPixels-3.2.6/src/Codec/Picture/Tiff/Types.hs new/JuicyPixels-3.2.6.1/src/Codec/Picture/Tiff/Types.hs --- old/JuicyPixels-3.2.6/src/Codec/Picture/Tiff/Types.hs 2015-08-17 20:14:41.000000000 +0200 +++ new/JuicyPixels-3.2.6.1/src/Codec/Picture/Tiff/Types.hs 2015-08-23 16:38:47.000000000 +0200 @@ -238,7 +238,9 @@ , ifdType = TypeLong , ifdCount = 1 } = do align ifd $ do - subIfds <- fmap (cleanImageFileDirectory endianness) <$> getP endianness + let byOffset = sortBy (compare `on` ifdOffset) + cleansIfds = fmap (cleanImageFileDirectory endianness) + subIfds <- cleansIfds . byOffset <$> getP endianness cleaned <- fetchExtended endianness maxi $ sortBy (compare `on` ifdOffset) subIfds pure $ ExifIFD [(ifdIdentifier fd, ifdExtended fd) | fd <- cleaned] {- @@ -339,8 +341,10 @@ readed <- bytesRead skip . fromIntegral $ fromIntegral (hdrOffset hdr) - readed let endian = hdrEndianness hdr + byOffset = sortBy (compare `on` ifdOffset) + cleanIfds = fmap (cleanImageFileDirectory endian) - ifd <- fmap (cleanImageFileDirectory endian) <$> getP endian + ifd <- cleanIfds . byOffset <$> getP endian cleaned <- fetchExtended endian (B.length raw) ifd return (hdr, cleaned)