Page MenuHomeFreeBSD

D14652.id.diff
No OneTemporary

D14652.id.diff

Index: head/graphics/dspdfviewer/files/patch-hyperlinkarea.cpp
===================================================================
--- head/graphics/dspdfviewer/files/patch-hyperlinkarea.cpp
+++ head/graphics/dspdfviewer/files/patch-hyperlinkarea.cpp
@@ -0,0 +1,18 @@
+Fix build with modern Clang
+
+../hyperlinkarea.cpp:35:18: error: zero as null pointer constant [-Werror,-Wzero-as-null-pointer-constant]
+ if ( pixmap == 0 )
+ ^
+ nullptr
+
+--- hyperlinkarea.cpp.orig 2018-03-11 12:58:40 UTC
++++ hyperlinkarea.cpp
+@@ -32,7 +32,7 @@ HyperlinkArea::HyperlinkArea(QLabel* ima
+ throw WrongLinkType();
+ QRect mySize;
+ const QPixmap* pixmap = imageLabel->pixmap();
+- if ( pixmap == 0 )
++ if ( pixmap == nullptr )
+ throw /** FIXME Exception **/ std::runtime_error("Tried to construct a HyperlinkArea from an image label without a pixmap");
+
+ QRectF sizeWithinImageLabel = link.linkArea();

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 28, 6:37 AM (18 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37209637
Default Alt Text
D14652.id.diff (948 B)

Event Timeline