diff options
| author | wiz <wiz> | 2014-02-02 08:25:05 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2014-02-02 08:25:05 +0000 |
| commit | a0403db5a327394ee9e3d0724edfa671c46171dd (patch) | |
| tree | 04a76b0d3a0d75d294544f5f6c1dc67d3ff1ce6a /converters | |
| parent | 988b59d8f2c740dc26fff3b4c32278bcf017dd4b (diff) | |
| download | pkgsrc-a0403db5a327394ee9e3d0724edfa671c46171dd.tar.gz | |
Remove obsolete patch (it now reintroduced the warning instead of fixing it)
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/libwpg/distinfo | 3 | ||||
| -rw-r--r-- | converters/libwpg/patches/patch-src_lib_WPG2Parser.cpp | 34 |
2 files changed, 1 insertions, 36 deletions
diff --git a/converters/libwpg/distinfo b/converters/libwpg/distinfo index 5ed981d9dff..1e956d190aa 100644 --- a/converters/libwpg/distinfo +++ b/converters/libwpg/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.5 2014/02/02 07:18:25 ryoon Exp $ +$NetBSD: distinfo,v 1.6 2014/02/02 08:25:05 wiz Exp $ SHA1 (libwpg-0.2.2.tar.bz2) = e9484e795259485ece9a984f60776704d55afeeb RMD160 (libwpg-0.2.2.tar.bz2) = 4b631a8f3fcb261205b04c4b0849256d159e8f31 Size (libwpg-0.2.2.tar.bz2) = 376802 bytes -SHA1 (patch-src_lib_WPG2Parser.cpp) = c5fad4ecdc445f13c97ba7a29f43f257b5487f41 diff --git a/converters/libwpg/patches/patch-src_lib_WPG2Parser.cpp b/converters/libwpg/patches/patch-src_lib_WPG2Parser.cpp deleted file mode 100644 index cbd9ba6ce45..00000000000 --- a/converters/libwpg/patches/patch-src_lib_WPG2Parser.cpp +++ /dev/null @@ -1,34 +0,0 @@ -$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)); |