Skip to content

O
onlyoffice_core
Commit 3f3414e5 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

MetaFile из HtmlRenderer в raster, добавление Jp2 файлов в win32 проект raster 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62576 954022d7-b5bf-4e40-9824-e11837661b57
parent 19d8619b
Hide whitespace changes
Inline Side-by-side
Showing with 291 additions and 191 deletions
ASCHTMLRenderer/ASCHTMLRendererLib.vcproj
View file @ 3f3414e5
<?xml version="1.0" encoding="windows-1251"?> <?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8,00"
Name="ASCHTMLRenderer" Name="ASCHTMLRenderer"
ProjectGUID="{DC24710E-8DF2-4A7A-B7C3-2313E294143C}" ProjectGUID="{DC24710E-8DF2-4A7A-B7C3-2313E294143C}"
RootNamespace="ASCHTMLRenderer" RootNamespace="ASCHTMLRenderer"
...@@ -414,138 +414,6 @@ ...@@ -414,138 +414,6 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="MetaFile"
>
<File
RelativePath="..\DesktopEditor\raster\Metafile\MetaFile.cpp"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\MetaFile.h"
>
</File>
<Filter
Name="Wmf"
>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfClip.cpp"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfClip.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfFile.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfObjects.cpp"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfObjects.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfPlayer.cpp"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfPlayer.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfTypes.h"
>
</File>
</Filter>
<Filter
Name="Emf"
>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfClip.cpp"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfClip.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfFile.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfObjects.cpp"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfObjects.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPath.cpp"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPath.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPlayer.cpp"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPlayer.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfTypes.h"
>
</File>
</Filter>
<Filter
Name="Common"
>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Common\IOutputDevice.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFile.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileClip.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileObjects.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileRenderer.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileTypes.cpp"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileTypes.h"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileUtils.cpp"
>
</File>
<File
RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileUtils.h"
>
</File>
</Filter>
</Filter>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>
......
ASCOfficeDocxFile2/X2tConverter_win_test.sln
View file @ 3f3414e5
...@@ -17,36 +17,36 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "font_engine", "..\DesktopEd ...@@ -17,36 +17,36 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "font_engine", "..\DesktopEd
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCHTMLRenderer", "..\ASCHTMLRenderer\ASCHTMLRendererLib.vcproj", "{DC24710E-8DF2-4A7A-B7C3-2313E294143C}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCHTMLRenderer", "..\ASCHTMLRenderer\ASCHTMLRendererLib.vcproj", "{DC24710E-8DF2-4A7A-B7C3-2313E294143C}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470} {818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\DesktopEditor\graphics\graphics_vs2005.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\DesktopEditor\graphics\graphics_vs2005.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470} {818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jasper", "..\DesktopEditor\cximage\jasper\jasper_vs2005.vcproj", "{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jasper", "..\DesktopEditor\cximage\jasper\jasper_vs2005.vcproj", "{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}"
...@@ -76,18 +76,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeUtilsLib", "..\ASC ...@@ -76,18 +76,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeUtilsLib", "..\ASC
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "X2tConverter_win", "..\Test\Applications\DocxFormatTests\DocxFormatTestRead\win32\DocxFormatTestRead.vcproj", "{C774B3D6-5A46-4449-BC2E-9FFA4B21F233}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "X2tConverter_win", "..\Test\Applications\DocxFormatTests\DocxFormatTestRead\win32\DocxFormatTestRead.vcproj", "{C774B3D6-5A46-4449-BC2E-9FFA4B21F233}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{7B27E40E-F70A-4A74-A77C-0944D7931D15} = {7B27E40E-F70A-4A74-A77C-0944D7931D15}
{E8EC320B-F0BF-4728-912A-41FAFC89051B} = {E8EC320B-F0BF-4728-912A-41FAFC89051B}
{DC24710E-8DF2-4A7A-B7C3-2313E294143C} = {DC24710E-8DF2-4A7A-B7C3-2313E294143C}
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
{DACBE6CA-E089-47D1-8CE7-C7DB59C15417} = {DACBE6CA-E089-47D1-8CE7-C7DB59C15417}
{AF2D00A7-A351-4700-AE88-C1D9ADE29345} = {AF2D00A7-A351-4700-AE88-C1D9ADE29345}
{C5371405-338F-4B70-83BD-2A5CDF64F383} = {C5371405-338F-4B70-83BD-2A5CDF64F383}
{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36} {BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
{C5371405-338F-4B70-83BD-2A5CDF64F383} = {C5371405-338F-4B70-83BD-2A5CDF64F383}
{AF2D00A7-A351-4700-AE88-C1D9ADE29345} = {AF2D00A7-A351-4700-AE88-C1D9ADE29345}
{DACBE6CA-E089-47D1-8CE7-C7DB59C15417} = {DACBE6CA-E089-47D1-8CE7-C7DB59C15417}
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
{DC24710E-8DF2-4A7A-B7C3-2313E294143C} = {DC24710E-8DF2-4A7A-B7C3-2313E294143C}
{E8EC320B-F0BF-4728-912A-41FAFC89051B} = {E8EC320B-F0BF-4728-912A-41FAFC89051B}
{7B27E40E-F70A-4A74-A77C-0944D7931D15} = {7B27E40E-F70A-4A74-A77C-0944D7931D15}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PdfWriterLib", "..\ASCOfficePDFWriter\PdfWriterLib\Win32\PdfWriterLib.vcproj", "{E8EC320B-F0BF-4728-912A-41FAFC89051B}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PdfWriterLib", "..\ASCOfficePDFWriter\PdfWriterLib\Win32\PdfWriterLib.vcproj", "{E8EC320B-F0BF-4728-912A-41FAFC89051B}"
......
ASCOfficeTxtFile/TxtXmlFormatLib/Source/TxtXmlFile.cpp
View file @ 3f3414e5
...@@ -14,12 +14,12 @@ namespace NSBinPptxRW ...@@ -14,12 +14,12 @@ namespace NSBinPptxRW
class CDrawingConverter; class CDrawingConverter;
} }
#if defined (_WIN32) || defined (_WIN64) //#if defined (_WIN32) || defined (_WIN64)
namespace BinDocxRW // namespace BinDocxRW
{ // {
int g_nCurFormatVersion = 0; //extern from XlsxSerializer // int g_nCurFormatVersion = 0; //extern from ...Serializer
} // }
#endif //#endif
#include "../../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h" #include "../../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
#include "../../../Common/OfficeDefines.h" #include "../../../Common/OfficeDefines.h"
......
ASCOfficeTxtFile/TxtXmlFormatLib/Win32/TxtXmlFormatLib.vcproj
View file @ 3f3414e5
...@@ -423,6 +423,14 @@ ...@@ -423,6 +423,14 @@
<File <File
RelativePath="..\Source\ConvertTxt2Docx.cpp" RelativePath="..\Source\ConvertTxt2Docx.cpp"
> >
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/bigobj"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\Source\ConvertTxt2Docx.h" RelativePath="..\Source\ConvertTxt2Docx.h"
......
DesktopEditor/raster/JBig2/source/JBig2File.cpp
View file @ 3f3414e5
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <tchar.h> #include <tchar.h>
#endif #endif
#include "../../common/File.h" #include "../../../common/File.h"
CJBig2File::CJBig2File() CJBig2File::CJBig2File()
{ {
......
DesktopEditor/raster/JBig2/win32/jbig2.vcproj
View file @ 3f3414e5
...@@ -81,12 +81,11 @@ ...@@ -81,12 +81,11 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
...@@ -102,11 +101,15 @@ ...@@ -102,11 +101,15 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB" Optimization="0"
RuntimeLibrary="2" PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"
...@@ -141,11 +144,12 @@ ...@@ -141,11 +144,12 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
...@@ -161,15 +165,11 @@ ...@@ -161,15 +165,11 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB" RuntimeLibrary="2"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
> >
</File> </File>
<File <File
RelativePath="..\source\LeptonLib\blend.cpp" RelativePath="..\source\LeptonLib\blend1.cpp"
> >
</File> </File>
<File <File
...@@ -562,7 +562,7 @@ ...@@ -562,7 +562,7 @@
> >
</File> </File>
<File <File
RelativePath="..\source\LeptonLib\graphics.cpp" RelativePath="..\source\LeptonLib\graphics1.cpp"
> >
</File> </File>
<File <File
......
DesktopEditor/raster/raster_vs2005.vcproj
View file @ 3f3414e5
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories="&quot;../freetype-2.5.2/include&quot;;&quot;../agg-2.4/include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories="&quot;../freetype-2.5.2/include&quot;;&quot;../agg-2.4/include&quot;"
PreprocessorDefinitions="_LIB;WIN32;_DEBUG;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS" PreprocessorDefinitions="_LIB;WIN32;_DEBUG;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -417,7 +417,7 @@ ...@@ -417,7 +417,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories="&quot;../freetype-2.5.2/include&quot;;&quot;../agg-2.4/include&quot;"
PreprocessorDefinitions="_LIB;WIN32;NDEBUG;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS" PreprocessorDefinitions="_LIB;WIN32;NDEBUG;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
...@@ -568,7 +568,7 @@ ...@@ -568,7 +568,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories="&quot;../freetype-2.5.2/include&quot;;&quot;../agg-2.4/include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;$(NOINHERIT)" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;$(NOINHERIT)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -654,6 +654,230 @@ ...@@ -654,6 +654,230 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="MetaFile"
>
<File
RelativePath=".\Metafile\MetaFile.cpp"
>
</File>
<File
RelativePath=".\Metafile\MetaFile.h"
>
</File>
<Filter
Name="Wmf"
>
<File
RelativePath=".\Metafile\Wmf\WmfClip.cpp"
>
</File>
<File
RelativePath=".\Metafile\Wmf\WmfClip.h"
>
</File>
<File
RelativePath=".\Metafile\Wmf\WmfFile.h"
>
</File>
<File
RelativePath=".\Metafile\Wmf\WmfObjects.cpp"
>
</File>
<File
RelativePath=".\Metafile\Wmf\WmfObjects.h"
>
</File>
<File
RelativePath=".\Metafile\Wmf\WmfPlayer.cpp"
>
</File>
<File
RelativePath=".\Metafile\Wmf\WmfPlayer.h"
>
</File>
<File
RelativePath=".\Metafile\Wmf\WmfTypes.h"
>
</File>
</Filter>
<Filter
Name="Emf"
>
<File
RelativePath=".\Metafile\Emf\EmfClip.cpp"
>
</File>
<File
RelativePath=".\Metafile\Emf\EmfClip.h"
>
</File>
<File
RelativePath=".\Metafile\Emf\EmfFile.h"
>
</File>
<File
RelativePath=".\Metafile\Emf\EmfObjects.cpp"
>
</File>
<File
RelativePath=".\Metafile\Emf\EmfObjects.h"
>
</File>
<File
RelativePath=".\Metafile\Emf\EmfPath.cpp"
>
</File>
<File
RelativePath=".\Metafile\Emf\EmfPath.h"
>
</File>
<File
RelativePath=".\Metafile\Emf\EmfPlayer.cpp"
>
</File>
<File
RelativePath=".\Metafile\Emf\EmfPlayer.h"
>
</File>
<File
RelativePath=".\Metafile\Emf\EmfTypes.h"
>
</File>
</Filter>
<Filter
Name="Common"
>
<File
RelativePath=".\Metafile\Common\IOutputDevice.h"
>
</File>
<File
RelativePath=".\Metafile\Common\MetaFile.h"
>
</File>
<File
RelativePath=".\Metafile\Common\MetaFileClip.h"
>
</File>
<File
RelativePath=".\Metafile\Common\MetaFileObjects.h"
>
</File>
<File
RelativePath=".\Metafile\Common\MetaFileRenderer.h"
>
</File>
<File
RelativePath=".\Metafile\Common\MetaFileTypes.cpp"
>
</File>
<File
RelativePath=".\Metafile\Common\MetaFileTypes.h"
>
</File>
<File
RelativePath=".\Metafile\Common\MetaFileUtils.cpp"
>
</File>
<File
RelativePath=".\Metafile\Common\MetaFileUtils.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="Jp2"
>
<File
RelativePath=".\Jp2\ArithmeticCoder.h"
>
</File>
<File
RelativePath=".\Jp2\DWT.h"
>
</File>
<File
RelativePath=".\Jp2\Image.h"
>
</File>
<File
RelativePath=".\Jp2\J2k.h"
>
</File>
<File
RelativePath=".\Jp2\J2kFile.cpp"
>
</File>
<File
RelativePath=".\Jp2\J2kFile.h"
>
</File>
<File
RelativePath=".\Jp2\J2kIncludes.h"
>
</File>
<File
RelativePath=".\Jp2\Jp2.h"
>
</File>
<File
RelativePath=".\Jp2\JpgEvent.h"
>
</File>
<File
RelativePath=".\Jp2\Jpt.h"
>
</File>
<File
RelativePath=".\Jp2\Mj2.h"
>
</File>
<File
RelativePath=".\Jp2\PacketIterator.h"
>
</File>
<File
RelativePath=".\Jp2\Raw.h"
>
</File>
<File
RelativePath=".\Jp2\Reader.cpp"
>
</File>
<File
RelativePath=".\Jp2\Reader.h"
>
</File>
<File
RelativePath=".\Jp2\Stream.h"
>
</File>
<File
RelativePath=".\Jp2\TagTree.h"
>
</File>
<File
RelativePath=".\Jp2\Tier1.h"
>
</File>
<File
RelativePath=".\Jp2\Tier2.h"
>
</File>
<File
RelativePath=".\Jp2\Tile.h"
>
</File>
<File
RelativePath=".\Jp2\Types.h"
>
</File>
<File
RelativePath=".\Jp2\Utils.h"
>
</File>
</Filter>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7