Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(480)

Side by Side Diff: third_party/freetype/src/raster/ftmisc.h

Issue 1413673003: Update bundled freetype to 2.6.1 (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: DEPS for corpus 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 unified diff | Download patch
« no previous file with comments | « third_party/freetype/src/raster/Jamfile ('k') | third_party/freetype/src/raster/ftraster.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /***************************************************************************/ 1 /***************************************************************************/
2 /* */ 2 /* */
3 /* ftmisc.h */ 3 /* ftmisc.h */
4 /* */ 4 /* */
5 /* Miscellaneous macros for stand-alone rasterizer (specification */ 5 /* Miscellaneous macros for stand-alone rasterizer (specification */
6 /* only). */ 6 /* only). */
7 /* */ 7 /* */
8 /* Copyright 2005, 2009, 2010 by */ 8 /* Copyright 2005-2015 by */
9 /* David Turner, Robert Wilhelm, and Werner Lemberg. */ 9 /* David Turner, Robert Wilhelm, and Werner Lemberg. */
10 /* */ 10 /* */
11 /* This file is part of the FreeType project, and may only be used */ 11 /* This file is part of the FreeType project, and may only be used */
12 /* modified and distributed under the terms of the FreeType project */ 12 /* modified and distributed under the terms of the FreeType project */
13 /* license, LICENSE.TXT. By continuing to use, modify, or distribute */ 13 /* license, LICENSE.TXT. By continuing to use, modify, or distribute */
14 /* this file you indicate that you have read the license and */ 14 /* this file you indicate that you have read the license and */
15 /* understand and accept it fully. */ 15 /* understand and accept it fully. */
16 /* */ 16 /* */
17 /***************************************************************************/ 17 /***************************************************************************/
18 18
(...skipping 11 matching lines...) Expand all
30 30
31 /* memset */ 31 /* memset */
32 #include FT_CONFIG_STANDARD_LIBRARY_H 32 #include FT_CONFIG_STANDARD_LIBRARY_H
33 33
34 #define FT_BEGIN_HEADER 34 #define FT_BEGIN_HEADER
35 #define FT_END_HEADER 35 #define FT_END_HEADER
36 36
37 #define FT_LOCAL_DEF( x ) static x 37 #define FT_LOCAL_DEF( x ) static x
38 38
39 39
40 /* from include/freetype2/fttypes.h */ 40 /* from include/freetype/fttypes.h */
41 41
42 typedef unsigned char FT_Byte; 42 typedef unsigned char FT_Byte;
43 typedef signed int FT_Int; 43 typedef signed int FT_Int;
44 typedef unsigned int FT_UInt; 44 typedef unsigned int FT_UInt;
45 typedef signed long FT_Long; 45 typedef signed long FT_Long;
46 typedef unsigned long FT_ULong; 46 typedef unsigned long FT_ULong;
47 typedef signed long FT_F26Dot6; 47 typedef signed long FT_F26Dot6;
48 typedef int FT_Error; 48 typedef int FT_Error;
49 49
50 #define FT_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ 50 #define FT_MAKE_TAG( _x1, _x2, _x3, _x4 ) \
51 ( ( (FT_ULong)_x1 << 24 ) | \ 51 ( ( (FT_ULong)_x1 << 24 ) | \
52 ( (FT_ULong)_x2 << 16 ) | \ 52 ( (FT_ULong)_x2 << 16 ) | \
53 ( (FT_ULong)_x3 << 8 ) | \ 53 ( (FT_ULong)_x3 << 8 ) | \
54 (FT_ULong)_x4 ) 54 (FT_ULong)_x4 )
55 55
56 56
57 /* from include/freetype2/ftsystem.h */ 57 /* from include/freetype/ftsystem.h */
58 58
59 typedef struct FT_MemoryRec_* FT_Memory; 59 typedef struct FT_MemoryRec_* FT_Memory;
60 60
61 typedef void* (*FT_Alloc_Func)( FT_Memory memory, 61 typedef void* (*FT_Alloc_Func)( FT_Memory memory,
62 long size ); 62 long size );
63 63
64 typedef void (*FT_Free_Func)( FT_Memory memory, 64 typedef void (*FT_Free_Func)( FT_Memory memory,
65 void* block ); 65 void* block );
66 66
67 typedef void* (*FT_Realloc_Func)( FT_Memory memory, 67 typedef void* (*FT_Realloc_Func)( FT_Memory memory,
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 d = (FT_Long)( c > 0 ? (FT_Int64)a * b / c 133 d = (FT_Long)( c > 0 ? (FT_Int64)a * b / c
134 : 0x7FFFFFFFL ); 134 : 0x7FFFFFFFL );
135 135
136 return ( s > 0 ) ? d : -d; 136 return ( s > 0 ) ? d : -d;
137 } 137 }
138 138
139 #endif /* __FTMISC_H__ */ 139 #endif /* __FTMISC_H__ */
140 140
141 141
142 /* END */ 142 /* END */
OLDNEW
« no previous file with comments | « third_party/freetype/src/raster/Jamfile ('k') | third_party/freetype/src/raster/ftraster.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698