Changes 1.7.0:

* Added new atttribute types:
  M33dAttribute   3x3 double-precision matrix
  M44dAttribute   4x4 double-precision matrix
  V2d             2D double-precision vector
  V3d             3D double-precision vector
* Bug fix: crash when reading a damaged image file (found
  by Apple).  An exception thrown inside the PIZ Huffman
  decoder bypasses initialization of an array of pointers.
  The uninitialized pointers are later passed to operator
  delete.
* Bug fix: crash when reading a damaged image file (found by
  Apple).  Computing the size of input certain buffers may
  overflow and wrap around to a small number, later causing
  writes beyond the end of the buffer.
* In the "Technical Introduction" document, added
  Premultiplied vs. Un-Premulitiplied Color section:
  states explicitly that pixels with zero alpha and non-zero
  RGB are allowed, points out that preserving such a pixel can
  be a problem in application programs with un-premultiplied
  internal image representations.
* exrenvmap improvements:
  - New command line flags set the type of the input image to
    latitude-longitude map or cube-face map, overriding the
    envmap attribute in the input file header.
  - Cube-face maps can now be assembled from or split into six
    square sub-images.
  - Converting a cube-face map into a new cube-face map with
    the same face size copies the image instead of resampling
    it.  This avoids blurring when a cube-face map is assembled
    from or split into sub-images.
* Updated standard chromaticities in ImfAcesFile.cpp to match
  final ACES (Academy Color Encoding Specification) document.
* Added worldToCamera and worldToNDC matrices to ImfStandardAttributes.h
* Increased the maximum length of attribute and channel names
  from 31 to 255 characters.  For files that do contain names
  longer than 31 characters, a new LONG_NAMES_FLAG in the fil
  version number is set.  This flag causes older versions of
  the IlmImf library (1.6.1 and earlier) to reject files with
  long names.  Without the flag, older library versions would
  mis-interpret files with long names as broken.
* Reading luminance/chroma-encoded files via the RGBA
  interface is faster: buffer padding avoids cache thrashing
  for certain image sizes, redundant calls to saturation()
  have been eliminated.
* Added "hemispherical blur" option to exrenvmap.
* Added experimental version of I/O classes for ACES file
  format (restricted OpenEXR format with special primaries
  and white point); added exr2aces file converter.
* Added new constructors to classes Imf::RgbaInputFile and
  Imf::TiledRgbaInputFile.  The new constructors have a
  layerName parameter, which allows the caller to specify
  which layer of a multi-layer or multi-view image will
  be read.
* A number of member functions in classes Imf::Header,
  Imf::ChannelList and Imf::FrameBuffer have parameters
  of type "const char *".  Added equivalent functions that
  take "const std::string &" parameters.
* Added library support for Weta Digital multi-view images:
  StringVector attribute type, multiView standard attribute
  of type StringVector, utility functions related to grouping
  channels into separate views.

10 files changed, 17 insertions, 106 deletions

diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile
index b9d6c10dde9..256e022a53a 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.22 2009/08/28 21:33:07 hasso Exp $
+# $NetBSD: Makefile,v 1.23 2010/12/14 09:55:56 adam Exp $
 
-DISTNAME=	openexr-1.6.1
-PKGREVISION=	1
+DISTNAME=	openexr-1.7.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://savannah.nongnu.org/download/openexr/
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.openexr.com/
 COMMENT=	High dynamic-range (HDR) image file format library and tools
+LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/graphics/openexr/PLIST b/graphics/openexr/PLIST
index cf843313688..851adc663ea 100644
--- a/graphics/openexr/PLIST
+++ b/graphics/openexr/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:59:24 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/12/14 09:55:56 adam Exp $
+bin/exr2aces
 bin/exrenvmap
 bin/exrheader
 bin/exrmakepreview
 bin/exrmaketiled
+bin/exrmultiview
 bin/exrstdattr
+include/OpenEXR/ImfAcesFile.h
 include/OpenEXR/ImfArray.h
 include/OpenEXR/ImfAttribute.h
 include/OpenEXR/ImfB44Compressor.h
@@ -34,6 +37,7 @@ include/OpenEXR/ImfLineOrder.h
 include/OpenEXR/ImfLineOrderAttribute.h
 include/OpenEXR/ImfLut.h
 include/OpenEXR/ImfMatrixAttribute.h
+include/OpenEXR/ImfMultiView.h
 include/OpenEXR/ImfName.h
 include/OpenEXR/ImfOpaqueAttribute.h
 include/OpenEXR/ImfOutputFile.h
