Update to 1.900.0:

1) The wavelet transform code has been rewritten in order to be more
cache efficient (via loop tiling).  As a few individuals have noted,
the old code could often result in an excessive number of cache misses.

2) Some man pages have been added to the distribution as provided
by Roland Stigge.

3) Some simple timer routines have been added to facilitate performance
measurements.

4) Numerous bugs have been fixed (e.g., memory leaks, JP2 box processing
problem, etc.).

5) Some name space pollution issues have been resolved.

6) A few compiler warnings have been fixed.

6 files changed, 22 insertions, 31 deletions

diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 7cfbe2436b5..0fa239832a2 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2006/12/02 22:32:59 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2007/01/06 23:28:07 wiz Exp $
 #
 
-DISTNAME=	jasper-1.701.0
-PKGREVISION=	2
+DISTNAME=	jasper-1.900.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ece.uvic.ca/~mdadams/jasper/software/
 EXTRACT_SUFX=	.zip
diff --git a/graphics/jasper/PLIST b/graphics/jasper/PLIST
index 3e644b7fb7b..b1bc4ecc896 100644
--- a/graphics/jasper/PLIST
+++ b/graphics/jasper/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:34 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/01/06 23:28:07 wiz Exp $
 bin/imgcmp
 bin/imginfo
 bin/jasper
+bin/tmrdemo
 include/jasper/jas_cm.h
 include/jasper/jas_config.h
 include/jasper/jas_config2.h
@@ -16,11 +17,16 @@ include/jasper/jas_math.h
 include/jasper/jas_seq.h
 include/jasper/jas_stream.h
 include/jasper/jas_string.h
+include/jasper/jas_tmr.h
 include/jasper/jas_tvp.h
 include/jasper/jas_types.h
 include/jasper/jas_version.h
 include/jasper/jasper.h
 lib/libjasper.la
+man/man1/imgcmp.1
+man/man1/imginfo.1
+man/man1/jasper.1
+man/man1/jiv.1
 share/doc/jasper/jasper.pdf
 share/doc/jasper/jpeg2000.pdf
 @dirrm share/doc/jasper
diff --git a/graphics/jasper/distinfo b/graphics/jasper/distinfo
index 7cffcba4b43..b16279d56ae 100644
--- a/graphics/jasper/distinfo
+++ b/graphics/jasper/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 08:45:08 agc Exp $
+$NetBSD: distinfo,v 1.8 2007/01/06 23:28:07 wiz Exp $
 
-SHA1 (jasper-1.701.0.zip) = e304457a3973c3a926792c3e25e16f05818634e4
-RMD160 (jasper-1.701.0.zip) = 3f93bcabccd8461155f4fefc9b1be306b8c1451e
-Size (jasper-1.701.0.zip) = 1361754 bytes
-SHA1 (patch-ad) = 011ca779dccbe9de49c80fdd3180d849f1df63ce
+SHA1 (jasper-1.900.0.zip) = 1959a9e5d35d15b8be8789c993e743cb657207ef
+RMD160 (jasper-1.900.0.zip) = ac02698b747954c1e64b8b217fd1bde72c2c7178
+Size (jasper-1.900.0.zip) = 1401734 bytes
+SHA1 (patch-ad) = 85637e42cdb1245babd5736c2d039558025738a6
 SHA1 (patch-ae) = bfe00f76582a44ad748706c3fc81c4d6b8aede35
-SHA1 (patch-af) = d289796549a0657c49147fa4d997fecc6e9e43cc
-SHA1 (patch-ag) = 838059345253861992fc0c415b56557a00e468ea
+SHA1 (patch-ag) = 63da6dcbdca3f8e4508be8f934ec047abf5cb1f1
diff --git a/graphics/jasper/patches/patch-ad b/graphics/jasper/patches/patch-ad
index 67956a57a5e..da1607d2969 100644
--- a/graphics/jasper/patches/patch-ad
+++ b/graphics/jasper/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2004/03/02 10:28:18 adam Exp $
+$NetBSD: patch-ad,v 1.3 2007/01/06 23:28:07 wiz Exp $
 
---- src/libjasper/jp2/jp2_cod.c.orig	2004-02-09 01:34:40.000000000 +0000
+--- src/libjasper/jp2/jp2_cod.c.orig	2006-12-08 00:23:36.000000000 +0000
 +++ src/libjasper/jp2/jp2_cod.c
-@@ -774,11 +774,15 @@ static void jp2_cmap_dumpdata(jp2_box_t 
+@@ -795,11 +795,15 @@ static void jp2_cmap_dumpdata(jp2_box_t 
  	jp2_cmap_t *cmap = &box->data.cmap;
  	unsigned int i;
  	jp2_cmapent_t *ent;
diff --git a/graphics/jasper/patches/patch-af b/graphics/jasper/patches/patch-af
deleted file mode 100644
index 876fc454302..00000000000
--- a/graphics/jasper/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/03/02 10:28:18 adam Exp $
-
---- src/libjasper/jpc/jpc_cs.c.orig	2004-02-09 01:34:40.000000000 +0000
-+++ src/libjasper/jpc/jpc_cs.c
-@@ -639,7 +639,7 @@ static int jpc_cod_dumpparms(jpc_ms_t *m
- 	  cod->compparms.cblksty);
- 	if (cod->csty & JPC_COX_PRT) {
- 		for (i = 0; i < cod->compparms.numrlvls; ++i) {
--			fprintf(stderr, "prcwidth[%d] = %d, prcheight[%d] = %d\n",
-+			fprintf(out, "prcwidth[%d] = %d, prcheight[%d] = %d\n",
- 			  i, cod->compparms.rlvls[i].parwidthval,
- 			  i, cod->compparms.rlvls[i].parheightval);
- 		}
diff --git a/graphics/jasper/patches/patch-ag b/graphics/jasper/patches/patch-ag
index 811146552a4..0a5f325a053 100644
--- a/graphics/jasper/patches/patch-ag
+++ b/graphics/jasper/patches/patch-ag
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.2 2004/03/02 10:28:18 adam Exp $
+$NetBSD: patch-ag,v 1.3 2007/01/06 23:28:07 wiz Exp $
 
---- src/libjasper/jpc/jpc_dec.c.orig	2004-02-09 01:34:40.000000000 +0000
+--- src/libjasper/jpc/jpc_dec.c.orig	2006-12-07 06:32:06.000000000 +0000
 +++ src/libjasper/jpc/jpc_dec.c
-@@ -1472,7 +1472,9 @@ static int jpc_dec_process_unk(jpc_dec_t
+@@ -1466,7 +1466,9 @@ static int jpc_dec_process_unk(jpc_dec_t
  	dec = 0;
  
- 	fprintf(stderr, "warning: ignoring unknown marker segment\n");
+ 	jas_eprintf("warning: ignoring unknown marker segment\n");
 -	jpc_ms_dump(ms, stderr);
 +	if (jas_getdbglevel() >= 1) {
 +		jpc_ms_dump(ms, stderr);