summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.cc
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-02-25 07:41:15 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-02-25 07:41:15 +0000
commit05633a29317919bff9180118744fafb7aa0e5404 (patch)
tree1a1a08e2951ba6e6b238b942a2682a3383596ade /Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.cc
parent0889c64818975e24c7ccd212778597a8f1739d9f (diff)
harfbuzz 1.2.3
git-svn-id: svn://tug.org/texlive/trunk@39855 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.cc')
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.cc
index 5f320bd7eb6..ea2a70d5b07 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.cc
@@ -242,11 +242,11 @@ hb_buffer_t::clear (void)
out_info = info;
serial = 0;
- memset (allocated_var_bytes, 0, sizeof allocated_var_bytes);
- memset (allocated_var_owner, 0, sizeof allocated_var_owner);
memset (context, 0, sizeof context);
memset (context_len, 0, sizeof context_len);
+
+ deallocate_var_all ();
}
void
@@ -661,6 +661,7 @@ hb_buffer_t::guess_segment_properties (void)
}
+#ifndef NDEBUG
static inline void
dump_var_allocation (const hb_buffer_t *buffer)
{
@@ -728,6 +729,7 @@ void hb_buffer_t::deallocate_var_all (void)
memset (allocated_var_bytes, 0, sizeof (allocated_var_bytes));
memset (allocated_var_owner, 0, sizeof (allocated_var_owner));
}
+#endif /* NDEBUG */
/* Public API */