From f7f392d54b6d5775b089cec2e35304fb0864ef34 Mon Sep 17 00:00:00 2001 From: "arthurhsu@google.com" Date: Tue, 5 Nov 2013 18:44:58 +0000 Subject: Issue 19330043: fix QNX build Patch by: efidler1@blackberry.com git-svn-id: http://sfntly.googlecode.com/svn/trunk/cpp/src@230 672e30a5-4c29-85ac-ac6d-611c735e0a51 --- sample/chromium/font_subsetter.h | 2 +- sfntly/port/type.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sample/chromium/font_subsetter.h b/sample/chromium/font_subsetter.h index 07b1b5b..b891784 100644 --- a/sample/chromium/font_subsetter.h +++ b/sample/chromium/font_subsetter.h @@ -18,7 +18,7 @@ #ifndef SFNTLY_CPP_SRC_TEST_FONT_SUBSETTER_H_ #define SFNTLY_CPP_SRC_TEST_FONT_SUBSETTER_H_ -#include +#include class SfntlyWrapper { public: diff --git a/sfntly/port/type.h b/sfntly/port/type.h index 20a5ba8..9f82a5a 100644 --- a/sfntly/port/type.h +++ b/sfntly/port/type.h @@ -41,7 +41,7 @@ #include #endif -#include +#include #include #include -- cgit v1.2.3 From 1bdaae8fc788a5ac8936d68bf24f37d977a13dac Mon Sep 17 00:00:00 2001 From: "arthurhsu@google.com" Date: Mon, 9 Jun 2014 21:12:10 +0000 Subject: Fix compiler warning Clang warning: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to false [-Wtautological-undefined-compare] git-svn-id: http://sfntly.googlecode.com/svn/trunk/cpp/src@239 672e30a5-4c29-85ac-ac6d-611c735e0a51 --- sfntly/table/bitmap/bitmap_glyph_info.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfntly/table/bitmap/bitmap_glyph_info.cc b/sfntly/table/bitmap/bitmap_glyph_info.cc index ab9953b..a299b3e 100644 --- a/sfntly/table/bitmap/bitmap_glyph_info.cc +++ b/sfntly/table/bitmap/bitmap_glyph_info.cc @@ -52,7 +52,7 @@ bool BitmapGlyphInfo::operator==(const BitmapGlyphInfo& rhs) const { bool BitmapGlyphInfo::operator==(BitmapGlyphInfo* rhs) { if (rhs == NULL) { - return this == NULL; + return false; // Well defined C++ code's this is always not null. } return (format_ == rhs->format() && glyph_id_ == rhs->glyph_id() && -- cgit v1.2.3