cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r432009

Browse Source 
converters/wkhtmltopdf: unbreak with clang 4.0 (same as r431742)

src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp:77:24: error: ordered comparison between pointer and zero ('const int *' and 'int')
    if (optionalHeight > 0)
        ~~~~~~~~~~~~~~ ^ ~

PR:		216211
Obtained from:	upstream (excerpt)
Approved by:	portmgr blanket
Approved by:	ports-secteam blanket
This commit is contained in:
Jan Beich 2017-01-21 03:25:47 +00:00
parent a553b7c221
commit a212dd9861
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2017Q1/; revision=432010
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp Normal file
View File

@ -0,0 +1,21 @@
------------------------------------------------------------------------
r113848 | abecsi@webkit.org | 2012-04-11 11:23:19 +0000 (Wed, 11 Apr 2012) | 27 lines
Fix the build with gcc 4.7.0
https://bugs.webkit.org/show_bug.cgi?id=83584
[...]
* html/HTMLImageElement.cpp:
(WebCore::HTMLImageElement::createForJSConstructor): Fails because of -Werror=extra
[...]
--- src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig 2015-05-07 14:14:47 UTC
+++ src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
@@ -74,7 +74,7 @@ PassRefPtr<HTMLImageElement> HTMLImageEl
RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
if (optionalWidth)
image->setWidth(*optionalWidth);
- if (optionalHeight > 0)
+ if (optionalHeight)
image->setHeight(*optionalHeight);
return image.release();
}