diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-10 23:31:07 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-10 23:31:07 +0000 |
| commit | c9326c76ab650d96f89cc4e68d4612c7d6c0e61c (patch) | |
| tree | a14562a0ce4aecbdab44c9403437b8ac6039964e | |
| parent | 4a8c3597eb72a7042ead9632e4c3e4fddb5ac695 (diff) | |
| parent | 1bdaae8fc788a5ac8936d68bf24f37d977a13dac (diff) | |
| download | src-c9326c76ab650d96f89cc4e68d4612c7d6c0e61c.tar.gz | |
Merge third_party/sfntly/cpp/src from https://chromium.googlesource.com/external/sfntly/cpp/src.git at 1bdaae8fc788a5ac8936d68bf24f37d977a13dac
This commit was generated by merge_from_chromium.py.
Change-Id: I28e046f822d81a0fb100e1e250dc9649fed0e671
| -rw-r--r-- | sample/chromium/font_subsetter.h | 2 | ||||
| -rw-r--r-- | sfntly/port/type.h | 2 | ||||
| -rw-r--r-- | sfntly/table/bitmap/bitmap_glyph_info.cc | 2 |
3 files changed, 3 insertions, 3 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 <cstddef> +#include <stddef.h> 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 <stdint.h> #endif -#include <cstddef> +#include <stddef.h> #include <vector> #include <set> 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() && |