head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.50
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.48
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.46
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.44
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.42
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.40
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.38
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.36
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.34
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.32
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.30
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.28
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.26
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.24
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.22
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.20
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.18
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.16
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.14
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.12
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.10
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.8
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.6
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.4
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.2
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.1.0.12
	pkgsrc-2004Q1-base:1.1
	pkgsrc-2003Q4:1.1.0.10
	pkgsrc-2003Q4-base:1.1
	netbsd-1-6-1:1.1.0.6
	netbsd-1-6-1-base:1.1
	netbsd-1-6:1.1.0.8
	netbsd-1-6-RELEASE-base:1.1
	pkgviews:1.1.0.4
	pkgviews-base:1.1
	buildlink2:1.1.0.2
	buildlink2-base:1.1
	netbsd-1-5-PATCH003:1.1
	netbsd-1-5-PATCH001:1.1
	netbsd-1-5-RELEASE:1.1
	netbsd-1-4-PATCH003:1.1
	netbsd-1-4-PATCH002:1.1
	comdex-fall-1999:1.1
	netbsd-1-4-PATCH001:1.1;
locks; strict;
comment	@# @;


1.2
date	2004.06.01.21.53.00;	author kristerw;	state dead;
branches;
next	1.1;

1.1
date	99.06.07.20.47.25;	author tron;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove obsolete packages, per discussion on tech-pkg.
@
text
@$NetBSD: patch-ao,v 1.1 1999/06/07 20:47:25 tron Exp $

--- src/pixmaps.c.orig	Tue Jun 25 23:53:50 1996
+++ src/pixmaps.c	Mon Jun  7 22:34:53 1999
@@@@ -685,6 +685,12 @@@@
 		bshift = highbit(theVisual->blue_mask) - 7;
 		bmap_order = BitmapBitOrder(XtDisplay(wid));
 
+		newimage = XCreateImage(XtDisplay(wid),
+			DefaultVisual(XtDisplay(wid),
+				DefaultScreen(XtDisplay(wid))),
+			depth, ZPixmap, 0, (char *)bit_data,
+			width, height, 8, 0);
+
 		bitp = bit_data;
 		datap = data;
 		for (w = size; w > 0; w--)
@@@@ -698,7 +704,10 @@@@
 
 			if (bmap_order == MSBFirst)
 			{
-				*bitp++ = (unsigned char)((c >> 24) & 0xff);
+				if (newimage->bits_per_pixel == 32)
+				{
+					*bitp++ = (unsigned char)((c >> 24) & 0xff);
+				}
 				*bitp++ = (unsigned char)((c >> 16) & 0xff);
 				*bitp++ = (unsigned char)((c >> 8) & 0xff);
 				*bitp++ = (unsigned char)(c & 0xff);
@@@@ -708,15 +717,13 @@@@
 				*bitp++ = (unsigned char)(c & 0xff);
 				*bitp++ = (unsigned char)((c >> 8) & 0xff);
 				*bitp++ = (unsigned char)((c >> 16) & 0xff);
-				*bitp++ = (unsigned char)((c >> 24) & 0xff);
+				if (newimage->bits_per_pixel == 32)
+				{
+					*bitp++ = (unsigned char)((c >> 24) & 0xff);
+				}
 			}
 		}
 
-		newimage = XCreateImage(XtDisplay(wid),
-			DefaultVisual(XtDisplay(wid),
-				DefaultScreen(XtDisplay(wid))),
-			depth, ZPixmap, 0, (char *)bit_data,
-			width, height, 32, 0);
 		break;
 	    default:
 		newimage = NULL;
@


1.1
log
@Make Mosaic work on 24BPP displays without breaking 32BPP displays.
Fixes PR pkg/7627 by Wolfgang Rupprecht.
@
text
@d1 1
a1 1
$NetBSD$
@