From 8f4266b3c14710c6b54e45ce07230df504dc5566 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 23 Jan 2012 08:09:36 +0000
Subject: Fix Clear() to go via the current class.

---
 multimedia/mjpegtools/distinfo                     |  3 ++-
 .../patches/patch-y4mdenoise_Region2D.hh           | 31 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 multimedia/mjpegtools/patches/patch-y4mdenoise_Region2D.hh

(limited to 'multimedia/mjpegtools')

diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo
index b33be8b389a..6e38153211e 100644
--- a/multimedia/mjpegtools/distinfo
+++ b/multimedia/mjpegtools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2011/02/10 17:13:10 wiz Exp $
+$NetBSD: distinfo,v 1.25 2012/01/23 08:09:36 joerg Exp $
 
 SHA1 (mjpegtools-1.9.0.tar.gz) = 1701233354c7ea86b5b7808c4dd5d03a71118e48
 RMD160 (mjpegtools-1.9.0.tar.gz) = 79e0eb4bce468bb8f12da336e29abe8fab390a5f
@@ -10,3 +10,4 @@ SHA1 (patch-ad) = 2a6f33fdc9c240d1c5c1172710db7ed95b1fc5a8
 SHA1 (patch-ae) = 98bfbaccd8dc79582a32ffbc8dba7b6c039c0373
 SHA1 (patch-af) = db90227d0732220123e5900049cf5f3e961432a2
 SHA1 (patch-lavtools_jpegutils.c) = b81357746465a782ae89bd41c26eaa5a5b4cd07d
+SHA1 (patch-y4mdenoise_Region2D.hh) = 9e2fe647f04be0c20ab23ae9200bc736a71b2bcd
diff --git a/multimedia/mjpegtools/patches/patch-y4mdenoise_Region2D.hh b/multimedia/mjpegtools/patches/patch-y4mdenoise_Region2D.hh
new file mode 100644
index 00000000000..9420aa690c8
--- /dev/null
+++ b/multimedia/mjpegtools/patches/patch-y4mdenoise_Region2D.hh
@@ -0,0 +1,31 @@
+$NetBSD: patch-y4mdenoise_Region2D.hh,v 1.1 2012/01/23 08:09:36 joerg Exp $
+
+--- y4mdenoise/Region2D.hh.orig	2012-01-23 01:52:49.000000000 +0000
++++ y4mdenoise/Region2D.hh
+@@ -381,7 +381,7 @@ Region2D<INDEX,SIZE>::Assign (Status_t &
+ 	assert (a_reStatus == g_kNoError);
+ 
+ 	// Assign the other region's extents to ourselves.
+-	Region2D<INDEX,SIZE>::Clear();
++	this->Clear();
+ 	for (typename REGION::ConstIterator itHere = a_rOther.Begin();
+ 		 itHere != a_rOther.End();
+ 		 ++itHere)
+@@ -754,7 +754,7 @@ Region2D<INDEX,SIZE>::FloodFill (Status_
+ 			a_rControl.m_oToDo.Assign (a_reStatus, *this);
+ 			if (a_reStatus != g_kNoError)
+ 				return;
+-			Region2D<INDEX,SIZE>::Clear();
++			this->Clear();
+ 		}
+ 	}
+ 	else
+@@ -889,7 +889,7 @@ Region2D<INDEX,SIZE>::MakeBorder (Status
+ 	assert (a_reStatus == g_kNoError);
+ 
+ 	// Start with an empty region.
+-	Region2D<INDEX,SIZE>::Clear();
++	this->Clear();
+ 
+ 	// For every extent in the other region, add every surrounding
+ 	// extent.  That creates a region that looks like the other region,
-- 
cgit v1.2.3