head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.166
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.164
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.162
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.160
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.158
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.156
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.154
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.152
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.150
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.148
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.146
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.144
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.142
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.140
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.138
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.136
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.134
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.132
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.130
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.128
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.126
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.124
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.122
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.118
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.98
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.120
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.116
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.114
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.112
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.110
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.108
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.106
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.104
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.102
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.100
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.96
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.94
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.92
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.90
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.88
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.86
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.84
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.82
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.80
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.78
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.76
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.74
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.72
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.70
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.68
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.66
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.64
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.62
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.60
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.58
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.56
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.54
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.52
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.50
	pkgsrc-2011Q3-base:1.2
	pkgsrc-2011Q2:1.2.0.48
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.2.0.46
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.2.0.44
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.42
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.40
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.2.0.38
	pkgsrc-2010Q1-base:1.2
	pkgsrc-2009Q4:1.2.0.36
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.2.0.34
	pkgsrc-2009Q3-base:1.2
	pkgsrc-2009Q2:1.2.0.32
	pkgsrc-2009Q2-base:1.2
	pkgsrc-2009Q1:1.2.0.30
	pkgsrc-2009Q1-base:1.2
	pkgsrc-2008Q4:1.2.0.28
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.26
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.24
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.22
	pkgsrc-2008Q2-base:1.2
	cwrapper:1.2.0.20
	pkgsrc-2008Q1:1.2.0.18
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.16
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.14
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.12
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.10
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.8
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.6
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.4
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.2
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.1.0.22
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.20
	pkgsrc-2005Q3-base:1.1
	pkgsrc-2005Q2:1.1.0.18
	pkgsrc-2005Q2-base:1.1
	pkgsrc-2005Q1:1.1.0.16
	pkgsrc-2005Q1-base:1.1
	pkgsrc-2004Q4:1.1.0.14
	pkgsrc-2004Q4-base:1.1
	pkgsrc-2004Q3:1.1.0.12
	pkgsrc-2004Q3-base:1.1
	pkgsrc-2004Q2:1.1.0.10
	pkgsrc-2004Q2-base:1.1
	pkgsrc-2004Q1:1.1.0.8
	pkgsrc-2004Q1-base:1.1
	pkgsrc-2003Q4:1.1.0.6
	pkgsrc-2003Q4-base:1.1
	netbsd-1-6-1:1.1.0.2
	netbsd-1-6-1-base:1.1
	netbsd-1-6:1.1.0.4
	netbsd-1-6-RELEASE-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2006.02.27.15.49.56;	author joerg;	state Exp;
branches;
next	1.1;

1.1
date	2002.08.16.16.56.01;	author agc;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Add DragonFly support. Fix compilation with GCC 3.4+:
When method_ is not set, assume it means the default dither algorithm,
set it to NULL in disable(). This can also avoid possible segfaults.
Bump revision.
@
text
@$NetBSD$

--- color-hi.cc.orig	1996-05-16 12:42:44.000000000 +0000
+++ color-hi.cc
@@@@ -157,14 +157,17 @@@@ typedef void (HiWindowRenderer::*HiMetho
 class HiWindowRenderer : public WindowDitherer {
     public:
 	HiWindowRenderer(VideoWindow* vw, int decimation, HiColorModel& cm)
-		: WindowDitherer(vw, decimation), cm_(cm), method_(0){ }
+		: WindowDitherer(vw, decimation), cm_(cm), method_(NULL){ }
 	void render(const u_char* frm, int off, int x, int w, int h) {
-		(this->*method_)(frm, off, x, w, h);
+		if (this->method_)
+			(this->*method_)(frm, off, x, w, h);
+		else
+			dither_null(frm, off, x, w, h);
 	}
     protected:
 	HiColorModel& cm_;
 	virtual void update();
-	virtual void disable() { method_ = HiMethod(WindowRenderer::dither_null); }
+	virtual void disable() { method_ = NULL; }
 	HiMethod method_;
 	void map_422(const u_char* frm, u_int off, u_int x,
 		     u_int width, u_int height) const;
@


1.1
log
@Make this package build on NetBSD-1.6 and later
@
text
@d3 15
a17 3
--- color-hi.cc	2002/08/16 16:42:11	1.1
+++ color-hi.cc	2002/08/16 16:42:28
@@@@ -164,7 +164,7 @@@@
d22 1
a22 1
+	virtual void disable() { method_ = HiMethod(&WindowRenderer::dither_null); }
@