Skip to content

O
onlyoffice_core
Commit 8c5ad051 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov
Browse files
Options

git-svn-id:... 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52491 954022d7-b5bf-4e40-9824-e11837661b57
parent 4cbbeba6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 693 additions and 769 deletions
ASCHTMLRenderer/AVSHTMLRenderer.cpp → ASCHTMLRenderer/ASCHTMLRenderer.cpp
View file @ 8c5ad051
// AVSHTMLRenderer.cpp : Implementation of DLL Exports. // ASCHTMLRenderer.cpp : Implementation of DLL Exports.
#include "stdafx.h" #include "stdafx.h"
...@@ -7,15 +7,15 @@ ...@@ -7,15 +7,15 @@
#include "HTMLRenderer.h" #include "HTMLRenderer.h"
#include "HTMLRenderer2.h" #include "HTMLRenderer2.h"
#include "HTMLRenderer3.h" #include "HTMLRenderer3.h"
#include "AVSSVGWriter.h" #include "ASCSVGWriter.h"
// The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
[ module(dll, uuid = "{08DC1F03-6867-4585-B939-422C9078F5FD}", [ module(dll, uuid = "{08DC1F03-6867-4585-B939-422C9078F5FD}",
name = "AVSHTMLRenderer", name = "ASCHTMLRenderer",
helpstring = "AVSHTMLRenderer 1.0 Type Library", helpstring = "ASCHTMLRenderer 1.0 Type Library",
resource_name = "IDR_AVSHTMLRENDERER") ] resource_name = "IDR_ASCHTMLRENDERER") ]
class CAVSHTMLRendererModule class CASCHTMLRendererModule
{ {
public: public:
// Override CAtlDllModuleT members // Override CAtlDllModuleT members
......
ASCHTMLRenderer/AVSHTMLRenderer.rc → ASCHTMLRenderer/ASCHTMLRenderer.rc
View file @ 8c5ad051
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// //
#include "resource.h" #include "resource.h"
#define COMPONENT_NAME "HTMLRenderer" #define COMPONENT_NAME "HTMLRenderer"
#include "../../../../Common/FileInfo.h" #include "../Common/FileInfo.h"
#include "version.h" #include "version.h"
#define APSTUDIO_READONLY_SYMBOLS #define APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
...@@ -66,7 +66,7 @@ IDB_SCRIPT_GR HTML2 "Resources\\canvas\\Graphics.js" ...@@ -66,7 +66,7 @@ IDB_SCRIPT_GR HTML2 "Resources\\canvas\\Graphics.js"
IDB_SCRIPT_VIEW HTML2 "Resources\\canvas\\Viewer.html" IDB_SCRIPT_VIEW HTML2 "Resources\\canvas\\Viewer.html"
#endif*/ #endif*/
IDB_COMMON_ZIP HTML2 "Resources\\common.zip" IDB_COMMON_ZIP HTML2 "Resources\\common.zip"
IDB_FONT_SCRIPT_FT HTML2 "Resources\\fonts\\freetype2.cc.js" IDB_FONT_SCRIPT_FT HTML2 "Resources\\fonts\\freetype2.cc.js"
IDB_FONT_SCRIPT_FM HTML2 "Resources\\fonts\\FontManager.js" IDB_FONT_SCRIPT_FM HTML2 "Resources\\fonts\\FontManager.js"
...@@ -137,7 +137,7 @@ END ...@@ -137,7 +137,7 @@ END
// REGISTRY // REGISTRY
// //
IDR_AVSHTMLRENDERER REGISTRY "AVSHTMLRenderer.rgs" IDR_ASCHTMLRENDERER REGISTRY "ASCHTMLRenderer.rgs"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
...@@ -146,7 +146,7 @@ IDR_AVSHTMLRENDERER REGISTRY "AVSHTMLRenderer.rgs" ...@@ -146,7 +146,7 @@ IDR_AVSHTMLRENDERER REGISTRY "AVSHTMLRenderer.rgs"
STRINGTABLE STRINGTABLE
BEGIN BEGIN
IDS_PROJNAME "AVSHTMLRenderer" IDS_PROJNAME "ASCHTMLRenderer"
END END
#endif // English (U.S.) resources #endif // English (U.S.) resources
......
ASCHTMLRenderer/AVSHTMLRenderer.rgs → ASCHTMLRenderer/ASCHTMLRenderer.rgs
View file @ 8c5ad051
...@@ -2,8 +2,8 @@ HKCR ...@@ -2,8 +2,8 @@ HKCR
{ {
NoRemove AppID NoRemove AppID
{ {
'%APPID%' = s 'AVSHTMLRenderer' '%APPID%' = s 'ASCHTMLRenderer'
'AVSHTMLRenderer.DLL' 'ASCHTMLRenderer.DLL'
{ {
val AppID = s '%APPID%' val AppID = s '%APPID%'
} }
......
ASCHTMLRenderer/AVSHTMLRenderer.sln → ASCHTMLRenderer/ASCHTMLRenderer.sln
View file @ 8c5ad051
 
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSHTMLRenderer", "AVSHTMLRenderer.vcproj", "{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCHTMLRenderer", "ASCHTMLRenderer.vcproj", "{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}"
EndProject EndProject
Global Global
GlobalSection(DPCodeReviewSolutionGUID) = preSolution GlobalSection(DPCodeReviewSolutionGUID) = preSolution
......
ASCHTMLRenderer/AVSHTMLRenderer.vcproj → ASCHTMLRenderer/ASCHTMLRenderer.vcproj
View file @ 8c5ad051
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8,00"
Name="AVSHTMLRenderer" Name="ASCHTMLRenderer"
ProjectGUID="{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}" ProjectGUID="{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}"
RootNamespace="AVSHTMLRenderer" RootNamespace="ASCHTMLRenderer"
Keyword="AtlProj" Keyword="AtlProj"
> >
<Platforms> <Platforms>
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1" TargetEnvironment="1"
GenerateStublessProxies="true" GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSHTMLRenderer.tlb" TypeLibraryName="$(IntDir)/ASCHTMLRenderer.tlb"
HeaderFileName="HTMLRenderer.h" HeaderFileName="HTMLRenderer.h"
DLLDataFileName="" DLLDataFileName=""
InterfaceIdentifierFileName="AVSHTMLRenderer_i.c" InterfaceIdentifierFileName="ASCHTMLRenderer_i.c"
ProxyFileName="AVSHTMLRenderer_p.c" ProxyFileName="ASCHTMLRenderer_p.c"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -78,14 +78,14 @@ ...@@ -78,14 +78,14 @@
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
AdditionalDependencies="comsvcs.lib comsuppw.lib Msimg32.lib gdiplus.lib" AdditionalDependencies="comsvcs.lib comsuppw.lib Msimg32.lib gdiplus.lib"
OutputFile="$(OutDir)/AVSHTMLRenderer.dll" OutputFile="$(OutDir)/ASCHTMLRenderer.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="..\AVSOfficeUtils\ZLIB\zlib123dll\static32" AdditionalLibraryDirectories="..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
IgnoreDefaultLibraryNames="LIBC.lib" IgnoreDefaultLibraryNames="LIBC.lib"
MergedIDLBaseFileName="_AVSHTMLRenderer.idl" MergedIDLBaseFileName="_ASCHTMLRenderer.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/AVSHTMLRenderer.lib" ImportLibrary="$(OutDir)/ASCHTMLRenderer.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
CommandLine="..\..\..\Redist\VersionControl.exe $(ProjectDir)version.h" CommandLine="..\Redist\VersionControl.exe $(ProjectDir)version.h"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -143,11 +143,11 @@ ...@@ -143,11 +143,11 @@
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1" TargetEnvironment="1"
GenerateStublessProxies="true" GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSHTMLRenderer.tlb" TypeLibraryName="$(IntDir)/ASCSHTMLRenderer.tlb"
HeaderFileName="HTMLRenderer.h" HeaderFileName="HTMLRenderer.h"
DLLDataFileName="" DLLDataFileName=""
InterfaceIdentifierFileName="AVSHTMLRenderer_i.c" InterfaceIdentifierFileName="ASCHTMLRenderer_i.c"
ProxyFileName="AVSHTMLRenderer_p.c" ProxyFileName="ASCHTMLRenderer_p.c"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -177,15 +177,15 @@ ...@@ -177,15 +177,15 @@
AdditionalDependencies="comsvcs.lib comsuppw.lib Msimg32.lib gdiplus.lib" AdditionalDependencies="comsvcs.lib comsuppw.lib Msimg32.lib gdiplus.lib"
OutputFile="Release\$(ProjectName).dll" OutputFile="Release\$(ProjectName).dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\AVSOfficeUtils\ZLIB\zlib123dll\static32" AdditionalLibraryDirectories="..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
IgnoreDefaultLibraryNames="LIBC.lib" IgnoreDefaultLibraryNames="LIBC.lib"
MergedIDLBaseFileName="_AVSHTMLRenderer.idl" MergedIDLBaseFileName="_ASCHTMLRenderer.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/AVSHTMLRenderer.lib" ImportLibrary="$(OutDir)/ASCHTMLRenderer.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -212,110 +212,9 @@ ...@@ -212,110 +212,9 @@
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Performing registration" Description="Performing registration"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\..\Redist\AVSOfficeStudio&quot;&#x0D;&#x0A;" CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\Redist\&quot;&#x0D;&#x0A;"
/> />
</Configuration> </Configuration>
<Configuration
Name="ReleaseASC|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="2"
UseOfATL="1"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="..\..\..\Redist\VersionControl.exe $(ProjectDir)version.h"
ExcludedFromBuild="true"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false"
TargetEnvironment="1"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSHTMLRenderer.tlb"
HeaderFileName="HTMLRenderer.h"
DLLDataFileName=""
InterfaceIdentifierFileName="AVSHTMLRenderer_i.c"
ProxyFileName="AVSHTMLRenderer_p.c"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;ASCBUILD"
Culture="1049"
AdditionalIncludeDirectories="$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="comsvcs.lib comsuppw.lib Msimg32.lib gdiplus.lib"
OutputFile="Release\ASCHTMLRenderer.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\AVSOfficeUtils\ZLIB\zlib123dll\static32"
IgnoreDefaultLibraryNames="LIBC.lib"
MergedIDLBaseFileName="_AVSHTMLRenderer.idl"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/AVSHTMLRenderer.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Performing registration"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\..\..\ASC\Redist\ASCOfficeStudio&quot;&#x0D;&#x0A;"
/>
</Configuration>
</Configurations> </Configurations>
<References> <References>
</References> </References>
...@@ -326,14 +225,14 @@ ...@@ -326,14 +225,14 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\AVSHTMLRenderer.cpp" RelativePath=".\ASCHTMLRenderer.cpp"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Avs\" ObjectFile="$(IntDir)\"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -341,7 +240,7 @@ ...@@ -341,7 +240,7 @@
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Avs\" ObjectFile="$(IntDir)\"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -349,12 +248,12 @@ ...@@ -349,12 +248,12 @@
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Avs\" ObjectFile="$(IntDir)\"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath=".\AVSSVGWriter.cpp" RelativePath=".\ASCSVGWriter.cpp"
> >
</File> </File>
<File <File
...@@ -365,7 +264,7 @@ ...@@ -365,7 +264,7 @@
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Avs\" ObjectFile="$(IntDir)\"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -373,7 +272,7 @@ ...@@ -373,7 +272,7 @@
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Avs\" ObjectFile="$(IntDir)\"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -381,7 +280,7 @@ ...@@ -381,7 +280,7 @@
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Avs\" ObjectFile="$(IntDir)\"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
...@@ -402,7 +301,7 @@ ...@@ -402,7 +301,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
UsePrecompiledHeader="1" UsePrecompiledHeader="1"
ObjectFile="$(IntDir)\Avs\" ObjectFile="$(IntDir)\"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -411,7 +310,7 @@ ...@@ -411,7 +310,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
UsePrecompiledHeader="1" UsePrecompiledHeader="1"
ObjectFile="$(IntDir)\Avs\" ObjectFile="$(IntDir)\"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -420,7 +319,7 @@ ...@@ -420,7 +319,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
UsePrecompiledHeader="1" UsePrecompiledHeader="1"
ObjectFile="$(IntDir)\Avs\" ObjectFile="$(IntDir)\"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
...@@ -431,7 +330,7 @@ ...@@ -431,7 +330,7 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File <File
RelativePath=".\AVSSVGWriter.h" RelativePath=".\ASCSVGWriter.h"
> >
</File> </File>
<File <File
...@@ -473,11 +372,11 @@ ...@@ -473,11 +372,11 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
<File <File
RelativePath=".\AVSHTMLRenderer.rc" RelativePath=".\ASCHTMLRenderer.rc"
> >
</File> </File>
<File <File
RelativePath=".\AVSHTMLRenderer.rgs" RelativePath=".\ASCHTMLRenderer.rgs"
> >
</File> </File>
</Filter> </Filter>
......
ASCHTMLRenderer/AVSSVGWriter.h → ASCHTMLRenderer/ASCSVGWriter.h
View file @ 8c5ad051
...@@ -2,12 +2,11 @@ ...@@ -2,12 +2,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "resource.h" // main symbols #include "resource.h" // main symbols
#include <string> #include <string>
#include "..\..\AVSVideoStudio3\Common\AVSUtils.h"
#include "..\..\AVSImageStudio3\AVSGraphics\Interfaces\AVSRenderer.h" #include "..\Common\ASCUtils.h"
#include "..\ASCImageStudio3\ASCGraphics\Interfaces\ASCRenderer.h"
#include "..\..\AVSVideoStudio3\Common\MediaFormatDefine.h" #include "..\Common\MediaFormatDefine.h"
#include "..\..\..\..\Common\TemporaryCS.h" #include "..\Common\TemporaryCS.h"
#include "Writer\Writer.h" #include "Writer\Writer.h"
#include "Graphics\Matrix.h" #include "Graphics\Matrix.h"
...@@ -16,17 +15,17 @@ ...@@ -16,17 +15,17 @@
#error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms." #error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."
#endif #endif
// CAVSSVGWriter // CASCSVGWriter
[ coclass, default(IAVSRenderer), threading(apartment), vi_progid("AVSHTMLRend.SvgWr"), progid("AVSHTMLRend.SvgWr.1"), version(1.0), uuid("EE5F599A-B5FE-48ec-A041-32528EAD4727") ] [ coclass, default(IASCRenderer), threading(apartment), vi_progid("AVSHTMLRend.SvgWr"), progid("AVSHTMLRend.SvgWr.1"), version(1.0), uuid("EE5F599A-B5FE-48ec-A041-32528EAD4727") ]
class ATL_NO_VTABLE CAVSSVGWriter : class ATL_NO_VTABLE CASCSVGWriter :
public IAVSRenderer, public IASCRenderer,
public NSHtmlRenderer::IBaseMatrixUpdater public NSHtmlRenderer::IBaseMatrixUpdater
{ {
public: public:
DECLARE_PROTECT_FINAL_CONSTRUCT() DECLARE_PROTECT_FINAL_CONSTRUCT()
CAVSSVGWriter(); CASCSVGWriter();
~CAVSSVGWriter() ~CASCSVGWriter()
{ {
} }
...@@ -186,8 +185,8 @@ private: ...@@ -186,8 +185,8 @@ private:
NSHtmlRenderer::CSVGGraphicsWriter m_oVectorWriter; NSHtmlRenderer::CSVGGraphicsWriter m_oVectorWriter;
AVSGraphics::IAVSGraphicSimpleComverter* m_pSimpleGraphicsConverter; // Graphics::IASCGraphicSimpleComverter* m_pSimpleGraphicsConverter; //
AVSGraphics::IAVSFontManager* m_pFontManager; // Graphics::IASCFontManager* m_pFontManager; //
NSHtmlRenderer::CMatrix m_oBaseTransform; // (: -> ) NSHtmlRenderer::CMatrix m_oBaseTransform; // (: -> )
NSHtmlRenderer::CMatrix m_oTransform; // NSHtmlRenderer::CMatrix m_oTransform; //
...@@ -213,7 +212,7 @@ private: ...@@ -213,7 +212,7 @@ private:
NSStructures::CFont m_oInstalledFont; NSStructures::CFont m_oInstalledFont;
AVSGraphics::IAVSWinFonts* m_pFonts; Graphics::IASCWinFonts* m_pFonts;
bool m_bIsRaster; bool m_bIsRaster;
...@@ -275,7 +274,7 @@ protected: ...@@ -275,7 +274,7 @@ protected:
{ {
if (NULL == m_pFontManager) if (NULL == m_pFontManager)
{ {
CoCreateInstance(__uuidof(AVSGraphics::CAVSFontManager), NULL, CLSCTX_ALL, __uuidof(AVSGraphics::IAVSFontManager), (void**)&m_pFontManager); CoCreateInstance(__uuidof(Graphics::CASCFontManager), NULL, CLSCTX_ALL, __uuidof(Graphics::IASCFontManager), (void**)&m_pFontManager);
m_pFontManager->Initialize(L""); m_pFontManager->Initialize(L"");
} }
......
ASCHTMLRenderer/Graphics/Structures.h
View file @ 8c5ad051
#pragma once #pragma once
#include "..\stdafx.h" #include "..\stdafx.h"
#include "..\..\..\..\..\Common\XmlUtils.h" #include "..\..\Common\XmlUtils.h"
#include "..\..\..\AVSVideoStudio3\Common\AVSUtils.h" #include "..\..\Common\ASCUtils.h"
#include "..\..\..\AVSImageStudio3\AVSGraphics\Interfaces\AVSRenderer.h" #include "..\..\ASCImageStudio3\ASCGraphics\Interfaces\ASCRenderer.h"
#include "ap_aggplusenums.h" #include "ap_aggplusenums.h"
#include <gdiplus.h> #include <gdiplus.h>
...@@ -333,7 +333,7 @@ namespace NSStructures ...@@ -333,7 +333,7 @@ namespace NSStructures
(DashStyle == pPen->DashStyle) && (LineStartCap == pPen->LineStartCap) && (DashStyle == pPen->DashStyle) && (LineStartCap == pPen->LineStartCap) &&
(LineEndCap == pPen->LineEndCap) && (LineJoin == pPen->LineJoin)); (LineEndCap == pPen->LineEndCap) && (LineJoin == pPen->LineJoin));
} }
void SetToRenderer(IAVSRenderer *pRenderer) void SetToRenderer(IASCRenderer *pRenderer)
{ {
pRenderer->put_PenColor(Color); pRenderer->put_PenColor(Color);
pRenderer->put_PenAlpha(Alpha); pRenderer->put_PenAlpha(Alpha);
...@@ -762,7 +762,7 @@ namespace NSStructures ...@@ -762,7 +762,7 @@ namespace NSStructures
(c_BrushTypeHatch1 <= Type && c_BrushTypeHatch53 >= Type)); (c_BrushTypeHatch1 <= Type && c_BrushTypeHatch53 >= Type));
} }
void SetToRenderer(IAVSRenderer *pRenderer) void SetToRenderer(IASCRenderer *pRenderer)
{ {
Type = ConstantCompatible(Type); Type = ConstantCompatible(Type);
pRenderer->put_BrushType(Type); pRenderer->put_BrushType(Type);
...@@ -969,7 +969,7 @@ namespace NSStructures ...@@ -969,7 +969,7 @@ namespace NSStructures
Underline = (byte)(0x7C & lStyle) >> 2; Underline = (byte)(0x7C & lStyle) >> 2;
Strikeout = (byte)(0x0180 & lStyle) >> 7; Strikeout = (byte)(0x0180 & lStyle) >> 7;
} }
void SetToRenderer(IAVSRenderer *pRenderer) void SetToRenderer(IASCRenderer *pRenderer)
{ {
BSTR bstrName = Name.AllocSysString(); BSTR bstrName = Name.AllocSysString();
pRenderer->put_FontName(bstrName); pRenderer->put_FontName(bstrName);
......
ASCHTMLRenderer/HTMLRenderer.cpp
View file @ 8c5ad051
This diff is collapsed.
ASCHTMLRenderer/HTMLRenderer.h
View file @ 8c5ad051
...@@ -2,12 +2,11 @@ ...@@ -2,12 +2,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "resource.h" // main symbols #include "resource.h" // main symbols
#include <string> #include <string>
#include "..\..\AVSVideoStudio3\Common\AVSUtils.h"
#include "..\..\AVSImageStudio3\AVSGraphics\Interfaces\AVSRenderer.h" #include "..\Common\ASCUtils.h"
#include "..\ASCImageStudio3\ASCGraphics\Interfaces\ASCRenderer.h"
#include "..\..\AVSVideoStudio3\Common\MediaFormatDefine.h" #include "..\Common\MediaFormatDefine.h"
#include "..\..\..\..\Common\TemporaryCS.h" #include "..\Common\TemporaryCS.h"
#include "Writer\Writer.h" #include "Writer\Writer.h"
#include "Graphics\Matrix.h" #include "Graphics\Matrix.h"
...@@ -16,9 +15,9 @@ ...@@ -16,9 +15,9 @@
#error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms." #error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."
#endif #endif
// IAVSHTMLRenderer // IASCHTMLRenderer
[ object, uuid("064C9A71-7852-4fd7-A5AF-16C3D601DCD2"), dual, pointer_default(unique) ] [ object, uuid("064C9A71-7852-4fd7-A5AF-16C3D601DCD2"), dual, pointer_default(unique) ]
__interface IAVSHTMLRenderer: IAVSRenderer __interface IASCHTMLRenderer: IASCRenderer
{ {
[id(5003), propget] HRESULT Mode([out, retval] LONG* plMode); [id(5003), propget] HRESULT Mode([out, retval] LONG* plMode);
[id(5003), propput] HRESULT Mode([in] LONG lMode); [id(5003), propput] HRESULT Mode([in] LONG lMode);
...@@ -27,28 +26,28 @@ __interface IAVSHTMLRenderer: IAVSRenderer ...@@ -27,28 +26,28 @@ __interface IAVSHTMLRenderer: IAVSRenderer
[id(5001)] HRESULT CloseFile(); [id(5001)] HRESULT CloseFile();
}; };
// _IAVSHTMLRendererEvents // _IASCHTMLRendererEvents
[uuid("B838358D-E3F5-40e0-A4DD-E8A95115E83C"), dispinterface] [uuid("B838358D-E3F5-40e0-A4DD-E8A95115E83C"), dispinterface]
__interface _IAVSHTMLRendererEvents __interface _IASCHTMLRendererEvents
{ {
}; };
// CAVSHTMLRenderer // CASCHTMLRenderer
[ coclass, default(IAVSHTMLRenderer), threading(apartment), event_source(com), vi_progid("AVSHTMLRend.Rend"), progid("AVSHTMLRend.Rend.1"), version(1.0), uuid("BEB6C6D1-EF98-42e7-AC2C-571E4301ECD6") ] [ coclass, default(IASCHTMLRenderer), threading(apartment), event_source(com), vi_progid("AVSHTMLRend.Rend"), progid("AVSHTMLRend.Rend.1"), version(1.0), uuid("BEB6C6D1-EF98-42e7-AC2C-571E4301ECD6") ]
class ATL_NO_VTABLE CAVSHTMLRenderer : class ATL_NO_VTABLE CASCHTMLRenderer :
public IAVSHTMLRenderer, public IASCHTMLRenderer,
public NSHtmlRenderer::IBaseMatrixUpdater public NSHtmlRenderer::IBaseMatrixUpdater
{ {
private: private:
public: public:
__event __interface _IAVSHTMLRendererEvents; __event __interface _IASCHTMLRendererEvents;
public: public:
DECLARE_PROTECT_FINAL_CONSTRUCT() DECLARE_PROTECT_FINAL_CONSTRUCT()
CAVSHTMLRenderer(); CASCHTMLRenderer();
~CAVSHTMLRenderer() ~CASCHTMLRenderer()
{ {
} }
...@@ -234,8 +233,8 @@ private: ...@@ -234,8 +233,8 @@ private:
CString m_strDstFile; CString m_strDstFile;
LONG m_lLastSavedPage; LONG m_lLastSavedPage;
AVSGraphics::IAVSGraphicSimpleComverter* m_pSimpleGraphicsConverter; // Graphics::IASCGraphicSimpleComverter* m_pSimpleGraphicsConverter; //
AVSGraphics::IAVSFontManager* m_pFontManager; // Graphics::IASCFontManager* m_pFontManager; //
NSHtmlRenderer::CMatrix m_oBaseTransform; // (: -> ) NSHtmlRenderer::CMatrix m_oBaseTransform; // (: -> )
NSHtmlRenderer::CMatrix m_oTransform; // NSHtmlRenderer::CMatrix m_oTransform; //
...@@ -264,13 +263,15 @@ private: ...@@ -264,13 +263,15 @@ private:
BOOL m_bPageClosed; BOOL m_bPageClosed;
BOOL m_bPageOpened; BOOL m_bPageOpened;
AVSGraphics::IAVSWinFonts* m_pFonts; Graphics::IASCWinFonts* m_pFonts;
BOOL m_bIsThumbnailsCreate; BOOL m_bIsThumbnailsCreate;
BOOL m_bIsWEB; BOOL m_bIsWEB;
BOOL m_bIsMenu; BOOL m_bIsMenu;
AVSGraphics::IAVSEffectPainter* m_pEffectPainter; #ifdef BUILD_SUPPORT_UNREGISTERED_WATERMARK
Graphics::IAVSEffectPainter* m_pEffectPainter;
#endif
BOOL m_bIsWatermarkEnabled; BOOL m_bIsWatermarkEnabled;
protected: protected:
...@@ -344,6 +345,7 @@ protected: ...@@ -344,6 +345,7 @@ protected:
m_oThumbnail.Save(m_oWriter.m_strDstDirectoryFiles + strThumbnail); m_oThumbnail.Save(m_oWriter.m_strDstDirectoryFiles + strThumbnail);
} }
#ifdef BUILD_SUPPORT_UNREGISTERED_WATERMARK
if (NULL != m_pEffectPainter) if (NULL != m_pEffectPainter)
{ {
m_bIsWatermarkEnabled = TRUE; m_bIsWatermarkEnabled = TRUE;
...@@ -355,6 +357,7 @@ protected: ...@@ -355,6 +357,7 @@ protected:
m_bIsWatermarkEnabled = FALSE; m_bIsWatermarkEnabled = FALSE;
} }
#endif
m_oWriter.EndPage(m_bIsWEB); m_oWriter.EndPage(m_bIsWEB);
...@@ -365,7 +368,7 @@ protected: ...@@ -365,7 +368,7 @@ protected:
{ {
if (NULL == m_pFontManager) if (NULL == m_pFontManager)
{ {
CoCreateInstance(__uuidof(AVSGraphics::CAVSFontManager), NULL, CLSCTX_ALL, __uuidof(AVSGraphics::IAVSFontManager), (void**)&m_pFontManager); CoCreateInstance(__uuidof(Graphics::CASCFontManager), NULL, CLSCTX_ALL, __uuidof(Graphics::IASCFontManager), (void**)&m_pFontManager);
m_pFontManager->Initialize(L""); m_pFontManager->Initialize(L"");
} }
......
ASCHTMLRenderer/HTMLRenderer2.cpp
View file @ 8c5ad051
This diff is collapsed.
ASCHTMLRenderer/HTMLRenderer2.h
View file @ 8c5ad051
...@@ -2,12 +2,11 @@ ...@@ -2,12 +2,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "resource.h" // main symbols #include "resource.h" // main symbols
#include <string> #include <string>
#include "..\..\AVSVideoStudio3\Common\AVSUtils.h"
#include "..\..\AVSImageStudio3\AVSGraphics\Interfaces\AVSRenderer.h" #include "..\Common\ASCUtils.h"
#include "..\ASCImageStudio3\ASCGraphics\Interfaces\ASCRenderer.h"
#include "..\..\AVSVideoStudio3\Common\MediaFormatDefine.h" #include "..\Common\MediaFormatDefine.h"
#include "..\..\..\..\Common\TemporaryCS.h" #include "..\Common\TemporaryCS.h"
#include "Writer\Writer3.h" #include "Writer\Writer3.h"
...@@ -15,9 +14,9 @@ ...@@ -15,9 +14,9 @@
#error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms." #error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."
#endif #endif
// IAVSHTMLRenderer // IASCHTMLRenderer
[ object, uuid("7E973D3E-34ED-45ea-90A4-775E70AEBE0B"), dual, pointer_default(unique) ] [ object, uuid("7E973D3E-34ED-45ea-90A4-775E70AEBE0B"), dual, pointer_default(unique) ]
__interface IAVSHTMLRenderer2: IAVSRenderer __interface IASCHTMLRenderer2: IASCRenderer
{ {
[id(5003), propget] HRESULT Mode([out, retval] LONG* plMode); [id(5003), propget] HRESULT Mode([out, retval] LONG* plMode);
[id(5003), propput] HRESULT Mode([in] LONG lMode); [id(5003), propput] HRESULT Mode([in] LONG lMode);
...@@ -26,30 +25,30 @@ __interface IAVSHTMLRenderer2: IAVSRenderer ...@@ -26,30 +25,30 @@ __interface IAVSHTMLRenderer2: IAVSRenderer
[id(5001)] HRESULT CloseFile(); [id(5001)] HRESULT CloseFile();
}; };
// _IAVSHTMLRendererEvents // _IASCHTMLRendererEvents
[uuid("9B423367-F5BD-4bfa-8858-EC34049EC248"), dispinterface] [uuid("9B423367-F5BD-4bfa-8858-EC34049EC248"), dispinterface]
__interface _IAVSHTMLRenderer2Events __interface _IASCHTMLRenderer2Events
{ {
}; };
// CAVSHTMLRenderer // CASCHTMLRenderer
[ coclass, default(IAVSHTMLRenderer2), threading(apartment), event_source(com), vi_progid("AVSHTMLRend.Rend2"), progid("AVSHTMLRend.Rend2.1"), version(1.0), uuid("310AD7B8-4A70-47d6-815E-A20A71B2AE59") ] [ coclass, default(IASCHTMLRenderer2), threading(apartment), event_source(com), vi_progid("AVSHTMLRend.Rend2"), progid("AVSHTMLRend.Rend2.1"), version(1.0), uuid("310AD7B8-4A70-47d6-815E-A20A71B2AE59") ]
class ATL_NO_VTABLE CAVSHTMLRenderer2 : class ATL_NO_VTABLE CASCHTMLRenderer2 :
public IAVSHTMLRenderer2, public IASCHTMLRenderer2,
public NSHtmlRenderer::IBaseMatrixUpdater public NSHtmlRenderer::IBaseMatrixUpdater
{ {
private: private:
public: public:
__event __interface _IAVSHTMLRenderer2Events; __event __interface _IASCHTMLRenderer2Events;
public: public:
DECLARE_PROTECT_FINAL_CONSTRUCT() DECLARE_PROTECT_FINAL_CONSTRUCT()
CAVSHTMLRenderer2() CASCHTMLRenderer2()
{ {
} }
~CAVSHTMLRenderer2() ~CASCHTMLRenderer2()
{ {
} }
...@@ -219,8 +218,8 @@ private: ...@@ -219,8 +218,8 @@ private:
CString m_strDstFile; CString m_strDstFile;
LONG m_lLastSavedPage; LONG m_lLastSavedPage;
AVSGraphics::IAVSGraphicSimpleComverter* m_pSimpleGraphicsConverter; // Graphics::IASCGraphicSimpleComverter* m_pSimpleGraphicsConverter; //
AVSGraphics::IAVSFontManager* m_pFontManager; // Graphics::IASCFontManager* m_pFontManager; //
NSHtmlRenderer::CMatrix m_oTransform; // NSHtmlRenderer::CMatrix m_oTransform; //
double m_dTransformAngle; double m_dTransformAngle;
...@@ -245,7 +244,7 @@ private: ...@@ -245,7 +244,7 @@ private:
BOOL m_bPageClosed; BOOL m_bPageClosed;
BOOL m_bPageOpened; BOOL m_bPageOpened;
AVSGraphics::IAVSWinFonts* m_pFonts; Graphics::IASCWinFonts* m_pFonts;
protected: protected:
void CalculateFullTransform() void CalculateFullTransform()
...@@ -314,7 +313,7 @@ protected: ...@@ -314,7 +313,7 @@ protected:
{ {
if (NULL == m_pFontManager) if (NULL == m_pFontManager)
{ {
CoCreateInstance(__uuidof(AVSGraphics::CAVSFontManager), NULL, CLSCTX_ALL, __uuidof(AVSGraphics::IAVSFontManager), (void**)&m_pFontManager); CoCreateInstance(__uuidof(Graphics::CASCFontManager), NULL, CLSCTX_ALL, __uuidof(Graphics::IASCFontManager), (void**)&m_pFontManager);
m_pFontManager->Initialize(L""); m_pFontManager->Initialize(L"");
} }
......
ASCHTMLRenderer/HTMLRenderer3.cpp
View file @ 8c5ad051
This diff is collapsed.
ASCHTMLRenderer/HTMLRenderer3.h
View file @ 8c5ad051
...@@ -10,24 +10,24 @@ ...@@ -10,24 +10,24 @@
#error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms." #error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."
#endif #endif
// CAVSHTMLRenderer // CASCHTMLRenderer
[ coclass, default(IAVSHTMLRenderer2), threading(apartment), event_source(com), vi_progid("AVSHTMLRend.Rend3"), progid("AVSHTMLRend.Rend3.1"), version(1.0), uuid("6B2D3D65-16FE-41c1-AF76-E2D3F6754B90") ] [ coclass, default(IASCHTMLRenderer2), threading(apartment), event_source(com), vi_progid("AVSHTMLRend.Rend3"), progid("AVSHTMLRend.Rend3.1"), version(1.0), uuid("6B2D3D65-16FE-41c1-AF76-E2D3F6754B90") ]
class ATL_NO_VTABLE CAVSHTMLRenderer3 : class ATL_NO_VTABLE CASCHTMLRenderer3 :
public IAVSHTMLRenderer2, public IASCHTMLRenderer2,
public NSHtmlRenderer::IBaseMatrixUpdater public NSHtmlRenderer::IBaseMatrixUpdater
{ {
private: private:
public: public:
__event __interface _IAVSHTMLRenderer2Events; __event __interface _IASCHTMLRenderer2Events;
public: public:
DECLARE_PROTECT_FINAL_CONSTRUCT() DECLARE_PROTECT_FINAL_CONSTRUCT()
CAVSHTMLRenderer3() CASCHTMLRenderer3()
{ {
} }
~CAVSHTMLRenderer3() ~CASCHTMLRenderer3()
{ {
} }
...@@ -197,8 +197,8 @@ private: ...@@ -197,8 +197,8 @@ private:
CString m_strDstFile; CString m_strDstFile;
LONG m_lLastSavedPage; LONG m_lLastSavedPage;
AVSGraphics::IAVSGraphicSimpleComverter* m_pSimpleGraphicsConverter; // Graphics::IASCGraphicSimpleComverter* m_pSimpleGraphicsConverter; //
AVSGraphics::IAVSFontManager* m_pFontManager; // Graphics::IASCFontManager* m_pFontManager; //
NSHtmlRenderer::CMatrix m_oTransform; // NSHtmlRenderer::CMatrix m_oTransform; //
double m_dTransformAngle; double m_dTransformAngle;
...@@ -221,7 +221,7 @@ private: ...@@ -221,7 +221,7 @@ private:
BOOL m_bPageClosed; BOOL m_bPageClosed;
BOOL m_bPageOpened; BOOL m_bPageOpened;
AVSGraphics::IAVSWinFonts* m_pFonts; Graphics::IASCWinFonts* m_pFonts;
bool m_bIsChangedFontParamBetweenDrawText; bool m_bIsChangedFontParamBetweenDrawText;
...@@ -271,7 +271,7 @@ protected: ...@@ -271,7 +271,7 @@ protected:
{ {
if (NULL == m_pFontManager) if (NULL == m_pFontManager)
{ {
CoCreateInstance(__uuidof(AVSGraphics::CAVSFontManager), NULL, CLSCTX_ALL, __uuidof(AVSGraphics::IAVSFontManager), (void**)&m_pFontManager); CoCreateInstance(__uuidof(Graphics::CASCFontManager), NULL, CLSCTX_ALL, __uuidof(Graphics::IASCFontManager), (void**)&m_pFontManager);
m_pFontManager->Initialize(L""); m_pFontManager->Initialize(L"");
} }
......
ASCHTMLRenderer/Resource.h
View file @ 8c5ad051
//{{NO_DEPENDENCIES}} //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by AVSHTMLRenderer.rc // Used by ASCHTMLRenderer.rc
// //
#define IDS_PROJNAME 100 #define IDS_PROJNAME 100
#define IDR_AVSHTMLRENDERER 101 #define IDR_ASCHTMLRENDERER 101
#define IDB_SCRIPT_CM 301 #define IDB_SCRIPT_CM 301
#define IDB_SCRIPT_IM 302 #define IDB_SCRIPT_IM 302
......
ASCHTMLRenderer/Writer/CanvasWriter.h
View file @ 8c5ad051
...@@ -136,7 +136,7 @@ namespace NSHtmlRenderer ...@@ -136,7 +136,7 @@ namespace NSHtmlRenderer
strPath.Format(g_vml_string_CurveTo, round(x1), round(y1), round(x2), round(y2), round(x3), round(y3)); strPath.Format(g_vml_string_CurveTo, round(x1), round(y1), round(x2), round(y2), round(x3), round(y3));
m_oPath.WriteString(strPath); m_oPath.WriteString(strPath);
} }
void WriteDrawPath(LONG lType, CMatrix* pTransform, AVSGraphics::IAVSGraphicSimpleComverter* pConverter, LONG lTxId) void WriteDrawPath(LONG lType, CMatrix* pTransform, Graphics::IASCGraphicSimpleComverter* pConverter, LONG lTxId)
{ {
bool bStroke = false; bool bStroke = false;
......
ASCHTMLRenderer/Writer/Document.h
View file @ 8c5ad051
...@@ -365,7 +365,7 @@ namespace NSHtmlRenderer ...@@ -365,7 +365,7 @@ namespace NSHtmlRenderer
class CThumbnails class CThumbnails
{ {
private: private:
AVSGraphics::IAVSRenderer* m_pRenderer; Graphics::IASCRenderer* m_pRenderer;
MediaCore::IAVSUncompressedVideoFrame* m_pFrame; MediaCore::IAVSUncompressedVideoFrame* m_pFrame;
LONG m_lWidth; LONG m_lWidth;
...@@ -450,9 +450,9 @@ namespace NSHtmlRenderer ...@@ -450,9 +450,9 @@ namespace NSHtmlRenderer
// ( ) - // ( ) -
RELEASEINTERFACE(m_pRenderer); RELEASEINTERFACE(m_pRenderer);
AVSGraphics::IAVSGraphicsRenderer* pGrRenderer; Graphics::IASCGraphicsRenderer* pGrRenderer;
CoCreateInstance(__uuidof( AVSGraphics::CAVSGraphicsRenderer), NULL, CLSCTX_INPROC_SERVER, CoCreateInstance(__uuidof( Graphics::CASCGraphicsRenderer), NULL, CLSCTX_INPROC_SERVER,
__uuidof(AVSGraphics::IAVSGraphicsRenderer), (void**)&pGrRenderer); __uuidof(Graphics::IASCGraphicsRenderer), (void**)&pGrRenderer);
// FontManager // FontManager
VARIANT vtVariant; VARIANT vtVariant;
...@@ -466,7 +466,7 @@ namespace NSHtmlRenderer ...@@ -466,7 +466,7 @@ namespace NSHtmlRenderer
pGrRenderer->CreateFromMediaData(punkFrame, 0, 0, m_lWidth, m_lHeight); pGrRenderer->CreateFromMediaData(punkFrame, 0, 0, m_lWidth, m_lHeight);
RELEASEINTERFACE(punkFrame); RELEASEINTERFACE(punkFrame);
pGrRenderer->QueryInterface(AVSGraphics::IID_IAVSRenderer, (void**)&m_pRenderer); pGrRenderer->QueryInterface(Graphics::IID_IASCRenderer, (void**)&m_pRenderer);
RELEASEINTERFACE(pGrRenderer); RELEASEINTERFACE(pGrRenderer);
} }
......
ASCHTMLRenderer/Writer/File.h
View file @ 8c5ad051
#pragma once #pragma once
#include "..\stdafx.h" #include "..\stdafx.h"
#include "..\..\..\..\..\Common\XmlUtils.h" #include "..\..\Common\XmlUtils.h"
#include "windows.h" #include "windows.h"
class CFile class CFile
......
ASCHTMLRenderer/Writer/FontManagerBase.h
View file @ 8c5ad051
...@@ -156,8 +156,8 @@ namespace NSFontManager ...@@ -156,8 +156,8 @@ namespace NSFontManager
}; };
protected: protected:
AVSGraphics::IAVSWinFonts* m_pWinFonts; Graphics::IASCWinFonts* m_pWinFonts;
AVSGraphics::IAVSFontManager* m_pManager; Graphics::IASCFontManager* m_pManager;
CString m_strDefaultFont; CString m_strDefaultFont;
public: public:
...@@ -183,7 +183,7 @@ namespace NSFontManager ...@@ -183,7 +183,7 @@ namespace NSFontManager
CFontManagerBase() : m_oFont(), m_mapFontPathToProperties() CFontManagerBase() : m_oFont(), m_mapFontPathToProperties()
{ {
m_pManager = NULL; m_pManager = NULL;
CoCreateInstance(AVSGraphics::CLSID_CAVSFontManager, NULL, CLSCTX_ALL, AVSGraphics::IID_IAVSFontManager, (void**)&m_pManager); CoCreateInstance(Graphics::CLSID_CASCFontManager, NULL, CLSCTX_ALL, Graphics::IID_IASCFontManager, (void**)&m_pManager);
m_pManager->Initialize(L""); m_pManager->Initialize(L"");
...@@ -434,8 +434,8 @@ namespace NSFontManager ...@@ -434,8 +434,8 @@ namespace NSFontManager
m_oFont.m_oProperties.m_lStyle = 0x00; m_oFont.m_oProperties.m_lStyle = 0x00;
} }
AVSGraphics::IAVSFontManager2* pManager2 = NULL; Graphics::IASCFontManager2* pManager2 = NULL;
m_pManager->QueryInterface(AVSGraphics::IID_IAVSFontManager2, (void**)&pManager2); m_pManager->QueryInterface(Graphics::IID_IASCFontManager2, (void**)&pManager2);
BSTR bsPanose = NULL; BSTR bsPanose = NULL;
...@@ -1502,8 +1502,8 @@ namespace NSFontManager ...@@ -1502,8 +1502,8 @@ namespace NSFontManager
oPick.m_strPickFont = m_oFont.m_oProperties.m_strFamilyName; oPick.m_strPickFont = m_oFont.m_oProperties.m_strFamilyName;
oPick.m_lPickStyle = m_oFont.m_oProperties.m_lStyle; oPick.m_lPickStyle = m_oFont.m_oProperties.m_lStyle;
AVSGraphics::IAVSFontManager2* pManager2 = NULL; Graphics::IASCFontManager2* pManager2 = NULL;
m_pManager->QueryInterface(AVSGraphics::IID_IAVSFontManager2, (void**)&pManager2); m_pManager->QueryInterface(Graphics::IID_IASCFontManager2, (void**)&pManager2);
BSTR bsFontName = m_oFont.m_oProperties.m_strFamilyName.AllocSysString(); BSTR bsFontName = m_oFont.m_oProperties.m_strFamilyName.AllocSysString();
BSTR bsNewFontName = NULL; BSTR bsNewFontName = NULL;
......
ASCHTMLRenderer/Writer/SVGWriter.h
View file @ 8c5ad051
...@@ -466,7 +466,7 @@ namespace NSHtmlRenderer ...@@ -466,7 +466,7 @@ namespace NSHtmlRenderer
m_oPath.AddIntNoCheck(round(y3)); m_oPath.AddIntNoCheck(round(y3));
m_oPath.AddSpaceNoCheck(); m_oPath.AddSpaceNoCheck();
} }
void WriteDrawPath(LONG nType, CMatrix* pTransform, AVSGraphics::IAVSGraphicSimpleComverter* pConverter, CImageInfo& oInfo, const double& dAngle) void WriteDrawPath(LONG nType, CMatrix* pTransform, Graphics::IASCGraphicSimpleComverter* pConverter, CImageInfo& oInfo, const double& dAngle)
{ {
if (m_oPath.GetCurSize() < 3) if (m_oPath.GetCurSize() < 3)
return; return;
......
ASCHTMLRenderer/Writer/SVGWriter2.h
View file @ 8c5ad051
...@@ -15,10 +15,10 @@ namespace NSHtmlRenderer ...@@ -15,10 +15,10 @@ namespace NSHtmlRenderer
class CRendererGr class CRendererGr
{ {
public: public:
AVSGraphics::IAVSGraphicsRenderer* m_pRenderer; Graphics::IASCGraphicsRenderer* m_pRenderer;
MediaCore::IAVSUncompressedVideoFrame* m_pFrame; MediaCore::IAVSUncompressedVideoFrame* m_pFrame;
AVSGraphics::IAVSMetafile* m_pMetafile; Graphics::IASCMetafile* m_pMetafile;
double m_dWidth; double m_dWidth;
double m_dHeight; double m_dHeight;
...@@ -35,7 +35,7 @@ namespace NSHtmlRenderer ...@@ -35,7 +35,7 @@ namespace NSHtmlRenderer
m_pFrame = NULL; m_pFrame = NULL;
m_pMetafile = NULL; m_pMetafile = NULL;
CoCreateInstance(AVSGraphics::CLSID_CAVSMetafile, NULL, CLSCTX_ALL, AVSGraphics::IID_IAVSMetafile, (void**)&m_pMetafile); CoCreateInstance(Graphics::CLSID_CASCMetafile, NULL, CLSCTX_ALL, Graphics::IID_IASCMetafile, (void**)&m_pMetafile);
m_dWidth = -1; m_dWidth = -1;
m_dHeight = -1; m_dHeight = -1;
...@@ -97,7 +97,7 @@ namespace NSHtmlRenderer ...@@ -97,7 +97,7 @@ namespace NSHtmlRenderer
memset(pBuffer, 0xFF, 4 * m_lWidthPix * m_lHeightPix); memset(pBuffer, 0xFF, 4 * m_lWidthPix * m_lHeightPix);
CoCreateInstance(AVSGraphics::CLSID_CAVSGraphicsRenderer, NULL, CLSCTX_ALL, AVSGraphics::IID_IAVSGraphicsRenderer, (void**)&m_pRenderer); CoCreateInstance(Graphics::CLSID_CASCGraphicsRenderer, NULL, CLSCTX_ALL, Graphics::IID_IASCGraphicsRenderer, (void**)&m_pRenderer);
m_pRenderer->put_Width(m_dWidth); m_pRenderer->put_Width(m_dWidth);
m_pRenderer->put_Height(m_dHeight); m_pRenderer->put_Height(m_dHeight);
...@@ -300,7 +300,7 @@ namespace NSHtmlRenderer ...@@ -300,7 +300,7 @@ namespace NSHtmlRenderer
// . ( , ) // . ( , )
//CRendererGr m_oGrRenderer; //CRendererGr m_oGrRenderer;
//AVSGraphics::IAVSMetafile* m_pGrRenderer; //Graphics::IASCMetafile* m_pGrRenderer;
// . // .
CMetafile m_oClipMetafile; CMetafile m_oClipMetafile;
...@@ -659,7 +659,7 @@ namespace NSHtmlRenderer ...@@ -659,7 +659,7 @@ namespace NSHtmlRenderer
m_oPath.AddSpaceNoCheck(); m_oPath.AddSpaceNoCheck();
*/ */
} }
void WriteDrawPath(LONG nType, AVSGraphics::IAVSGraphicSimpleComverter* pConverter, CImageInfo& oInfo) void WriteDrawPath(LONG nType, Graphics::IASCGraphicSimpleComverter* pConverter, CImageInfo& oInfo)
{ {
if (m_lPathTypesSizeCur == 0) if (m_lPathTypesSizeCur == 0)
return; return;
......
ASCHTMLRenderer/Writer/VMLWriter.h
View file @ 8c5ad051
...@@ -164,7 +164,7 @@ namespace NSHtmlRenderer ...@@ -164,7 +164,7 @@ namespace NSHtmlRenderer
strPath.Format(g_vml_string_CurveTo, round(x1), round(y1), round(x2), round(y2), round(x3), round(y3)); strPath.Format(g_vml_string_CurveTo, round(x1), round(y1), round(x2), round(y2), round(x3), round(y3));
m_oPath.WriteString(strPath); m_oPath.WriteString(strPath);
} }
void WriteDrawPath(LONG lType, CMatrix* pTransform, AVSGraphics::IAVSGraphicSimpleComverter* pConverter, CImageInfo& oInfo, const double& dAngle) void WriteDrawPath(LONG lType, CMatrix* pTransform, Graphics::IASCGraphicSimpleComverter* pConverter, CImageInfo& oInfo, const double& dAngle)
{ {
if (m_oPath.GetCurSize() < 3) if (m_oPath.GetCurSize() < 3)
return; return;
......
ASCHTMLRenderer/Writer/VectorGraphicsWriter.h
View file @ 8c5ad051
...@@ -35,7 +35,7 @@ namespace NSHtmlRenderer ...@@ -35,7 +35,7 @@ namespace NSHtmlRenderer
CStringWriter m_oWriterCanvas; CStringWriter m_oWriterCanvas;
CStringWriter m_oWriterVML; CStringWriter m_oWriterVML;
AVSGraphics::IAVSGraphicSimpleComverter* m_pSimpleConverter; Graphics::IASCGraphicSimpleComverter* m_pSimpleConverter;
NSStructures::CPen* m_pPen; NSStructures::CPen* m_pPen;
NSStructures::CBrush* m_pBrush; NSStructures::CBrush* m_pBrush;
......
ASCHTMLRenderer/Writer/VectorGraphicsWriter2.h
View file @ 8c5ad051
...@@ -14,7 +14,7 @@ namespace NSHtmlRenderer ...@@ -14,7 +14,7 @@ namespace NSHtmlRenderer
CVMLWriter m_oVML; CVMLWriter m_oVML;
CCanvasWriter m_oCanvas; CCanvasWriter m_oCanvas;
AVSGraphics::IAVSGraphicSimpleComverter* m_pSimpleConverter; Graphics::IASCGraphicSimpleComverter* m_pSimpleConverter;
NSStructures::CPen* m_pPen; NSStructures::CPen* m_pPen;
NSStructures::CBrush* m_pBrush; NSStructures::CBrush* m_pBrush;
...@@ -37,7 +37,7 @@ namespace NSHtmlRenderer ...@@ -37,7 +37,7 @@ namespace NSHtmlRenderer
{ {
} }
void SetSettings(NSStructures::CPen* pPen, NSStructures::CBrush* pBrush, AVSGraphics::IAVSGraphicSimpleComverter* pSimpleConverter) void SetSettings(NSStructures::CPen* pPen, NSStructures::CBrush* pBrush, Graphics::IASCGraphicSimpleComverter* pSimpleConverter)
{ {
m_pPen = pPen; m_pPen = pPen;
m_pBrush = pBrush; m_pBrush = pBrush;
...@@ -211,7 +211,7 @@ namespace NSHtmlRenderer ...@@ -211,7 +211,7 @@ namespace NSHtmlRenderer
{ {
public: public:
CSVGWriter m_oSVG; CSVGWriter m_oSVG;
AVSGraphics::IAVSGraphicSimpleComverter* m_pSimpleConverter; Graphics::IASCGraphicSimpleComverter* m_pSimpleConverter;
NSStructures::CPen* m_pPen; NSStructures::CPen* m_pPen;
NSStructures::CBrush* m_pBrush; NSStructures::CBrush* m_pBrush;
...@@ -230,7 +230,7 @@ namespace NSHtmlRenderer ...@@ -230,7 +230,7 @@ namespace NSHtmlRenderer
{ {
} }
void SetSettings(NSStructures::CPen* pPen, NSStructures::CBrush* pBrush, AVSGraphics::IAVSGraphicSimpleComverter* pSimpleConverter) void SetSettings(NSStructures::CPen* pPen, NSStructures::CBrush* pBrush, Graphics::IASCGraphicSimpleComverter* pSimpleConverter)
{ {
m_pPen = pPen; m_pPen = pPen;
m_pBrush = pBrush; m_pBrush = pBrush;
......
ASCHTMLRenderer/Writer/Writer.h
View file @ 8c5ad051
...@@ -27,7 +27,7 @@ namespace NSHtmlRenderer ...@@ -27,7 +27,7 @@ namespace NSHtmlRenderer
BOOL m_bIsClip; BOOL m_bIsClip;
BOOL m_bIsClipping; BOOL m_bIsClipping;
AVSGraphics::IAVSGraphicSimpleComverter* m_pSimpleConverter; Graphics::IASCGraphicSimpleComverter* m_pSimpleConverter;
CMatrix* m_pFullTransform; CMatrix* m_pFullTransform;
LONG m_lCurTxBrush; LONG m_lCurTxBrush;
...@@ -235,7 +235,7 @@ namespace NSHtmlRenderer ...@@ -235,7 +235,7 @@ namespace NSHtmlRenderer
CDstInfo m_oDstInfo; CDstInfo m_oDstInfo;
AVSGraphics::IAVSGraphicSimpleComverter* m_pSimpleConverter; Graphics::IASCGraphicSimpleComverter* m_pSimpleConverter;
public: public:
...@@ -348,7 +348,7 @@ namespace NSHtmlRenderer ...@@ -348,7 +348,7 @@ namespace NSHtmlRenderer
m_oWriterTextMeasurer.Clear(); m_oWriterTextMeasurer.Clear();
} }
void SetSimpleConverter(AVSGraphics::IAVSGraphicSimpleComverter* pSimpleConverter, CMatrix* pMatrix) void SetSimpleConverter(Graphics::IASCGraphicSimpleComverter* pSimpleConverter, CMatrix* pMatrix)
{ {
m_pSimpleConverter = pSimpleConverter; m_pSimpleConverter = pSimpleConverter;
m_oPage.m_pSimpleConverter = m_pSimpleConverter; m_oPage.m_pSimpleConverter = m_pSimpleConverter;
......
ASCHTMLRenderer/Writer/Writer2.h
View file @ 8c5ad051
...@@ -58,7 +58,7 @@ namespace NSHtmlRenderer ...@@ -58,7 +58,7 @@ namespace NSHtmlRenderer
LONG m_lHeightDocPix; LONG m_lHeightDocPix;
LONG m_lHeightPagePix; LONG m_lHeightPagePix;
AVSGraphics::IAVSGraphicSimpleComverter* m_pSimpleConverter; Graphics::IASCGraphicSimpleComverter* m_pSimpleConverter;
CFile m_oFileWriter; CFile m_oFileWriter;
public: public:
...@@ -144,7 +144,7 @@ namespace NSHtmlRenderer ...@@ -144,7 +144,7 @@ namespace NSHtmlRenderer
m_oWriterPage.Clear(); m_oWriterPage.Clear();
} }
void SetSimpleConverter(AVSGraphics::IAVSGraphicSimpleComverter* pSimpleConverter, CMatrix* pMatrix) void SetSimpleConverter(Graphics::IASCGraphicSimpleComverter* pSimpleConverter, CMatrix* pMatrix)
{ {
m_pSimpleConverter = pSimpleConverter; m_pSimpleConverter = pSimpleConverter;
} }
......
ASCHTMLRenderer/Writer/Writer3.h
View file @ 8c5ad051
...@@ -5,16 +5,14 @@ ...@@ -5,16 +5,14 @@
#include "..\Graphics\Matrix.h" #include "..\Graphics\Matrix.h"
#include "../../Common/OfficeFileFormats.h" #include "../../Common/OfficeFileFormats.h"
#import "..\..\..\Redist\AVSOfficeStudio\AVSFontConverter.dll" named_guids raw_interfaces_only rename_namespace("Fonts")
namespace NSHtmlRenderer namespace NSHtmlRenderer
{ {
class CRenderers class CRenderers
{ {
public: public:
AVSGraphics::IAVSGraphicsRenderer* m_pRendererSimple; Graphics::IASCGraphicsRenderer* m_pRendererSimple;
AVSGraphics::IAVSGraphicsRenderer* m_pRenderer; Graphics::IASCGraphicsRenderer* m_pRenderer;
AVSGraphics::IAVSGraphicsRenderer* m_pRendererDst; Graphics::IASCGraphicsRenderer* m_pRendererDst;
MediaCore::IAVSUncompressedVideoFrame* m_pFrameSimple; MediaCore::IAVSUncompressedVideoFrame* m_pFrameSimple;
MediaCore::IAVSUncompressedVideoFrame* m_pFrame; MediaCore::IAVSUncompressedVideoFrame* m_pFrame;
...@@ -149,9 +147,9 @@ namespace NSHtmlRenderer ...@@ -149,9 +147,9 @@ namespace NSHtmlRenderer
if (NULL == m_pGraphicsCache) if (NULL == m_pGraphicsCache)
m_pGraphicsCache = new BYTE[4 * m_lWidthPix * m_lHeightPix]; m_pGraphicsCache = new BYTE[4 * m_lWidthPix * m_lHeightPix];
CoCreateInstance(AVSGraphics::CLSID_CAVSGraphicsRenderer, NULL, CLSCTX_ALL, AVSGraphics::IID_IAVSGraphicsRenderer, (void**)&m_pRendererSimple); CoCreateInstance(Graphics::CLSID_CASCGraphicsRenderer, NULL, CLSCTX_ALL, Graphics::IID_IASCGraphicsRenderer, (void**)&m_pRendererSimple);
CoCreateInstance(AVSGraphics::CLSID_CAVSGraphicsRenderer, NULL, CLSCTX_ALL, AVSGraphics::IID_IAVSGraphicsRenderer, (void**)&m_pRenderer); CoCreateInstance(Graphics::CLSID_CASCGraphicsRenderer, NULL, CLSCTX_ALL, Graphics::IID_IASCGraphicsRenderer, (void**)&m_pRenderer);
CoCreateInstance(AVSGraphics::CLSID_CAVSGraphicsRenderer, NULL, CLSCTX_ALL, AVSGraphics::IID_IAVSGraphicsRenderer, (void**)&m_pRendererDst); CoCreateInstance(Graphics::CLSID_CASCGraphicsRenderer, NULL, CLSCTX_ALL, Graphics::IID_IASCGraphicsRenderer, (void**)&m_pRendererDst);
// FontManager // FontManager
VARIANT vtVariant; VARIANT vtVariant;
vtVariant.vt = VT_UNKNOWN; vtVariant.vt = VT_UNKNOWN;
...@@ -1765,8 +1763,8 @@ namespace NSHtmlRenderer ...@@ -1765,8 +1763,8 @@ namespace NSHtmlRenderer
if (bIsGid) if (bIsGid)
lFontConverterFlag |= 0x0080; lFontConverterFlag |= 0x0080;
AVSGraphics::IAVSFontManagerPtr pMan; Graphics::IASCFontManagerPtr pMan;
pMan.CreateInstance(AVSGraphics::CLSID_CAVSFontManager); pMan.CreateInstance(Graphics::CLSID_CASCFontManager);
pMan->Initialize(L""); pMan->Initialize(L"");
for (LONG lIndex = 0; lIndex < m_lCountFonts; ++lIndex) for (LONG lIndex = 0; lIndex < m_lCountFonts; ++lIndex)
{ {
...@@ -2461,7 +2459,7 @@ window.g_font_loader.SetStreamIndexEmb(%d, __font_data%d_idx);"), lFontIndex, lF ...@@ -2461,7 +2459,7 @@ window.g_font_loader.SetStreamIndexEmb(%d, __font_data%d_idx);"), lFontIndex, lF
class CFontManagerWrapper class CFontManagerWrapper
{ {
private: private:
AVSGraphics::IAVSFontManager* m_pManager; Graphics::IASCFontManager* m_pManager;
public: public:
CHFontInfo m_oCurrentInfo; CHFontInfo m_oCurrentInfo;
NSStructures::CFont* m_pFont; NSStructures::CFont* m_pFont;
...@@ -2473,7 +2471,7 @@ window.g_font_loader.SetStreamIndexEmb(%d, __font_data%d_idx);"), lFontIndex, lF ...@@ -2473,7 +2471,7 @@ window.g_font_loader.SetStreamIndexEmb(%d, __font_data%d_idx);"), lFontIndex, lF
CFontManagerWrapper() : m_mapInfos() CFontManagerWrapper() : m_mapInfos()
{ {
m_pManager = NULL; m_pManager = NULL;
CoCreateInstance(AVSGraphics::CLSID_CAVSFontManager, NULL, CLSCTX_ALL, AVSGraphics::IID_IAVSFontManager, (void**)&m_pManager); CoCreateInstance(Graphics::CLSID_CASCFontManager, NULL, CLSCTX_ALL, Graphics::IID_IASCFontManager, (void**)&m_pManager);
} }
virtual ~CFontManagerWrapper() virtual ~CFontManagerWrapper()
{ {
...@@ -3411,7 +3409,7 @@ window.g_font_loader.SetStreamIndexEmb(%d, __font_data%d_idx);"), lFontIndex, lF ...@@ -3411,7 +3409,7 @@ window.g_font_loader.SetStreamIndexEmb(%d, __font_data%d_idx);"), lFontIndex, lF
double m_dHeightDocMM; double m_dHeightDocMM;
double m_dHeightPageMM; double m_dHeightPageMM;
AVSGraphics::IAVSGraphicSimpleComverter* m_pSimpleConverter; Graphics::IASCGraphicSimpleComverter* m_pSimpleConverter;
CFile m_oFileWriter; CFile m_oFileWriter;
bool m_bIsGids; bool m_bIsGids;
...@@ -3511,7 +3509,7 @@ window.g_font_loader.SetStreamIndexEmb(%d, __font_data%d_idx);"), lFontIndex, lF ...@@ -3511,7 +3509,7 @@ window.g_font_loader.SetStreamIndexEmb(%d, __font_data%d_idx);"), lFontIndex, lF
m_oSmartText.m_lCountSpaces = 0; m_oSmartText.m_lCountSpaces = 0;
} }
void SetSimpleConverter(AVSGraphics::IAVSGraphicSimpleComverter* pSimpleConverter, CMatrix* pMatrix) void SetSimpleConverter(Graphics::IASCGraphicSimpleComverter* pSimpleConverter, CMatrix* pMatrix)
{ {
m_pSimpleConverter = pSimpleConverter; m_pSimpleConverter = pSimpleConverter;
} }
......
ASCHTMLRenderer/Writer/Writer4.h
View file @ 8c5ad051
...@@ -101,7 +101,7 @@ namespace NSHtmlRenderer ...@@ -101,7 +101,7 @@ namespace NSHtmlRenderer
class CGraphicsDumper class CGraphicsDumper
{ {
public: public:
AVSGraphics::IAVSGraphicsRenderer* m_pRenderer; Graphics::IASCGraphicsRenderer* m_pRenderer;
MediaCore::IAVSUncompressedVideoFrame* m_pFrame; MediaCore::IAVSUncompressedVideoFrame* m_pFrame;
double m_dWidth; double m_dWidth;
...@@ -171,7 +171,7 @@ namespace NSHtmlRenderer ...@@ -171,7 +171,7 @@ namespace NSHtmlRenderer
memset(pBuffer, 0xFF, 4 * m_lWidthPix * m_lHeightPix); memset(pBuffer, 0xFF, 4 * m_lWidthPix * m_lHeightPix);
CoCreateInstance(AVSGraphics::CLSID_CAVSGraphicsRenderer, NULL, CLSCTX_ALL, AVSGraphics::IID_IAVSGraphicsRenderer, (void**)&m_pRenderer); CoCreateInstance(Graphics::CLSID_CASCGraphicsRenderer, NULL, CLSCTX_ALL, Graphics::IID_IASCGraphicsRenderer, (void**)&m_pRenderer);
// FontManager // FontManager
VARIANT vtVariant; VARIANT vtVariant;
vtVariant.vt = VT_UNKNOWN; vtVariant.vt = VT_UNKNOWN;
...@@ -800,7 +800,7 @@ namespace NSHtmlRenderer ...@@ -800,7 +800,7 @@ namespace NSHtmlRenderer
double m_dHeightDocMM; double m_dHeightDocMM;
double m_dHeightPageMM; double m_dHeightPageMM;
AVSGraphics::IAVSGraphicSimpleComverter* m_pSimpleConverter; Graphics::IASCGraphicSimpleComverter* m_pSimpleConverter;
CFile m_oFileWriter; CFile m_oFileWriter;
bool m_bIsGids; bool m_bIsGids;
...@@ -906,7 +906,7 @@ namespace NSHtmlRenderer ...@@ -906,7 +906,7 @@ namespace NSHtmlRenderer
m_oSmartText.m_lCountSpaces = 0; m_oSmartText.m_lCountSpaces = 0;
} }
void SetSimpleConverter(AVSGraphics::IAVSGraphicSimpleComverter* pSimpleConverter, CMatrix* pMatrix) void SetSimpleConverter(Graphics::IASCGraphicSimpleComverter* pSimpleConverter, CMatrix* pMatrix)
{ {
m_pSimpleConverter = pSimpleConverter; m_pSimpleConverter = pSimpleConverter;
m_pTransform = pMatrix; m_pTransform = pMatrix;
...@@ -2023,8 +2023,8 @@ protected: ...@@ -2023,8 +2023,8 @@ protected:
pFrame->put_AspectRatioX( nWidth ); pFrame->put_AspectRatioX( nWidth );
pFrame->put_AspectRatioY( nHeight ); pFrame->put_AspectRatioY( nHeight );
AVSGraphics::IAVSGraphicsRenderer* pGrRenderer; Graphics::IASCGraphicsRenderer* pGrRenderer;
CoCreateInstance( AVSGraphics::CLSID_CAVSGraphicsRenderer, NULL, CLSCTX_ALL, AVSGraphics::IID_IAVSGraphicsRenderer, (void**)(&pGrRenderer) ); CoCreateInstance( Graphics::CLSID_CASCGraphicsRenderer, NULL, CLSCTX_ALL, Graphics::IID_IASCGraphicsRenderer, (void**)(&pGrRenderer) );
if( !pGrRenderer ) if( !pGrRenderer )
{ {
pFrame->Release(); pFrame->Release();
...@@ -2044,8 +2044,8 @@ protected: ...@@ -2044,8 +2044,8 @@ protected:
return false; return false;
} }
AVSGraphics::ISVGTransformer* pTransformer; Graphics::ISVGTransformer* pTransformer;
CoCreateInstance( AVSGraphics::CLSID_SVGTransformer, NULL, CLSCTX_ALL, AVSGraphics::IID_ISVGTransformer, (void**)(&pTransformer) ); CoCreateInstance( Graphics::CLSID_SVGTransformer, NULL, CLSCTX_ALL, Graphics::IID_ISVGTransformer, (void**)(&pTransformer) );
if( !pTransformer ) if( !pTransformer )
{ {
pFrame->Release(); pFrame->Release();
......
ASCHTMLRenderer/stdafx.cpp
View file @ 8c5ad051
// stdafx.cpp : source file that includes just the standard includes // stdafx.cpp : source file that includes just the standard includes
// AVSHTMLRenderer.pch will be the pre-compiled header // ASCHTMLRenderer.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information // stdafx.obj will contain the pre-compiled type information
#include "stdafx.h" #include "stdafx.h"
ASCHTMLRenderer/stdafx.h
View file @ 8c5ad051
...@@ -43,13 +43,19 @@ ...@@ -43,13 +43,19 @@
#include <atlctl.h> #include <atlctl.h>
#include <atlhost.h> #include <atlhost.h>
#import "..\..\..\Redist\AVSMediaCore3.dll" named_guids raw_interfaces_only rename_namespace("MediaCore"), exclude("tagRECT") #include "../Common/Config.h"
#import "..\..\..\Redist\AVSMediaFormatSettings3.dll" named_guids raw_interfaces_only rename_namespace("MediaFormat"), exclude("tagRECT")
#import "..\..\..\Redist\AVSImageStudio3.dll" named_guids raw_interfaces_only rename_namespace("ImageStudio")
#import "..\..\..\Redist\AVSGraphics.dll" named_guids raw_interfaces_only rename_namespace("AVSGraphics") //#define BUILD_SUPPORT_UNREGISTERED_WATERMARK
#import "..\..\..\Redist\AVSOfficeStudio\AVSOfficeUtils.dll" named_guids raw_interfaces_only rename_namespace("OfficeUtils")
#import "..\..\..\Redist\AVSOfficeStudio\AVSFontConverter.dll" named_guids raw_interfaces_only rename_namespace("FontConverter") #ifdef BUILD_CONFIG_OPENSOURCE_VERSION
#import "../Redist/OfficeCore.dll" named_guids raw_interfaces_only rename_namespace("OfficeCore")
#else
#import "../Redist/ASCMediaCore3.dll" named_guids raw_interfaces_only rename_namespace("MediaCore")
#import "../Redist/ASCFontConverter.dll" named_guids raw_interfaces_only rename_namespace("FontConverter")
#import "../Redist/ASCImageStudio3.dll" named_guids raw_interfaces_only rename_namespace("ImageStudio")
#endif // BUILD_CONFIG_OPENSOURCE_VERSION
#import "../Redist/ASCGraphics.dll" named_guids raw_interfaces_only rename_namespace("Graphics")
#import "../Redist/ASCOfficeUtils.dll" named_guids raw_interfaces_only rename_namespace("OfficeUtils")
using namespace ATL; using namespace ATL;
\ No newline at end of file
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