shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Fix more MSVC Win32 compiler warnings.

* src/base/ftobjs.c: Fix typo in MS pragma.

* src/base/bdflib.c (_bdf_set_default_spacing, _bdf_add_property):
`lineno' is only used in debug mode.

* src/cff/cf2ft.c (cf2_builder_moveTo): `params' is only used in
debug mode.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,15 @@

+2013-06-05  Dave Arnold  <[email protected]>

+

+	Fix more MSVC Win32 compiler warnings.

+

+	* src/base/ftobjs.c: Fix typo in MS pragma.

+

+	* src/base/bdflib.c (_bdf_set_default_spacing, _bdf_add_property):

+	`lineno' is only used in debug mode.

+

+	* src/cff/cf2ft.c (cf2_builder_moveTo): `params' is only used in

+	debug mode.

+

 2013-06-05  Werner Lemberg  <[email protected]>

 	Fix compiler warnings.

--- a/src/base/ftobjs.c

+++ b/src/base/ftobjs.c

@@ -60,7 +60,7 @@

 #undef free

 #if defined( _MSC_VER )

-#pragma warning( enable : 4244 )

+#pragma warning( default : 4244 )

 #endif

 #endif /* FT_DEBUG_LEVEL_TRACE */

--- a/src/bdf/bdflib.c

+++ b/src/bdf/bdflib.c

@@ -1170,7 +1170,9 @@

     FT_Memory    memory;

     FT_Error     error = FT_Err_Ok;

+    FT_UNUSED( lineno );        /* only used in debug mode */

+

     if ( font == 0 || font->name == 0 || font->name[0] == 0 )

     {

       error = FT_THROW( Invalid_Argument );

@@ -1302,6 +1304,8 @@

     bdf_property_t  *prop, *fp;

     FT_Memory       memory = font->memory;

     FT_Error        error  = FT_Err_Ok;

+

+    FT_UNUSED( lineno );        /* only used in debug mode */

     /* First, check whether the property already exists in the font. */

--- a/src/cff/cf2ft.c

+++ b/src/cff/cf2ft.c

@@ -122,6 +122,8 @@

     CF2_Outline   outline = (CF2_Outline)callbacks;

     CFF_Builder*  builder;

+    (void)params;        /* only used in debug mode */

+

     FT_ASSERT( outline && outline->decoder );

     FT_ASSERT( params->op == CF2_PathOpMoveTo );