diff --git a/JuicyPixels.cabal b/JuicyPixels.cabal --- a/JuicyPixels.cabal +++ b/JuicyPixels.cabal @@ -1,5 +1,5 @@ Name: JuicyPixels -Version: 3.2.7.1 +Version: 3.2.7.2 Synopsis: Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance) Description: <> @@ -28,7 +28,7 @@ Source-Repository this Type: git Location: git://github.com/Twinside/Juicy.Pixels.git - Tag: v3.2.7.1 + Tag: v3.2.7.2 Flag Mmap Description: Enable the file loading via mmap (memory map) diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,6 +1,10 @@ Change log ========== +v3.2.7.2 June 2016 +------------------ + * Fix: no more libjpeg warning when decoding Juicy.Pixels encoded images. + v3.2.7.1 May 2016 ----------------- * Fix: some wrongly infinitely looping JPEG decoding diff --git a/src/Codec/Picture/Jpg/Types.hs b/src/Codec/Picture/Jpg/Types.hs --- a/src/Codec/Picture/Jpg/Types.hs +++ b/src/Codec/Picture/Jpg/Types.hs @@ -444,8 +444,16 @@ put JpgHuffmanTableMarker >> put (TableList $ map fst tables) putFrame (JpgIntervalRestart size) = put JpgRestartInterval >> put (RestartInterval size) -putFrame (JpgScanBlob hdr blob) = - put JpgStartOfScan >> put hdr >> putLazyByteString blob +putFrame (JpgScanBlob hdr blob) = do + put JpgStartOfScan + put hdr + putLazyByteString blob + putWord8 0 -- AKA the libjpeg pleaser, for some unknown reason + -- libjpeg raise a warning "invalid end of data segment". + -- so dumbly pad, seems to make the warning go away (and + -- I don't want to invest that much time looking for that). + -- + -- Ok this is a crummy fix.... putFrame (JpgScans kind hdr) = put kind >> put hdr