diff options
| author | dinoex <dinoex@FreeBSD.org> | 2011-11-26 15:02:29 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2011-11-26 15:02:29 +0800 |
| commit | 2d62ceee797a95aea1a76f94b71d52e61ced65f6 (patch) | |
| tree | 538cdc7ac24f31cbb1708b0c403a2689370b3397 /graphics/jasper | |
| parent | f19d57861ec9721913068ce055933df09e66ca8b (diff) | |
| download | freebsd-ports-gnome-2d62ceee797a95aea1a76f94b71d52e61ced65f6.tar.gz freebsd-ports-gnome-2d62ceee797a95aea1a76f94b71d52e61ced65f6.tar.zst freebsd-ports-gnome-2d62ceee797a95aea1a76f94b71d52e61ced65f6.zip | |
- fix assertion on some JPEG2000 pictures encoded in (RGBA)
PR: 162812
Sumbitted by: Sebastian Klemke
Obtained from: Debian, Mathew Eis
Feature safe: yes
Diffstat (limited to 'graphics/jasper')
| -rw-r--r-- | graphics/jasper/Makefile | 2 | ||||
| -rw-r--r-- | graphics/jasper/files/patch-jpc_dec.c | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile index b5d6c6eb0939..5b08fa263935 100644 --- a/graphics/jasper/Makefile +++ b/graphics/jasper/Makefile @@ -7,7 +7,7 @@ PORTNAME= jasper PORTVERSION= 1.900.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/ \ ${MASTER_SITE_IMAGEMAGICK} diff --git a/graphics/jasper/files/patch-jpc_dec.c b/graphics/jasper/files/patch-jpc_dec.c new file mode 100644 index 000000000000..957e14cb134d --- /dev/null +++ b/graphics/jasper/files/patch-jpc_dec.c @@ -0,0 +1,17 @@ +--- src/libjasper/jpc/jpc_dec.c 2007-01-19 22:43:07.000000000 +0100 ++++ src/libjasper/jpc/jpc_dec.c 2011-11-09 15:04:49.000000000 +0100 +@@ -1069,12 +1069,12 @@ + /* Apply an inverse intercomponent transform if necessary. */ + switch (tile->cp->mctid) { + case JPC_MCT_RCT: +- assert(dec->numcomps == 3); ++ assert(dec->numcomps == 3 || dec->numcomps == 4); + jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data, + tile->tcomps[2].data); + break; + case JPC_MCT_ICT: +- assert(dec->numcomps == 3); ++ assert(dec->numcomps == 3 || dec->numcomps == 4); + jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data, + tile->tcomps[2].data); + break;
\ No newline at end of file |