ref: ed6a9df0f6d1c1c5ae935113a4b9b690813faee5
parent: 94926686b180c1c0575e7cb681e2b688220c3c4b
author: Werner Lemberg <[email protected]>
date: Sat Dec 6 18:28:58 EST 2014
Whitespace.
--- a/ChangeLog
+++ b/ChangeLog
@@ -568,7 +568,7 @@
[cff, pfr, psaux, winfonts] Fix Savannah bug #43676.
- Don't cast cmap init function pointers to an incompatible type.
+ Don't cast cmap init function pointers to an incompatible type.
Without this patch, the number of parameters between declaration and
the real signature differs. Calling such a function results in
--- a/builds/windows/vc2010/freetype.user.props
+++ b/builds/windows/vc2010/freetype.user.props
@@ -2,7 +2,7 @@
<!--
* freetype.user.props
*
- *
+ *
* You can specify custom options here without altering the project file.
*
* Multiple entries within each property are separated by semicolons (;).
@@ -14,12 +14,12 @@
<Project ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
-
+
<!--
* `;'-separated list of symbols to #define
-->
<UserDefines></UserDefines>
-
+
<!--
* path where your custom `ftoption.h' lives;
* this is searched BEFORE any other path
@@ -26,7 +26,7 @@
-->
<!-- <UserOptionDirectory>..\..\..\devel</UserOptionDirectory> -->
<UserOptionDirectory></UserOptionDirectory>
-
+
<!--
* `;'-separated list of paths to additional include directories,
* e.g., where to find zlib.h, png.h, etc.;
@@ -34,7 +34,7 @@
-->
<!-- <UserIncludeDirectories>..\..\..\..\zlib-1.2.8;..\..\..\..\libpng-1.6.12</UserIncludeDirectories> -->
<UserIncludeDirectories></UserIncludeDirectories>
-
+
<!--
* `;'-separated list of paths to additional library directories,
* e.g., where to find zlib.lib, libpng.lib, etc.
@@ -41,7 +41,7 @@
-->
<!-- <UserLibraryDirectories>..\..\..\..\zlib-1.2.8;..\..\..\..\libpng-1.6.12</UserLibraryDirectories> -->
<UserLibraryDirectories></UserLibraryDirectories>
-
+
<!--
* `;'-separated list of additional linker dependencies,
* e.g., zlib.lib, libpng.lib, etc.
@@ -48,9 +48,9 @@
-->
<!-- <UserDependencies>zlib.lib;libpng16.lib</UserDependencies> -->
<UserDependencies></UserDependencies>
-
+
</PropertyGroup>
-
+
<!--
* Example configuration for x64 debug build only
-->
--- a/builds/windows/visualc/freetype.dsp
+++ b/builds/windows/visualc/freetype.dsp
@@ -7,16 +7,16 @@
CFG=freetype - Win32 Debug Singlethreaded
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "freetype.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "freetype.mak" CFG="freetype - Win32 Debug Singlethreaded"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "freetype - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "freetype - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "freetype - Win32 Debug Multithreaded" (based on "Win32 (x86) Static Library")
@@ -23,7 +23,7 @@
!MESSAGE "freetype - Win32 Release Multithreaded" (based on "Win32 (x86) Static Library")
!MESSAGE "freetype - Win32 Release Singlethreaded" (based on "Win32 (x86) Static Library")
!MESSAGE "freetype - Win32 Debug Singlethreaded" (based on "Win32 (x86) Static Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -180,7 +180,7 @@
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype254_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254ST_D.lib"
-!ENDIF
+!ENDIF
# Begin Target
--- a/builds/windows/visualce/freetype.dsp
+++ b/builds/windows/visualce/freetype.dsp
@@ -7,16 +7,16 @@
CFG=freetype - Win32 Debug Singlethreaded
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "freetype.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "freetype.mak" CFG="freetype - Win32 Debug Singlethreaded"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "freetype - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "freetype - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "freetype - Win32 Debug Multithreaded" (based on "Win32 (x86) Static Library")
@@ -23,7 +23,7 @@
!MESSAGE "freetype - Win32 Release Multithreaded" (based on "Win32 (x86) Static Library")
!MESSAGE "freetype - Win32 Release Singlethreaded" (based on "Win32 (x86) Static Library")
!MESSAGE "freetype - Win32 Debug Singlethreaded" (based on "Win32 (x86) Static Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -180,7 +180,7 @@
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype254_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254ST_D.lib"
-!ENDIF
+!ENDIF
# Begin Target
--- a/src/base/ftbbox.c
+++ b/src/base/ftbbox.c
@@ -42,22 +42,22 @@
} TBBox_Rec;
-#define FT_UPDATE_BBOX(p, bbox) \
- FT_BEGIN_STMNT \
- if ( p->x < bbox.xMin ) \
- bbox.xMin = p->x; \
- if ( p->x > bbox.xMax ) \
- bbox.xMax = p->x; \
- if ( p->y < bbox.yMin ) \
- bbox.yMin = p->y; \
- if ( p->y > bbox.yMax ) \
- bbox.yMax = p->y; \
+#define FT_UPDATE_BBOX( p, bbox ) \
+ FT_BEGIN_STMNT \
+ if ( p->x < bbox.xMin ) \
+ bbox.xMin = p->x; \
+ if ( p->x > bbox.xMax ) \
+ bbox.xMax = p->x; \
+ if ( p->y < bbox.yMin ) \
+ bbox.yMin = p->y; \
+ if ( p->y > bbox.yMax ) \
+ bbox.yMax = p->y; \
FT_END_STMNT
-#define CHECK_X( p, bbox ) \
+#define CHECK_X( p, bbox ) \
( p->x < bbox.xMin || p->x > bbox.xMax )
-#define CHECK_Y( p, bbox ) \
+#define CHECK_Y( p, bbox ) \
( p->y < bbox.yMin || p->y > bbox.yMax )
@@ -419,7 +419,8 @@
return 0;
}
-FT_DEFINE_OUTLINE_FUNCS(bbox_interface,
+
+ FT_DEFINE_OUTLINE_FUNCS(bbox_interface,
(FT_Outline_MoveTo_Func) BBox_Move_To,
(FT_Outline_LineTo_Func) BBox_Line_To,
(FT_Outline_ConicTo_Func)BBox_Conic_To,
@@ -426,6 +427,7 @@
(FT_Outline_CubicTo_Func)BBox_Cubic_To,
0, 0
)
+
/* documentation is in ftbbox.h */
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -3496,7 +3496,7 @@
{FT_ERROR(( "tt_face_build_cmaps:"
" unsupported `cmap' table format = %d\n",
- TT_PEEK_USHORT( p - 2) ));
+ TT_PEEK_USHORT( p - 2 ) ));
return FT_THROW( Invalid_Table );
}
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -3059,7 +3059,7 @@
#define DO_MD /* nothing */
-#define DO_MPPEM \
+#define DO_MPPEM \
args[0] = CUR_Func_cur_ppem();
@@ -3072,7 +3072,7 @@
#else
-#define DO_MPS \
+#define DO_MPS \
args[0] = CUR_Func_cur_ppem();
#endif /* 0 */
@@ -7654,7 +7654,7 @@
}
#endif
- P = (FT_ULong)CUR_Func_cur_ppem();
+ P = (FT_ULong)CUR_Func_cur_ppem();
nump = (FT_ULong)args[0];
for ( k = 1; k <= nump; k++ )
@@ -9004,9 +9004,9 @@
/* If any errors have occurred, function tables may be broken. */
/* Force a re-execution of `prep' and `fpgm' tables if no */
/* bytecode debugger is run. */
- if ( CUR.error
- && !CUR.instruction_trap
- && CUR.curRange == tt_coderange_glyph )
+ if ( CUR.error &&
+ !CUR.instruction_trap &&
+ CUR.curRange == tt_coderange_glyph )
{FT_TRACE1(( " The interpreter returned error 0x%x\n", CUR.error ));
exc->size->bytecode_ready = -1;