[58499] trunk/dports/graphics/jasper

[jmr at macports.org]

Revision: 58499
          http://trac.macports.org/changeset/58499
Author:   jmr at macports.org
Date:     2009-09-29 15:48:32 -0700 (Tue, 29 Sep 2009)
Log Message:
-----------
jasper: fix handling of 4-component images (#21675)

Modified Paths:
--------------
    trunk/dports/graphics/jasper/Portfile
    trunk/dports/graphics/jasper/files/patch-src_libjasper_jpc_jpc_dec.c.diff

Modified: trunk/dports/graphics/jasper/Portfile
===================================================================
--- trunk/dports/graphics/jasper/Portfile	2009-09-29 22:42:36 UTC (rev 58498)
+++ trunk/dports/graphics/jasper/Portfile	2009-09-29 22:48:32 UTC (rev 58499)
@@ -5,7 +5,7 @@
 
 name            jasper
 version         1.900.1
-revision        4
+revision        5
 categories      graphics
 platforms       darwin
 maintainers     nomaintainer

Modified: trunk/dports/graphics/jasper/files/patch-src_libjasper_jpc_jpc_dec.c.diff
===================================================================
--- trunk/dports/graphics/jasper/files/patch-src_libjasper_jpc_jpc_dec.c.diff	2009-09-29 22:42:36 UTC (rev 58498)
+++ trunk/dports/graphics/jasper/files/patch-src_libjasper_jpc_jpc_dec.c.diff	2009-09-29 22:48:32 UTC (rev 58499)
@@ -5,7 +5,7 @@
  	switch (tile->cp->mctid) {
  	case JPC_MCT_RCT:
 -		assert(dec->numcomps == 3);
-+		if (dec->numcomps != 3) {
++		if (dec->numcomps != 3 && dec->numcomps != 4) {
 +			jas_eprintf("dec->numcomps (%d) != 3\n", dec->numcomps);
 +			return -2;
 +		}
@@ -14,7 +14,7 @@
  		break;
  	case JPC_MCT_ICT:
 -		assert(dec->numcomps == 3);
-+		if (dec->numcomps != 3) {
++		if (dec->numcomps != 3 && dec->numcomps != 4) {
 +			jas_eprintf("dec->numcomps (%d) != 3\n", dec->numcomps);
 +			return -3;
 +		}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090929/d5186b5c/attachment.html>