third_party/freetype/include/freetype/internal/ftmemory.h - Issue 1416993005: Merge to XFA: Update bundled freetype to 2.6.1

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/freetype/include/freetype/internal/ftmemory.h

Issue 1416993005: Merge to XFA: Update bundled freetype to 2.6.1 (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/freetype/include/freetype/internal/ftgloadr.h ('k') | third_party/freetype/include/freetype/internal/ftobjs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/freetype/include/freetype/internal/ftmemory.h

diff --git a/third_party/freetype/include/internal/ftmemory.h b/third_party/freetype/include/freetype/internal/ftmemory.h

similarity index 93%

rename from third_party/freetype/include/internal/ftmemory.h

rename to third_party/freetype/include/freetype/internal/ftmemory.h

index 3d51aeec69fd061bc6ed261efe456c1d2fa36ef4..c0c553b4fc92a99c4e7c3ecc22dabc4db5c8cd6f 100644

--- a/third_party/freetype/include/internal/ftmemory.h

+++ b/third_party/freetype/include/freetype/internal/ftmemory.h

@@ -4,7 +4,7 @@

/* */

/* The FreeType memory management macros (specification). */

/* */

/* David Turner, Robert Wilhelm, and Werner Lemberg */

/* */

/* This file is part of the FreeType project, and may only be used, */

@@ -215,11 +215,14 @@ FT_BEGIN_HEADER

#define FT_MEM_SET_ERROR( cond ) ( (cond), error != 0 )

-#define FT_MEM_SET( dest, byte, count ) ft_memset( dest, byte, count )

+#define FT_MEM_SET( dest, byte, count ) \

+ ft_memset( dest, byte, (FT_Offset)(count) )

-#define FT_MEM_COPY( dest, source, count ) ft_memcpy( dest, source, count )

+#define FT_MEM_COPY( dest, source, count ) \

+ ft_memcpy( dest, source, (FT_Offset)(count) )

-#define FT_MEM_MOVE( dest, source, count ) ft_memmove( dest, source, count )

+#define FT_MEM_MOVE( dest, source, count ) \

+ ft_memmove( dest, source, (FT_Offset)(count) )

#define FT_MEM_ZERO( dest, count ) FT_MEM_SET( dest, 0, count )

@@ -227,14 +230,19 @@ FT_BEGIN_HEADER

#define FT_ZERO( p ) FT_MEM_ZERO( p, sizeof ( *(p) ) )

-#define FT_ARRAY_ZERO( dest, count ) \

- FT_MEM_ZERO( dest, (count) * sizeof ( *(dest) ) )

+#define FT_ARRAY_ZERO( dest, count ) \

+ FT_MEM_ZERO( dest, \

+ (FT_Offset)(count) * sizeof ( *(dest) ) )

-#define FT_ARRAY_COPY( dest, source, count ) \

- FT_MEM_COPY( dest, source, (count) * sizeof ( *(dest) ) )

+#define FT_ARRAY_COPY( dest, source, count ) \

+ FT_MEM_COPY( dest, \

+ source, \

+ (FT_Offset)(count) * sizeof ( *(dest) ) )

-#define FT_ARRAY_MOVE( dest, source, count ) \

- FT_MEM_MOVE( dest, source, (count) * sizeof ( *(dest) ) )

+#define FT_ARRAY_MOVE( dest, source, count ) \

+ FT_MEM_MOVE( dest, \

+ source, \

+ (FT_Offset)(count) * sizeof ( *(dest) ) )