* src/autofit/aflatin.c, src/truetype/ttgload.c: removing compiler

warnings

	* builds/win32/visualc/freetype.vcproj: adding _CRT_SECURE_NO_DEPRECATE
	to avoid deprecation warnings with Visual C++ 8
This commit is contained in:
David Turner 2006-12-22 11:37:05 +00:00
parent eeaa6497c3
commit 115b442b23
4 changed files with 16 additions and 8 deletions

View File

@ -1,3 +1,11 @@
2006-12-22 David Turner <david@freetype.org>
* src/autofit/aflatin.c, src/truetype/ttgload.c: removing compiler
warnings
* builds/win32/visualc/freetype.vcproj: adding _CRT_SECURE_NO_DEPRECATE
to avoid deprecation warnings with Visual C++ 8
2006-12-16 Anders Kaseorg <anders@kaseorg.com> 2006-12-16 Anders Kaseorg <anders@kaseorg.com>
* src/base/ftlcdfil.c (FT_Library_SetLcdFilter) * src/base/ftlcdfil.c (FT_Library_SetLcdFilter)

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="windows-1251"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
@ -412,7 +412,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\..\include" AdditionalIncludeDirectories="..\..\..\include"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY" PreprocessorDefinitions="_DEBUG;WIN32;_LIB;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_DEPRECATE"
GeneratePreprocessedFile="0" GeneratePreprocessedFile="0"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"

View File

@ -797,11 +797,11 @@
p = first->prev; p = first->prev;
if ( p->v < first_v ) if ( p->v < first_v )
segment->height += ( first_v - p->v ) >> 1; segment->height = (FT_Short)(segment->height + (( first_v - p->v ) >> 1));
p = last->next; p = last->next;
if ( p->v > last_v ) if ( p->v > last_v )
segment->height += ( p->v - last_v ) >> 1; segment->height = (FT_Short)(segment->height + (( p->v - last_v ) >> 1));
} }
else else
{ {
@ -810,11 +810,11 @@
p = first->prev; p = first->prev;
if ( p->v > first_v ) if ( p->v > first_v )
segment->height += ( p->v - first_v ) >> 1; segment->height = (FT_Short)(segment->height + (( p->v - first_v ) >> 1));
p = last->next; p = last->next;
if ( p->v < last_v ) if ( p->v < last_v )
segment->height += ( last_v - p->v ) >> 1; segment->height = (FT_Short)(segment->height + (( last_v - p->v ) >> 1));
} }
} }
} }

View File

@ -643,8 +643,8 @@
loader->exec->is_composite = is_composite; loader->exec->is_composite = is_composite;
loader->exec->pts = *zone; loader->exec->pts = *zone;
debug = !( loader->load_flags & FT_LOAD_NO_SCALE ) && debug = FT_BOOL( !( loader->load_flags & FT_LOAD_NO_SCALE ) &&
( (TT_Size)loader->size )->debug; ((TT_Size)loader->size)->debug );
error = TT_Run_Context( loader->exec, debug ); error = TT_Run_Context( loader->exec, debug );
if ( error && loader->exec->pedantic_hinting ) if ( error && loader->exec->pedantic_hinting )