Attachment 122110 Details for Bug 94371 – implement jpx streams with depth < 8

[patch] implement jpx streams with depth < 8

94371.patch (text/plain), 1.19 KB, created by Thomas Freitag on 2016-03-04 12:41:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2016-03-04 12:41:17 UTC

Size: 1.19 KB

patch

obsolete

>diff --git a/poppler/JPEG2000Stream.cc b/poppler/JPEG2000Stream.cc
>index 4c632d7..d1a61ba 100644
>--- a/poppler/JPEG2000Stream.cc
>+++ b/poppler/JPEG2000Stream.cc
>@@ -188,6 +188,7 @@ void JPXStream::init()
>       }
>       unsigned char *cdata = (unsigned char *)priv->image->comps[component].data;
>       int adjust = 0;
>+      int depth = priv->image->comps[component].prec;
>       if (priv->image->comps[component].prec > 8)
> 	adjust = priv->image->comps[component].prec - 8;
>       int sgndcorr = 0;
>@@ -201,6 +202,8 @@ void JPXStream::init()
> 	  if (unlikely(r > 255))
> 	    r = 255;
>         }
>+        if (depth < 8)
>+          r = r << (8 - depth);
> 	*(cdata++) = r;
>       }
>     }
>@@ -335,6 +338,7 @@ void JPXStream::init()
>       }
>       unsigned char *cdata = (unsigned char *)priv->image->comps[component].data;
>       int adjust = 0;
>+      int depth = priv->image->comps[component].prec;
>       if (priv->image->comps[component].prec > 8)
> 	adjust = priv->image->comps[component].prec - 8;
>       int sgndcorr = 0;
>@@ -348,6 +352,8 @@ void JPXStream::init()
> 	  if (unlikely(r > 255))
> 	    r = 255;
>         }
>+        if (depth < 8)
>+          r = r << (8 - depth);
> 	*(cdata++) = r;
>       }
>     }

Actions: View | Splinter Review

Attachments on bug 94371: 122084 | 122110 | 122136 | 122138

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.