1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/examples/nofreetype/nofreetype.vcproj	Thu Sep 11 18:19:57 2014 +0300
     1.3 @@ -0,0 +1,187 @@
     1.4 +<?xml version="1.0" encoding="Windows-1252"?>
     1.5 +<VisualStudioProject
     1.6 +	ProjectType="Visual C++"
     1.7 +	Version="9.00"
     1.8 +	Name="nofreetype"
     1.9 +	ProjectGUID="{D52142DD-6188-4825-9242-5927A3568D03}"
    1.10 +	RootNamespace="nofreetype"
    1.11 +	Keyword="Win32Proj"
    1.12 +	TargetFrameworkVersion="196613"
    1.13 +	>
    1.14 +	<Platforms>
    1.15 +		<Platform
    1.16 +			Name="Win32"
    1.17 +		/>
    1.18 +	</Platforms>
    1.19 +	<ToolFiles>
    1.20 +	</ToolFiles>
    1.21 +	<Configurations>
    1.22 +		<Configuration
    1.23 +			Name="Debug|Win32"
    1.24 +			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
    1.25 +			IntermediateDirectory="$(ConfigurationName)"
    1.26 +			ConfigurationType="1"
    1.27 +			CharacterSet="1"
    1.28 +			>
    1.29 +			<Tool
    1.30 +				Name="VCPreBuildEventTool"
    1.31 +			/>
    1.32 +			<Tool
    1.33 +				Name="VCCustomBuildTool"
    1.34 +			/>
    1.35 +			<Tool
    1.36 +				Name="VCXMLDataGeneratorTool"
    1.37 +			/>
    1.38 +			<Tool
    1.39 +				Name="VCWebServiceProxyGeneratorTool"
    1.40 +			/>
    1.41 +			<Tool
    1.42 +				Name="VCMIDLTool"
    1.43 +			/>
    1.44 +			<Tool
    1.45 +				Name="VCCLCompilerTool"
    1.46 +				Optimization="0"
    1.47 +				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
    1.48 +				MinimalRebuild="true"
    1.49 +				BasicRuntimeChecks="3"
    1.50 +				RuntimeLibrary="3"
    1.51 +				UsePrecompiledHeader="0"
    1.52 +				WarningLevel="3"
    1.53 +				DebugInformationFormat="4"
    1.54 +				DisableSpecificWarnings="4305"
    1.55 +			/>
    1.56 +			<Tool
    1.57 +				Name="VCManagedResourceCompilerTool"
    1.58 +			/>
    1.59 +			<Tool
    1.60 +				Name="VCResourceCompilerTool"
    1.61 +			/>
    1.62 +			<Tool
    1.63 +				Name="VCPreLinkEventTool"
    1.64 +			/>
    1.65 +			<Tool
    1.66 +				Name="VCLinkerTool"
    1.67 +				AdditionalDependencies="libdrawtext-noft.lib glew32.lib opengl32.lib glut32.lib"
    1.68 +				LinkIncremental="2"
    1.69 +				AdditionalLibraryDirectories="$(OutDir)"
    1.70 +				GenerateDebugInformation="true"
    1.71 +				SubSystem="1"
    1.72 +				TargetMachine="1"
    1.73 +			/>
    1.74 +			<Tool
    1.75 +				Name="VCALinkTool"
    1.76 +			/>
    1.77 +			<Tool
    1.78 +				Name="VCManifestTool"
    1.79 +			/>
    1.80 +			<Tool
    1.81 +				Name="VCXDCMakeTool"
    1.82 +			/>
    1.83 +			<Tool
    1.84 +				Name="VCBscMakeTool"
    1.85 +			/>
    1.86 +			<Tool
    1.87 +				Name="VCFxCopTool"
    1.88 +			/>
    1.89 +			<Tool
    1.90 +				Name="VCAppVerifierTool"
    1.91 +			/>
    1.92 +			<Tool
    1.93 +				Name="VCPostBuildEventTool"
    1.94 +			/>
    1.95 +		</Configuration>
    1.96 +		<Configuration
    1.97 +			Name="Release|Win32"
    1.98 +			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
    1.99 +			IntermediateDirectory="$(ConfigurationName)"
   1.100 +			ConfigurationType="1"
   1.101 +			CharacterSet="1"
   1.102 +			WholeProgramOptimization="1"
   1.103 +			>
   1.104 +			<Tool
   1.105 +				Name="VCPreBuildEventTool"
   1.106 +			/>
   1.107 +			<Tool
   1.108 +				Name="VCCustomBuildTool"
   1.109 +			/>
   1.110 +			<Tool
   1.111 +				Name="VCXMLDataGeneratorTool"
   1.112 +			/>
   1.113 +			<Tool
   1.114 +				Name="VCWebServiceProxyGeneratorTool"
   1.115 +			/>
   1.116 +			<Tool
   1.117 +				Name="VCMIDLTool"
   1.118 +			/>
   1.119 +			<Tool
   1.120 +				Name="VCCLCompilerTool"
   1.121 +				Optimization="2"
   1.122 +				EnableIntrinsicFunctions="true"
   1.123 +				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
   1.124 +				RuntimeLibrary="2"
   1.125 +				EnableFunctionLevelLinking="true"
   1.126 +				UsePrecompiledHeader="0"
   1.127 +				WarningLevel="3"
   1.128 +				DebugInformationFormat="3"
   1.129 +				DisableSpecificWarnings="4305"
   1.130 +			/>
   1.131 +			<Tool
   1.132 +				Name="VCManagedResourceCompilerTool"
   1.133 +			/>
   1.134 +			<Tool
   1.135 +				Name="VCResourceCompilerTool"
   1.136 +			/>
   1.137 +			<Tool
   1.138 +				Name="VCPreLinkEventTool"
   1.139 +			/>
   1.140 +			<Tool
   1.141 +				Name="VCLinkerTool"
   1.142 +				AdditionalDependencies="libdrawtext-noft.lib glew32.lib opengl32.lib glut32.lib"
   1.143 +				LinkIncremental="1"
   1.144 +				AdditionalLibraryDirectories="$(OutDir)"
   1.145 +				GenerateDebugInformation="true"
   1.146 +				SubSystem="1"
   1.147 +				OptimizeReferences="2"
   1.148 +				EnableCOMDATFolding="2"
   1.149 +				TargetMachine="1"
   1.150 +			/>
   1.151 +			<Tool
   1.152 +				Name="VCALinkTool"
   1.153 +			/>
   1.154 +			<Tool
   1.155 +				Name="VCManifestTool"
   1.156 +			/>
   1.157 +			<Tool
   1.158 +				Name="VCXDCMakeTool"
   1.159 +			/>
   1.160 +			<Tool
   1.161 +				Name="VCBscMakeTool"
   1.162 +			/>
   1.163 +			<Tool
   1.164 +				Name="VCFxCopTool"
   1.165 +			/>
   1.166 +			<Tool
   1.167 +				Name="VCAppVerifierTool"
   1.168 +			/>
   1.169 +			<Tool
   1.170 +				Name="VCPostBuildEventTool"
   1.171 +			/>
   1.172 +		</Configuration>
   1.173 +	</Configurations>
   1.174 +	<References>
   1.175 +	</References>
   1.176 +	<Files>
   1.177 +		<Filter
   1.178 +			Name="src"
   1.179 +			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
   1.180 +			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
   1.181 +			>
   1.182 +			<File
   1.183 +				RelativePath=".\simple-noft.c"
   1.184 +				>
   1.185 +			</File>
   1.186 +		</Filter>
   1.187 +	</Files>
   1.188 +	<Globals>
   1.189 +	</Globals>
   1.190 +</VisualStudioProject>

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/libdrawtext-noft.vcproj	Thu Sep 11 18:19:57 2014 +0300
     2.3 @@ -0,0 +1,187 @@
     2.4 +<?xml version="1.0" encoding="Windows-1252"?>
     2.5 +<VisualStudioProject
     2.6 +	ProjectType="Visual C++"
     2.7 +	Version="9.00"
     2.8 +	Name="libdrawtext-noft"
     2.9 +	ProjectGUID="{D28DE6C7-EF8F-4D37-997D-12AAE6E48FD7}"
    2.10 +	RootNamespace="libdrawtext-noft"
    2.11 +	Keyword="Win32Proj"
    2.12 +	TargetFrameworkVersion="196613"
    2.13 +	>
    2.14 +	<Platforms>
    2.15 +		<Platform
    2.16 +			Name="Win32"
    2.17 +		/>
    2.18 +	</Platforms>
    2.19 +	<ToolFiles>
    2.20 +	</ToolFiles>
    2.21 +	<Configurations>
    2.22 +		<Configuration
    2.23 +			Name="Debug|Win32"
    2.24 +			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
    2.25 +			IntermediateDirectory="$(ConfigurationName)"
    2.26 +			ConfigurationType="4"
    2.27 +			CharacterSet="2"
    2.28 +			>
    2.29 +			<Tool
    2.30 +				Name="VCPreBuildEventTool"
    2.31 +			/>
    2.32 +			<Tool
    2.33 +				Name="VCCustomBuildTool"
    2.34 +			/>
    2.35 +			<Tool
    2.36 +				Name="VCXMLDataGeneratorTool"
    2.37 +			/>
    2.38 +			<Tool
    2.39 +				Name="VCWebServiceProxyGeneratorTool"
    2.40 +			/>
    2.41 +			<Tool
    2.42 +				Name="VCMIDLTool"
    2.43 +			/>
    2.44 +			<Tool
    2.45 +				Name="VCCLCompilerTool"
    2.46 +				Optimization="0"
    2.47 +				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NO_FREETYPE"
    2.48 +				MinimalRebuild="true"
    2.49 +				BasicRuntimeChecks="3"
    2.50 +				RuntimeLibrary="3"
    2.51 +				UsePrecompiledHeader="0"
    2.52 +				WarningLevel="3"
    2.53 +				DebugInformationFormat="4"
    2.54 +				DisableSpecificWarnings="4996;4244"
    2.55 +			/>
    2.56 +			<Tool
    2.57 +				Name="VCManagedResourceCompilerTool"
    2.58 +			/>
    2.59 +			<Tool
    2.60 +				Name="VCResourceCompilerTool"
    2.61 +			/>
    2.62 +			<Tool
    2.63 +				Name="VCPreLinkEventTool"
    2.64 +			/>
    2.65 +			<Tool
    2.66 +				Name="VCLibrarianTool"
    2.67 +				AdditionalDependencies="freetype.lib opengl32.lib"
    2.68 +			/>
    2.69 +			<Tool
    2.70 +				Name="VCALinkTool"
    2.71 +			/>
    2.72 +			<Tool
    2.73 +				Name="VCXDCMakeTool"
    2.74 +			/>
    2.75 +			<Tool
    2.76 +				Name="VCBscMakeTool"
    2.77 +			/>
    2.78 +			<Tool
    2.79 +				Name="VCFxCopTool"
    2.80 +			/>
    2.81 +			<Tool
    2.82 +				Name="VCPostBuildEventTool"
    2.83 +				CommandLine="mkdir usr\include&#x0D;&#x0A;mkdir usr\lib&#x0D;&#x0A;copy /Y src\drawtext.h usr\include\drawtext.h&#x0D;&#x0A;copy /Y $(TargetPath) usr\lib\$(TargetName)-dbg.lib&#x0D;&#x0A;"
    2.84 +			/>
    2.85 +		</Configuration>
    2.86 +		<Configuration
    2.87 +			Name="Release|Win32"
    2.88 +			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
    2.89 +			IntermediateDirectory="$(ConfigurationName)"
    2.90 +			ConfigurationType="4"
    2.91 +			CharacterSet="2"
    2.92 +			WholeProgramOptimization="0"
    2.93 +			>
    2.94 +			<Tool
    2.95 +				Name="VCPreBuildEventTool"
    2.96 +			/>
    2.97 +			<Tool
    2.98 +				Name="VCCustomBuildTool"
    2.99 +			/>
   2.100 +			<Tool
   2.101 +				Name="VCXMLDataGeneratorTool"
   2.102 +			/>
   2.103 +			<Tool
   2.104 +				Name="VCWebServiceProxyGeneratorTool"
   2.105 +			/>
   2.106 +			<Tool
   2.107 +				Name="VCMIDLTool"
   2.108 +			/>
   2.109 +			<Tool
   2.110 +				Name="VCCLCompilerTool"
   2.111 +				Optimization="2"
   2.112 +				EnableIntrinsicFunctions="true"
   2.113 +				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NO_FREETYPE"
   2.114 +				RuntimeLibrary="2"
   2.115 +				EnableFunctionLevelLinking="true"
   2.116 +				UsePrecompiledHeader="0"
   2.117 +				WarningLevel="3"
   2.118 +				DebugInformationFormat="3"
   2.119 +				DisableSpecificWarnings="4996;4244"
   2.120 +			/>
   2.121 +			<Tool
   2.122 +				Name="VCManagedResourceCompilerTool"
   2.123 +			/>
   2.124 +			<Tool
   2.125 +				Name="VCResourceCompilerTool"
   2.126 +			/>
   2.127 +			<Tool
   2.128 +				Name="VCPreLinkEventTool"
   2.129 +			/>
   2.130 +			<Tool
   2.131 +				Name="VCLibrarianTool"
   2.132 +				AdditionalDependencies="freetype.lib opengl32.lib"
   2.133 +			/>
   2.134 +			<Tool
   2.135 +				Name="VCALinkTool"
   2.136 +			/>
   2.137 +			<Tool
   2.138 +				Name="VCXDCMakeTool"
   2.139 +			/>
   2.140 +			<Tool
   2.141 +				Name="VCBscMakeTool"
   2.142 +			/>
   2.143 +			<Tool
   2.144 +				Name="VCFxCopTool"
   2.145 +			/>
   2.146 +			<Tool
   2.147 +				Name="VCPostBuildEventTool"
   2.148 +				CommandLine="mkdir usr\include&#x0D;&#x0A;mkdir usr\lib&#x0D;&#x0A;copy /Y src\drawtext.h usr\include\drawtext.h&#x0D;&#x0A;copy /Y $(TargetPath) usr\lib&#x0D;&#x0A;"
   2.149 +			/>
   2.150 +		</Configuration>
   2.151 +	</Configurations>
   2.152 +	<References>
   2.153 +	</References>
   2.154 +	<Files>
   2.155 +		<Filter
   2.156 +			Name="Source Files"
   2.157 +			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
   2.158 +			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
   2.159 +			>
   2.160 +			<File
   2.161 +				RelativePath=".\src\drawgl.c"
   2.162 +				>
   2.163 +			</File>
   2.164 +			<File
   2.165 +				RelativePath=".\src\font.c"
   2.166 +				>
   2.167 +			</File>
   2.168 +			<File
   2.169 +				RelativePath=".\src\utf8.c"
   2.170 +				>
   2.171 +			</File>
   2.172 +		</Filter>
   2.173 +		<Filter
   2.174 +			Name="Header Files"
   2.175 +			Filter="h;hpp;hxx;hm;inl;inc;xsd"
   2.176 +			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
   2.177 +			>
   2.178 +			<File
   2.179 +				RelativePath=".\src\drawtext.h"
   2.180 +				>
   2.181 +			</File>
   2.182 +			<File
   2.183 +				RelativePath=".\src\drawtext_impl.h"
   2.184 +				>
   2.185 +			</File>
   2.186 +		</Filter>
   2.187 +	</Files>
   2.188 +	<Globals>
   2.189 +	</Globals>
   2.190 +</VisualStudioProject>

     3.1 --- a/libdrawtext.sln	Thu Aug 07 07:02:41 2014 +0300
     3.2 +++ b/libdrawtext.sln	Thu Sep 11 18:19:57 2014 +0300
     3.3 @@ -1,8 +1,14 @@
     3.4  
     3.5  Microsoft Visual Studio Solution File, Format Version 10.00
     3.6 -# Visual C++ Express 2008
     3.7 +# Visual Studio 2008
     3.8  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdrawtext", "libdrawtext.vcproj", "{F6241CAB-984D-457D-A7EA-E66A57889490}"
     3.9  EndProject
    3.10 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nofreetype", "examples\nofreetype\nofreetype.vcproj", "{D52142DD-6188-4825-9242-5927A3568D03}"
    3.11 +EndProject
    3.12 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{9EDBC830-5169-4460-92C0-DFFE45FC24D4}"
    3.13 +EndProject
    3.14 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdrawtext-noft", "libdrawtext-noft.vcproj", "{D28DE6C7-EF8F-4D37-997D-12AAE6E48FD7}"
    3.15 +EndProject
    3.16  Global
    3.17  	GlobalSection(SolutionConfigurationPlatforms) = preSolution
    3.18  		Debug|Win32 = Debug|Win32
    3.19 @@ -13,8 +19,19 @@
    3.20  		{F6241CAB-984D-457D-A7EA-E66A57889490}.Debug|Win32.Build.0 = Debug|Win32
    3.21  		{F6241CAB-984D-457D-A7EA-E66A57889490}.Release|Win32.ActiveCfg = Release|Win32
    3.22  		{F6241CAB-984D-457D-A7EA-E66A57889490}.Release|Win32.Build.0 = Release|Win32
    3.23 +		{D52142DD-6188-4825-9242-5927A3568D03}.Debug|Win32.ActiveCfg = Debug|Win32
    3.24 +		{D52142DD-6188-4825-9242-5927A3568D03}.Debug|Win32.Build.0 = Debug|Win32
    3.25 +		{D52142DD-6188-4825-9242-5927A3568D03}.Release|Win32.ActiveCfg = Release|Win32
    3.26 +		{D52142DD-6188-4825-9242-5927A3568D03}.Release|Win32.Build.0 = Release|Win32
    3.27 +		{D28DE6C7-EF8F-4D37-997D-12AAE6E48FD7}.Debug|Win32.ActiveCfg = Debug|Win32
    3.28 +		{D28DE6C7-EF8F-4D37-997D-12AAE6E48FD7}.Debug|Win32.Build.0 = Debug|Win32
    3.29 +		{D28DE6C7-EF8F-4D37-997D-12AAE6E48FD7}.Release|Win32.ActiveCfg = Release|Win32
    3.30 +		{D28DE6C7-EF8F-4D37-997D-12AAE6E48FD7}.Release|Win32.Build.0 = Release|Win32
    3.31  	EndGlobalSection
    3.32  	GlobalSection(SolutionProperties) = preSolution
    3.33  		HideSolutionNode = FALSE
    3.34  	EndGlobalSection
    3.35 +	GlobalSection(NestedProjects) = preSolution
    3.36 +		{D52142DD-6188-4825-9242-5927A3568D03} = {9EDBC830-5169-4460-92C0-DFFE45FC24D4}
    3.37 +	EndGlobalSection
    3.38  EndGlobal

     4.1 --- a/libdrawtext.vcproj	Thu Aug 07 07:02:41 2014 +0300
     4.2 +++ b/libdrawtext.vcproj	Thu Sep 11 18:19:57 2014 +0300
     4.3 @@ -48,7 +48,7 @@
     4.4  				UsePrecompiledHeader="0"
     4.5  				WarningLevel="3"
     4.6  				DebugInformationFormat="4"
     4.7 -				DisableSpecificWarnings="4996"
     4.8 +				DisableSpecificWarnings="4996;4244"
     4.9  			/>
    4.10  			<Tool
    4.11  				Name="VCManagedResourceCompilerTool"
    4.12 @@ -113,7 +113,7 @@
    4.13  				UsePrecompiledHeader="0"
    4.14  				WarningLevel="3"
    4.15  				DebugInformationFormat="3"
    4.16 -				DisableSpecificWarnings="4996"
    4.17 +				DisableSpecificWarnings="4996;4244"
    4.18  			/>
    4.19  			<Tool
    4.20  				Name="VCManagedResourceCompilerTool"

     5.1 --- a/src/utf8.c	Thu Aug 07 07:02:41 2014 +0300
     5.2 +++ b/src/utf8.c	Thu Sep 11 18:19:57 2014 +0300
     5.3 @@ -117,7 +117,7 @@
     5.4  	}
     5.5  
     5.6  	if(!nbytes && buf) {
     5.7 -		for(i=0; i<nbytes; i++) {
     5.8 +		for(i=0; i<(int)nbytes; i++) {
     5.9  			int idx = nbytes - i - 1;
    5.10  			int mask, shift, prefix;
    5.11