@@ -47,6 +51,7 @@ include/OpenEXR/ImfRgbaFile.h
 include/OpenEXR/ImfRgbaYca.h
 include/OpenEXR/ImfStandardAttributes.h
 include/OpenEXR/ImfStringAttribute.h
+include/OpenEXR/ImfStringVectorAttribute.h
 include/OpenEXR/ImfTestFile.h
 include/OpenEXR/ImfThreading.h
 include/OpenEXR/ImfTileDescription.h
@@ -64,6 +69,7 @@ include/OpenEXR/OpenEXRConfig.h
 lib/libIlmImf.la
 lib/pkgconfig/OpenEXR.pc
 share/aclocal/openexr.m4
+share/doc/OpenEXR-${PKGVERSION}/MultiViewOpenEXR.pdf
 share/doc/OpenEXR-${PKGVERSION}/OpenEXRFileLayout.pdf
 share/doc/OpenEXR-${PKGVERSION}/ReadingAndWritingImageFiles.pdf
 share/doc/OpenEXR-${PKGVERSION}/TechnicalIntroduction.pdf
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index 3527ccc458a..929e34134ef 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.13 2009/08/28 21:33:08 hasso Exp $
+$NetBSD: distinfo,v 1.14 2010/12/14 09:55:56 adam Exp $
 
-SHA1 (openexr-1.6.1.tar.gz) = b3650e6542f0e09daadb2d467425530bc8eec333
-RMD160 (openexr-1.6.1.tar.gz) = 3670633be841628e9d4c11981661e9d94a9b2711
-Size (openexr-1.6.1.tar.gz) = 13632660 bytes
-SHA1 (patch-aa) = d1b9c2d817d875c30fa15cbbea5d1226b03b62d8
+SHA1 (openexr-1.7.0.tar.gz) = 91d0d4e69f06de956ec7e0710fc58ec0d4c4dc2b
+RMD160 (openexr-1.7.0.tar.gz) = 410ae4490988067cc80324e776b52ae6a261f157
+Size (openexr-1.7.0.tar.gz) = 13542910 bytes
+SHA1 (patch-aa) = 5c0d585e623d66d60e535ce3dc84c4db845c6382
 SHA1 (patch-ab) = 7d4fdf8d36f58ea5126b8c72dae901d1d68e6a60
-SHA1 (patch-ac) = fa5735431b7168dfc8b4643a976fd7f95cbcb5e7
-SHA1 (patch-ad) = b44ccc8a9ff32ebe7cc42f5c53778ebf050b4de6
-SHA1 (patch-ae) = aa70c907718f975c32698906edc9f6ca66b42e23
-SHA1 (patch-af) = ed02cf7091bfe490f33f4c8101ce84fab453b556
-SHA1 (patch-ag) = 6eebed2f16f02ba0f5b019f0f45c0f26ced0ba92
-SHA1 (patch-ah) = c7070ac42bc1c0cfb940f0aa53e04f93e887c590
 SHA1 (patch-ai) = 9bf08eb6e092848e6b194989e03320a334eff640
diff --git a/graphics/openexr/patches/patch-aa b/graphics/openexr/patches/patch-aa
index 71fd57bf9a1..d1f04aec811 100644
--- a/graphics/openexr/patches/patch-aa
+++ b/graphics/openexr/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.5 2008/02/03 03:37:32 heinz Exp $
+$NetBSD: patch-aa,v 1.6 2010/12/14 09:55:57 adam Exp $
 
   - Shell portability fix: see
     https://savannah.nongnu.org/bugs/index.php?22222
 
 --- configure.orig	2007-11-30 19:18:05.000000000 +0000
 +++ configure
-@@ -19595,7 +19595,7 @@ else
+@@ -18937,7 +18937,7 @@ else
    multithread=yes
  fi;
  
