From 115b442b23e1fe05237314478d52197f4525114a Mon Sep 17 00:00:00 2001
From: David Turner <david@freetype.org>
Date: Fri, 22 Dec 2006 11:37:05 +0000
Subject: [PATCH] 	* 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
---
 ChangeLog                            | 8 ++++++++
 builds/win32/visualc/freetype.vcproj | 4 ++--
 src/autofit/aflatin.c                | 8 ++++----
 src/truetype/ttgload.c               | 4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 201b64c2f..6f7f73705 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* src/base/ftlcdfil.c (FT_Library_SetLcdFilter)
diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj
index ae59d8d0e..1f7109b62 100644
--- a/builds/win32/visualc/freetype.vcproj
+++ b/builds/win32/visualc/freetype.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
@@ -412,7 +412,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				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"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index c97fc620e..ddb0a2c96 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -797,11 +797,11 @@
 
           p = first->prev;
           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;
           if ( p->v > last_v )
-            segment->height += ( p->v - last_v ) >> 1;
+            segment->height = (FT_Short)(segment->height + (( p->v - last_v ) >> 1));
         }
         else
         {
@@ -810,11 +810,11 @@
 
           p = first->prev;
           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;
           if ( p->v < last_v )
-            segment->height += ( last_v - p->v ) >> 1;
+            segment->height = (FT_Short)(segment->height + (( last_v - p->v ) >> 1));
         }
       }
     }
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index 13b65770d..9d1aa25a6 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -643,8 +643,8 @@
       loader->exec->is_composite = is_composite;
       loader->exec->pts          = *zone;
 
-      debug = !( loader->load_flags & FT_LOAD_NO_SCALE ) &&
-              ( (TT_Size)loader->size )->debug;
+      debug = FT_BOOL( !( loader->load_flags & FT_LOAD_NO_SCALE ) &&
+                        ((TT_Size)loader->size)->debug );
 
       error = TT_Run_Context( loader->exec, debug );
       if ( error && loader->exec->pedantic_hinting )