aboutsummaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2015-01-06 11:31:48 -0800
committerChih-Hung Hsieh <chh@google.com>2015-01-07 10:01:09 -0800
commit3b0a9c15a89fcdf6afb2ae41e92032d48b63a270 (patch)
tree38201abed02b3a3ee69d41530a171b90478e18af /cpp
parent7c48c27143b7a8b3ca50ac7db66e4e2f1c3dbb2b (diff)
downloadsfntly-3b0a9c15a89fcdf6afb2ae41e92032d48b63a270.tar.gz
Do not compare this with NULL.
Cherry picked this fix from upstream to compile clean with clang. BUG: 17356808 Change-Id: I1f25aec1b96036f63ca3df65a51fa9a740121a50
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/sfntly/table/bitmap/bitmap_glyph_info.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/sfntly/table/bitmap/bitmap_glyph_info.cc b/cpp/src/sfntly/table/bitmap/bitmap_glyph_info.cc
index ab9953b..a299b3e 100644
--- a/cpp/src/sfntly/table/bitmap/bitmap_glyph_info.cc
+++ b/cpp/src/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() &&