diff options
| author | Oliver Chang <ochang@chromium.org> | 2015-11-05 16:00:40 -0800 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2015-11-05 16:00:40 -0800 |
| commit | cec3f6878e37fcd1c6c15e0e2ab011931d55549e (patch) | |
| tree | fb3a01b9b966e59f8851ea4438243b1813a951e7 /third_party/freetype/src/base/ftutil.c | |
| parent | cca5b7684f48e2e933bf08ed573f7caca8e1d1ad (diff) | |
| download | pdfium-cec3f6878e37fcd1c6c15e0e2ab011931d55549e.tar.xz | |
Merge to XFA: Update bundled freetype to 2.6.1
Also adds a README.pdfium and 0000-include.patch that
details the local modifications made.
Also rolls testing/corpus to 45f88c6914fcac26ad930bb0ebbfa468c21db0a5
which includes regenerated corpus expectations.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1413673003 .
(cherry picked from commit 87ee069d05ca06f60d6cfacd9e426739d8f2053d)
Review URL: https://codereview.chromium.org/1416993005 .
Diffstat (limited to 'third_party/freetype/src/base/ftutil.c')
| -rw-r--r-- | third_party/freetype/src/base/ftutil.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/third_party/freetype/src/base/ftutil.c b/third_party/freetype/src/base/ftutil.c index 56e2800eb6..f5b72db708 100644 --- a/third_party/freetype/src/base/ftutil.c +++ b/third_party/freetype/src/base/ftutil.c @@ -4,7 +4,7 @@ /* */ /* FreeType utility file for memory and list management (body). */ /* */ -/* Copyright 2002, 2004-2007, 2013 by */ +/* Copyright 2002-2015 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -180,7 +180,7 @@ FT_Error *p_error ) { FT_Error error; - FT_Pointer p = ft_mem_qalloc( memory, size, &error ); + FT_Pointer p = ft_mem_qalloc( memory, (FT_Long)size, &error ); if ( !error && address ) @@ -275,7 +275,7 @@ before = list->tail; - node->next = 0; + node->next = NULL; node->prev = before; if ( before ) @@ -302,7 +302,7 @@ after = list->head; node->next = after; - node->prev = 0; + node->prev = NULL; if ( !after ) list->tail = node; @@ -366,7 +366,7 @@ else list->tail = before; - node->prev = 0; + node->prev = NULL; node->next = list->head; list->head->prev = node; list->head = node; @@ -433,8 +433,8 @@ cur = next; } - list->head = 0; - list->tail = 0; + list->head = NULL; + list->tail = NULL; } |