[mapguide-commits] r9351 - sandbox/jng/common_decouple/Common/Renderers
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Mar 3 09:47:19 PST 2018
Author: jng
Date: 2018-03-03 09:47:19 -0800 (Sat, 03 Mar 2018)
New Revision: 9351
Added:
sandbox/jng/common_decouple/Common/Renderers/RenderersSlim.vcxproj
sandbox/jng/common_decouple/Common/Renderers/RenderersSlim.vcxproj.filters
Modified:
sandbox/jng/common_decouple/Common/Renderers/AGGRenderer.cpp
sandbox/jng/common_decouple/Common/Renderers/AGGRenderer.h
sandbox/jng/common_decouple/Common/Renderers/Renderers.vcxproj
Log:
Add a RenderersSlim project that decouples DWF Toolkit and GD (renderer) from the Renderers project. A new WITH_DWF preprocessor symbol is used to #ifdef out DWF-related things from the AGGRenderer. The existing Renderers project defines this symbol. RenderersSlim does not.
Modified: sandbox/jng/common_decouple/Common/Renderers/AGGRenderer.cpp
===================================================================
--- sandbox/jng/common_decouple/Common/Renderers/AGGRenderer.cpp 2018-03-03 16:41:36 UTC (rev 9350)
+++ sandbox/jng/common_decouple/Common/Renderers/AGGRenderer.cpp 2018-03-03 17:47:19 UTC (rev 9351)
@@ -30,9 +30,10 @@
#include "ConvertUTF.h"
#include "UnicodeString.h"
#include "AGGFillPatterns.h"
+#ifdef WITH_DWF
#include "AGGW2DRewriter.h"
#include "whiptk/whip_toolkit.h"
-
+#endif
#include "LabelRenderer.h"
#include "LabelRendererLocal.h"
@@ -39,7 +40,7 @@
#include "SymbolTrans.h"
#include "agg_context.h"
-
+#ifdef WITH_DWF
#include "dwfcore/File.h"
#include "dwfcore/String.h"
#include "dwfcore/Exception.h"
@@ -61,15 +62,16 @@
#include "DWFRSInputStream.h"
#include "RSDWFInputStream.h"
-
+#endif
#include "SE_SymbolDefProxies.h"
#include "RenderUtil.h"
+#ifdef WITH_DWF
using namespace DWFToolkit;
using namespace DWFCore;
+#endif
-
#define ROUND(x) (int)((x) + 0.5)
#define SYMBOL_BITMAP_SIZE 128
@@ -1488,7 +1490,11 @@
size_t lenf = font->m_filename.length();
size_t lenbytesf = lenf * 4 + 1;
char* futf8 = (char*)alloca(lenbytesf);
+#ifdef WITH_DWF
DWFCore::DWFString::EncodeUTF8(font->m_filename.c_str(), lenf * sizeof(wchar_t), futf8, lenbytesf);
+#else
+ //TODO: Alternate implementation of EncodeUTF8
+#endif
// load the font
bool res = cxt->feng.load_font(futf8, 0, glyph_type);
@@ -1609,7 +1615,11 @@
size_t lenf = font->m_filename.length();
size_t lenbytesf = lenf * 4 + 1;
char* futf8 = (char*)alloca(lenbytesf);
+#ifdef WITH_DWF
DWFCore::DWFString::EncodeUTF8(font->m_filename.c_str(), lenf * sizeof(wchar_t), futf8, lenbytesf);
+#else
+ //TODO: Alternate implementation of EncodeUTF8
+#endif
bool res1 = c()->feng.load_font(futf8, 0, agg::glyph_ren_agg_gray8);
c()->feng.char_map(FT_ENCODING_UNICODE);
@@ -2769,6 +2779,7 @@
const RS_String& passwd,
const RS_String& w2dfilter)
{
+#ifdef WITH_DWF
try
{
if (in->available() == 0)
@@ -2882,9 +2893,10 @@
catch (DWFException&)
{
}
+#endif
}
-
+#ifdef WITH_DWF
//////////////////////////////////////////////////////////////////////////////
void AGGRenderer::AddW2DContent(RS_InputStream* in, CSysTransformer* xformer, const RS_String& w2dfilter)
{
@@ -3244,3 +3256,4 @@
////
//////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////
+#endif
\ No newline at end of file
Modified: sandbox/jng/common_decouple/Common/Renderers/AGGRenderer.h
===================================================================
--- sandbox/jng/common_decouple/Common/Renderers/AGGRenderer.h 2018-03-03 16:41:36 UTC (rev 9350)
+++ sandbox/jng/common_decouple/Common/Renderers/AGGRenderer.h 2018-03-03 17:47:19 UTC (rev 9351)
@@ -32,10 +32,14 @@
#include "RS_FontEngine.h"
#include "BIDIConverter.h"
+#ifdef WITH_DWF
+
class WT_File;
class WT_Viewport;
class WT_Logical_Point;
+#endif
+
struct RS_Font;
class agg_context;
@@ -304,7 +308,6 @@
//image or to a temporary cached symbol image in case we are
//processing a symbol from the library
agg_context* m_imw2d;
-
// map/layer/feature info
RS_MapUIInfo* m_mapInfo;
RS_LayerUIInfo* m_layerInfo;
@@ -326,6 +329,7 @@
public:
/*Do not export from DLL*/ void* GetImage() { return c(); } //target map image
/*Do not export from DLL*/ void* GetW2DTargetImage() { return m_imw2d; } //target image for W2D rewriter
+#ifdef WITH_DWF
/*Do not export from DLL*/ bool IsViewportSet() { return m_bHaveViewport; }
/*Do not export from DLL*/ bool IsSymbolW2D() { return m_bIsSymbolW2D; }
/*Do not export from DLL*/ void UpdateSymbolTrans(WT_File& file, WT_Viewport& viewport);
@@ -339,12 +343,13 @@
int numpts,
bool checkInBounds);
/*Do not export from DLL*/ double ScaleW2DNumber(WT_File& file, long number);
-
+#endif
private:
+#ifdef WITH_DWF
void AddW2DContent(RS_InputStream* in, CSysTransformer* xformer, const RS_String& w2dfilter);
void SetActions(WT_File& file);
-
+#endif
//////
//State variables for when DWFRenderer is used to keep
//information during DWF rewriting process for symbols
Modified: sandbox/jng/common_decouple/Common/Renderers/Renderers.vcxproj
===================================================================
--- sandbox/jng/common_decouple/Common/Renderers/Renderers.vcxproj 2018-03-03 16:41:36 UTC (rev 9350)
+++ sandbox/jng/common_decouple/Common/Renderers/Renderers.vcxproj 2018-03-03 17:47:19 UTC (rev 9351)
@@ -96,7 +96,7 @@
<AdditionalOptions>$(USRCFLAGS) %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\MdfModel;..\Stylization;..\..\Oem\FDO\inc;..\..\Oem\FDO\inc\ExpressionEngine;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\gd\gd;..\..\Oem\gd\freetype\include;..\..\Oem\agg-2.4\include;..\..\Oem\agg-2.4\font_freetype;..\..\Oem\gd\lpng;..\..\Oem\gd\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WITH_DWF;_DEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
<AdditionalOptions>$(USRCFLAGS) %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\MdfModel;..\Stylization;..\..\Oem\FDO\inc;..\..\Oem\FDO\inc\ExpressionEngine;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\gd\gd;..\..\Oem\gd\freetype\include;..\..\Oem\agg-2.4\include;..\..\Oem\agg-2.4\font_freetype;..\..\Oem\gd\lpng;..\..\Oem\gd\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WITH_DWF;_DEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -155,7 +155,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>..\MdfModel;..\Stylization;..\..\Oem\FDO\inc;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\gd\gd;..\..\Oem\gd\freetype\include;..\..\Oem\agg-2.4\include;..\..\Oem\gd\lpng;..\..\Oem\agg-2.4\font_freetype;..\..\Oem\gd\zlib;..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WITH_DWF;NDEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
@@ -190,7 +190,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>..\MdfModel;..\Stylization;..\..\Oem\FDO\inc;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\gd\gd;..\..\Oem\gd\freetype\include;..\..\Oem\agg-2.4\include;..\..\Oem\gd\lpng;..\..\Oem\agg-2.4\font_freetype;..\..\Oem\gd\zlib;..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WITH_DWF;NDEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
Added: sandbox/jng/common_decouple/Common/Renderers/RenderersSlim.vcxproj
===================================================================
--- sandbox/jng/common_decouple/Common/Renderers/RenderersSlim.vcxproj (rev 0)
+++ sandbox/jng/common_decouple/Common/Renderers/RenderersSlim.vcxproj 2018-03-03 17:47:19 UTC (rev 9351)
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{A9BBBE56-1F77-426B-8EFE-6DDACC9F4991}</ProjectGuid>
+ <RootNamespace>Renderers</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ <ProjectName>RenderersSlim</ProjectName>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\$(Configuration)\Renderers\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\$(Configuration)64\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\obj\$(Configuration)64\Renderers\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\$(Configuration)\Renderers\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\$(Configuration)64\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\obj\$(Configuration)64\Renderers\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MgRenderersd</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MgRenderersd</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MgRenderers</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MgRenderers</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <AdditionalOptions>$(USRCFLAGS) %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\MdfModel;..\Stylization;..\..\Oem\FDO\inc;..\..\Oem\FDO\inc\ExpressionEngine;..\..\Oem\gd\gd;..\..\Oem\gd\freetype\include;..\..\Oem\agg-2.4\include;..\..\Oem\agg-2.4\font_freetype;..\..\Oem\gd\lpng;..\..\Oem\gd\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>zlibd.lib;gd.lib;freetype235_D.lib;libpngd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)MgRenderersd.dll</OutputFile>
+ <AdditionalLibraryDirectories>..\..\Oem\gd\build\win32\gd\$(Configuration);..\..\Oem\gd\freetype\objs\$(Configuration);..\..\Oem\gd\lpng\projects\vs\$(Configuration);..\..\Oem\gd\lpng\projects\vs\$(Configuration)\ZLib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)MgRenderersd.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>..\lib\$(Configuration)\MgRenderersd.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ <ForceFileOutput>
+ </ForceFileOutput>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <AdditionalOptions>$(USRCFLAGS) %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\MdfModel;..\Stylization;..\..\Oem\FDO\inc;..\..\Oem\FDO\inc\ExpressionEngine;..\..\Oem\gd\gd;..\..\Oem\gd\freetype\include;..\..\Oem\agg-2.4\include;..\..\Oem\agg-2.4\font_freetype;..\..\Oem\gd\lpng;..\..\Oem\gd\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>zlibd.lib;gd.lib;freetype235_D.lib;libpngd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)MgRenderersd.dll</OutputFile>
+ <AdditionalLibraryDirectories>..\..\Oem\gd\build\win32\gd\$(Configuration)64;..\..\Oem\gd\freetype\objs\$(Configuration)64;..\..\Oem\gd\lpng\projects\vs\$(Configuration)64;..\..\Oem\gd\lpng\projects\vs\$(Configuration)64\ZLib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)MgRenderersd.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <ImportLibrary>..\lib\$(Configuration)64\MgRenderersd.lib</ImportLibrary>
+ <TargetMachine>MachineX64</TargetMachine>
+ <ForceFileOutput>
+ </ForceFileOutput>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalOptions>$(USRCFLAGS) %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ <OmitFramePointers>true</OmitFramePointers>
+ <AdditionalIncludeDirectories>..\MdfModel;..\Stylization;..\..\Oem\FDO\inc;..\..\Oem\gd\gd;..\..\Oem\gd\freetype\include;..\..\Oem\agg-2.4\include;..\..\Oem\gd\lpng;..\..\Oem\agg-2.4\font_freetype;..\..\Oem\gd\zlib;..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;gd.lib;freetype235.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)MgRenderers.dll</OutputFile>
+ <AdditionalLibraryDirectories>..\..\Oem\gd\build\win32\gd\$(Configuration);..\..\Oem\gd\freetype\objs\$(Configuration);..\..\Oem\gd\lpng\projects\vs\$(Configuration);..\..\Oem\gd\lpng\projects\vs\$(Configuration)\ZLib%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)MgRenderers.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>..\lib\$(Configuration)\MgRenderers.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ <ForceFileOutput>
+ </ForceFileOutput>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <AdditionalOptions>$(USRCFLAGS) %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ <OmitFramePointers>true</OmitFramePointers>
+ <AdditionalIncludeDirectories>..\MdfModel;..\Stylization;..\..\Oem\FDO\inc;..\..\Oem\gd\gd;..\..\Oem\gd\freetype\include;..\..\Oem\agg-2.4\include;..\..\Oem\gd\lpng;..\..\Oem\agg-2.4\font_freetype;..\..\Oem\gd\zlib;..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>zlib.lib;gd.lib;freetype235.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)MgRenderers.dll</OutputFile>
+ <AdditionalLibraryDirectories>..\..\Oem\gd\build\win32\gd\$(Configuration)64;..\..\Oem\gd\freetype\objs\$(Configuration)64;..\..\Oem\gd\lpng\projects\vs\$(Configuration)64;..\..\Oem\gd\lpng\projects\vs\$(Configuration)64\ZLib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)MgRenderers.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <ImportLibrary>..\lib\$(Configuration)64\MgRenderers.lib</ImportLibrary>
+ <TargetMachine>MachineX64</TargetMachine>
+ <ForceFileOutput>
+ </ForceFileOutput>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="GDUtils.cpp" />
+ <ClCompile Include="MapQuantization.cpp" />
+ <ClCompile Include="RS_ByteData.cpp" />
+ <ClCompile Include="SymbolTrans.cpp" />
+ <ClCompile Include="UTFGridContent.cpp" />
+ <ClCompile Include="UTFGridRenderer.cpp" />
+ <ClCompile Include="ObservationMesh.cpp" />
+ <ClCompile Include="KmlContent.cpp" />
+ <ClCompile Include="KmlIconStyle.cpp" />
+ <ClCompile Include="KmlLineStyle.cpp" />
+ <ClCompile Include="KmlPolyStyle.cpp" />
+ <ClCompile Include="KmlRenderer.cpp" />
+ <ClCompile Include="FontManager.cpp" />
+ <ClCompile Include="..\..\Oem\agg-2.4\src\agg_curves.cpp">
+ <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <ClCompile Include="..\..\Oem\agg-2.4\font_freetype\agg_font_freetype.cpp">
+ <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4100;4244;4267;4512;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4100;4244;4267;4512;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4100;4244;4267;4512;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4100;4244;4267;4512;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <ClCompile Include="..\..\Oem\agg-2.4\src\agg_line_aa_basics.cpp" />
+ <ClCompile Include="..\..\Oem\agg-2.4\src\agg_line_profile_aa.cpp" />
+ <ClCompile Include="..\..\Oem\agg-2.4\src\agg_sqrt_tables.cpp" />
+ <ClCompile Include="..\..\Oem\agg-2.4\src\agg_trans_affine.cpp" />
+ <ClCompile Include="..\..\Oem\agg-2.4\src\agg_vcgen_contour.cpp" />
+ <ClCompile Include="..\..\Oem\agg-2.4\src\agg_vcgen_stroke.cpp" />
+ <ClCompile Include="AGGFillPatterns.cpp" />
+ <ClCompile Include="AGGImageIO.cpp" />
+ <ClCompile Include="AGGRenderer.cpp" />
+ <ClCompile Include="CriticalSection.cpp" />
+ <ClCompile Include="RenderUtil.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="agg_utfgrid_context.h" />
+ <ClInclude Include="GDUtils.h" />
+ <ClInclude Include="MapQuantization.h" />
+ <ClInclude Include="MapUTFGrid.h" />
+ <ClInclude Include="RS_ByteData.h" />
+ <ClInclude Include="SymbolTrans.h" />
+ <ClInclude Include="UTFGridContent.h" />
+ <ClInclude Include="UTFGridRenderer.h" />
+ <ClInclude Include="ObservationMesh.h" />
+ <ClInclude Include="KmlContent.h" />
+ <ClInclude Include="KmlIconStyle.h" />
+ <ClInclude Include="KmlLineStyle.h" />
+ <ClInclude Include="KmlPolyStyle.h" />
+ <ClInclude Include="KmlRenderer.h" />
+ <ClInclude Include="FontManager.h" />
+ <ClInclude Include="agg_context.h" />
+ <ClInclude Include="agg_mg_overloads.h" />
+ <ClInclude Include="AGGFillPatterns.h" />
+ <ClInclude Include="AGGImageIO.h" />
+ <ClInclude Include="AGGRenderer.h" />
+ <ClInclude Include="CriticalSection.h" />
+ <ClInclude Include="Renderers.h" />
+ <ClInclude Include="RenderUtil.h" />
+ <ClInclude Include="stdafx.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="Renderers.rc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\MdfModel\MDFModel.vcxproj">
+ <Project>{c50254f2-654a-48de-af5b-20605aef8d10}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\Stylization\Stylization.vcxproj">
+ <Project>{341d5463-186e-49ba-b942-3d3be28d65c0}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Added: sandbox/jng/common_decouple/Common/Renderers/RenderersSlim.vcxproj.filters
===================================================================
--- sandbox/jng/common_decouple/Common/Renderers/RenderersSlim.vcxproj.filters (rev 0)
+++ sandbox/jng/common_decouple/Common/Renderers/RenderersSlim.vcxproj.filters 2018-03-03 17:47:19 UTC (rev 9351)
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="CSTransformers">
+ <UniqueIdentifier>{b08c2fd6-9fea-4ce3-9ecf-006822957739}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Mesh">
+ <UniqueIdentifier>{f451c1e3-40e1-4a05-a00e-22d2a2bd70fe}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="KmlRenderer">
+ <UniqueIdentifier>{1cba4c6e-438e-46f2-a8c6-a343cdd191db}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="FontEngine">
+ <UniqueIdentifier>{dcbd7b18-5be9-4904-a9c6-07792d3fcfdf}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="AGGRenderer">
+ <UniqueIdentifier>{737455e1-014f-4212-b295-d535728637bc}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="UTFGridRenderer">
+ <UniqueIdentifier>{139cab4d-e977-4ad2-8526-73e40cb9dde1}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="SymbolTrans.cpp">
+ <Filter>CSTransformers</Filter>
+ </ClCompile>
+ <ClCompile Include="ObservationMesh.cpp">
+ <Filter>Mesh</Filter>
+ </ClCompile>
+ <ClCompile Include="KmlContent.cpp">
+ <Filter>KmlRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="KmlIconStyle.cpp">
+ <Filter>KmlRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="KmlLineStyle.cpp">
+ <Filter>KmlRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="KmlPolyStyle.cpp">
+ <Filter>KmlRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="KmlRenderer.cpp">
+ <Filter>KmlRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="FontManager.cpp">
+ <Filter>FontEngine</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Oem\agg-2.4\src\agg_curves.cpp">
+ <Filter>AGGRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Oem\agg-2.4\font_freetype\agg_font_freetype.cpp">
+ <Filter>AGGRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Oem\agg-2.4\src\agg_line_aa_basics.cpp">
+ <Filter>AGGRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Oem\agg-2.4\src\agg_line_profile_aa.cpp">
+ <Filter>AGGRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Oem\agg-2.4\src\agg_sqrt_tables.cpp">
+ <Filter>AGGRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Oem\agg-2.4\src\agg_trans_affine.cpp">
+ <Filter>AGGRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Oem\agg-2.4\src\agg_vcgen_contour.cpp">
+ <Filter>AGGRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Oem\agg-2.4\src\agg_vcgen_stroke.cpp">
+ <Filter>AGGRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="AGGFillPatterns.cpp">
+ <Filter>AGGRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="AGGImageIO.cpp">
+ <Filter>AGGRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="AGGRenderer.cpp">
+ <Filter>AGGRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="CriticalSection.cpp" />
+ <ClCompile Include="MapQuantization.cpp" />
+ <ClCompile Include="RenderUtil.cpp" />
+ <ClCompile Include="UTFGridRenderer.cpp">
+ <Filter>UTFGridRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="UTFGridContent.cpp">
+ <Filter>UTFGridRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="RS_ByteData.cpp">
+ <Filter>AGGRenderer</Filter>
+ </ClCompile>
+ <ClCompile Include="GDUtils.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="SymbolTrans.h">
+ <Filter>CSTransformers</Filter>
+ </ClInclude>
+ <ClInclude Include="ObservationMesh.h">
+ <Filter>Mesh</Filter>
+ </ClInclude>
+ <ClInclude Include="KmlContent.h">
+ <Filter>KmlRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="KmlIconStyle.h">
+ <Filter>KmlRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="KmlLineStyle.h">
+ <Filter>KmlRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="KmlPolyStyle.h">
+ <Filter>KmlRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="KmlRenderer.h">
+ <Filter>KmlRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="FontManager.h">
+ <Filter>FontEngine</Filter>
+ </ClInclude>
+ <ClInclude Include="agg_context.h">
+ <Filter>AGGRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="agg_mg_overloads.h">
+ <Filter>AGGRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="AGGFillPatterns.h">
+ <Filter>AGGRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="AGGImageIO.h">
+ <Filter>AGGRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="AGGRenderer.h">
+ <Filter>AGGRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="CriticalSection.h" />
+ <ClInclude Include="MapQuantization.h" />
+ <ClInclude Include="Renderers.h" />
+ <ClInclude Include="RenderUtil.h" />
+ <ClInclude Include="stdafx.h" />
+ <ClInclude Include="UTFGridRenderer.h">
+ <Filter>UTFGridRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="UTFGridContent.h">
+ <Filter>UTFGridRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="agg_utfgrid_context.h">
+ <Filter>UTFGridRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="MapUTFGrid.h">
+ <Filter>UTFGridRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="RS_ByteData.h">
+ <Filter>AGGRenderer</Filter>
+ </ClInclude>
+ <ClInclude Include="GDUtils.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="Renderers.rc" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
More information about the mapguide-commits
mailing list