head	1.3;
access;
symbols
	pkgsrc-2013Q4:1.1.0.16
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.14
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.12
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.10
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.8
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.6
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.4
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.2
	pkgsrc-2012Q1-base:1.1;
locks; strict;
comment	@// @;


1.3
date	2014.02.02.08.25.05;	author wiz;	state dead;
branches;
next	1.2;
commitid	4rm00LiH0Uoybvnx;

1.2
date	2014.02.02.07.18.25;	author ryoon;	state Exp;
branches;
next	1.1;
commitid	Eqf5W0AGpWhIOunx;

1.1
date	2012.03.28.15.16.35;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Remove obsolete patch (it now reintroduced the warning instead of fixing it)
@
text
@$NetBSD: patch-src_lib_WPG2Parser.cpp,v 1.2 2014/02/02 07:18:25 ryoon Exp $

Fix clang warning
error: operator '?:' has lower precedence than '-'; '-' will be evaluated first [-Werror,-Wparentheses]

--- src/lib/WPG2Parser.cpp.orig	2013-04-18 13:13:16.000000000 +0000
+++ src/lib/WPG2Parser.cpp
@@@@ -821,7 +821,7 @@@@ void WPG2Parser::handleDPPenForeColor()
 	unsigned char red = (m_doublePrecision)   ? readU16()>>8 : readU8();
 	unsigned char green = (m_doublePrecision) ? readU16()>>8 : readU8();
 	unsigned char blue = (m_doublePrecision)  ? readU16()>>8 : readU8();
-	unsigned char alpha = 0xff - ((m_doublePrecision) ? readU16()>>8 : readU8());
+	unsigned char alpha = (0xff - ((m_doublePrecision)) ? readU16()>>8 : readU8());
 
 	m_style.insert("svg:stroke-color", libwpg::WPGColor(red, green, blue, alpha).getColorString());
 	m_style.insert("svg:stroke-opacity", libwpg::WPGColor(red, green, blue, alpha).getOpacity(), WPX_PERCENT);
@@@@ -1157,7 +1157,7 @@@@ void WPG2Parser::handleDPBrushForeColor(
 		unsigned char red = (m_doublePrecision)   ? readU16()>>8 : readU8();
 		unsigned char green = (m_doublePrecision)   ? readU16()>>8 : readU8();
 		unsigned char blue = (m_doublePrecision)   ? readU16()>>8 : readU8();
-		unsigned char alpha = 0xff - ((m_doublePrecision)   ? readU16()>>8 : readU8());
+		unsigned char alpha = (0xff - ((m_doublePrecision))   ? readU16()>>8 : readU8());
 		WPG_DEBUG_MSG(("   Foreground color (RGBA): %d %d %d %d\n", red, green, blue, alpha));
 
 		m_brushForeColor = libwpg::WPGColor(red, green, blue, alpha);
@@@@ -1182,7 +1182,7 @@@@ void WPG2Parser::handleDPBrushForeColor(
 				unsigned char red = (m_doublePrecision)   ? readU16()>>8 : readU8();
 				unsigned char green = (m_doublePrecision)   ? readU16()>>8 : readU8();
 				unsigned char blue = (m_doublePrecision)   ? readU16()>>8 : readU8();
-				unsigned char alpha = 0xff - ((m_doublePrecision)   ? readU16()>>8 : readU8());
+				unsigned char alpha = (0xff - ((m_doublePrecision))   ? readU16()>>8 : readU8());
 				libwpg::WPGColor color(red, green, blue, alpha);
 				colors.push_back(color);
 				WPG_DEBUG_MSG(("   Color #%d (RGBA): %d %d %d %d\n", i+1, red, green, blue, alpha));
@


1.2
log
@Update to 0.2.2

* Update LICENSE

Changelog:
Not available.
@
text
@d1 1
a1 1
$NetBSD: patch-src_lib_WPG2Parser.cpp,v 1.1 2012/03/28 15:16:35 wiz Exp $
@


1.1
log
@Fix build with clang.
@
text
@d1 1
a1 1
$NetBSD$
d6 1
a6 1
--- src/lib/WPG2Parser.cpp.orig	2010-11-09 08:36:36.000000000 +0000
d8 1
a8 1
@@@@ -783,7 +783,7 @@@@ void WPG2Parser::handleDPPenForeColor()
d12 2
a13 2
-	unsigned char alpha = 0xff - (m_doublePrecision) ? readU16()>>8 : readU8();
+	unsigned char alpha = (0xff - (m_doublePrecision)) ? readU16()>>8 : readU8();
d17 1
a17 1
@@@@ -1106,7 +1106,7 @@@@ void WPG2Parser::handleDPBrushForeColor(
d21 2
a22 2
-		unsigned char alpha = 0xff - (m_doublePrecision)   ? readU16()>>8 : readU8();
+		unsigned char alpha = (0xff - (m_doublePrecision))   ? readU16()>>8 : readU8();
d26 1
a26 1
@@@@ -1131,7 +1131,7 @@@@ void WPG2Parser::handleDPBrushForeColor(
d30 2
a31 2
-				unsigned char alpha = 0xff - (m_doublePrecision)   ? readU16()>>8 : readU8();
+				unsigned char alpha = (0xff - (m_doublePrecision))   ? readU16()>>8 : readU8();
@