diff --git a/graphics/openexr/patches/patch-ac b/graphics/openexr/patches/patch-ac
deleted file mode 100644
index d63e9dab79f..00000000000
--- a/graphics/openexr/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2009/07/21 11:47:16 tnn Exp $
-
---- exrmaketiled/main.cpp.orig	2007-04-25 03:08:45.000000000 +0200
-+++ exrmaketiled/main.cpp
-@@ -44,6 +44,7 @@
- 
- #include <iostream>
- #include <exception>
-+#include <string.h>
- #include <string>
- #include <stdlib.h>
- 
diff --git a/graphics/openexr/patches/patch-ad b/graphics/openexr/patches/patch-ad
deleted file mode 100644
index c2e6fd8291d..00000000000
--- a/graphics/openexr/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/07/21 11:50:35 tnn Exp $
-
---- exrenvmap/main.cpp.orig	2007-04-25 03:07:51.000000000 +0200
-+++ exrenvmap/main.cpp
-@@ -45,6 +45,7 @@
- #include <iostream>
- #include <exception>
- #include <stdlib.h>
-+#include <string.h>
- 
- using namespace Imf;
- using namespace std;
diff --git a/graphics/openexr/patches/patch-ae b/graphics/openexr/patches/patch-ae
deleted file mode 100644
index 13f9e376399..00000000000
--- a/graphics/openexr/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2009/08/28 21:33:08 hasso Exp $
-
---- IlmImf/ImfPreviewImage.cpp.orig	2006-06-06 00:58:16.000000000 -0500
-+++ IlmImf/ImfPreviewImage.cpp	2009-07-29 13:27:39.087038617 -0500
-@@ -41,6 +41,7 @@
- 
- #include <ImfPreviewImage.h>
- #include "Iex.h"
-+#include <limits.h>
- 
- namespace Imf {
- 
-@@ -51,6 +52,9 @@ PreviewImage::PreviewImage (unsigned int
- {
-     _width = width;
-     _height = height;
-+    if (_height && _width > UINT_MAX / _height || _width * _height > UINT_MAX / sizeof(PreviewRgba)) {
-+        throw Iex::ArgExc ("Invalid height and width.");
-+    }
-     _pixels = new PreviewRgba [_width * _height];
- 
-     if (pixels)
-diff -up openexr-1.6.1/IlmImf/ImfPreviewImage.h.CVE-2009-1720-1 openexr-1.6.1/IlmImf/ImfPreviewImage.h
diff --git a/graphics/openexr/patches/patch-af b/graphics/openexr/patches/patch-af
deleted file mode 100644
index 0bf316f3b12..00000000000
--- a/graphics/openexr/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2009/08/28 21:33:08 hasso Exp $
-
---- IlmImf/ImfPizCompressor.cpp.orig	2007-09-20 23:17:46.000000000 -0500
-+++ IlmImf/ImfPizCompressor.cpp	2009-07-29 13:15:41.883288491 -0500
-@@ -181,6 +181,9 @@ PizCompressor::PizCompressor
-     _channels (hdr.channels()),
-     _channelData (0)
- {
-+    if ((unsigned) maxScanLineSize > (INT_MAX - 65536 - 8192)  / (unsigned) numScanLines) {
-+        throw InputExc ("Error: maxScanLineSize * numScanLines would overflow.");
-+    }
-     _tmpBuffer = new unsigned short [maxScanLineSize * numScanLines / 2];
-     _outBuffer = new char [maxScanLineSize * numScanLines + 65536 + 8192];
- 
diff --git a/graphics/openexr/patches/patch-ag b/graphics/openexr/patches/patch-ag
deleted file mode 100644
index 4732b1c7b75..00000000000
--- a/graphics/openexr/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2009/08/28 21:33:08 hasso Exp $
-
---- IlmImf/ImfRleCompressor.cpp.orig	2006-10-13 22:06:39.000000000 -0500
-+++ IlmImf/ImfRleCompressor.cpp	2009-07-29 13:17:39.505037955 -0500
-@@ -164,6 +164,9 @@ RleCompressor::RleCompressor (const Head
-     _tmpBuffer (0),
-     _outBuffer (0)
- {
-+    if ((unsigned) maxScanLineSize > INT_MAX / 3) {
-+        throw Iex::InputExc ("Error: maxScanLineSize * 3 would overflow.");
-+    }
-     _tmpBuffer = new char [maxScanLineSize];
-     _outBuffer = new char [maxScanLineSize * 3 / 2];
- }
diff --git a/graphics/openexr/patches/patch-ah b/graphics/openexr/patches/patch-ah
deleted file mode 100644
index 12cbe24e8b3..00000000000
--- a/graphics/openexr/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2009/08/28 21:33:08 hasso Exp $
-
---- IlmImf/ImfZipCompressor.cpp.orig	2006-10-13 22:07:17.000000000 -0500
-+++ IlmImf/ImfZipCompressor.cpp	2009-07-29 13:18:25.223038291 -0500
-@@ -58,6 +58,9 @@ ZipCompressor::ZipCompressor
-     _tmpBuffer (0),
-     _outBuffer (0)
- {
-+    if ((unsigned) maxScanLineSize > INT_MAX / (unsigned) numScanLines) {
-+        throw Iex::InputExc ("Error: maxScanLineSize * numScanLines would overflow.");
-+    }
-     _tmpBuffer =
- 	new char [maxScanLineSize * numScanLines];
-