git-svn-id:...

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52438 954022d7-b5bf-4e40-9824-e11837661b57

ASCImageStudio3/ASCGraphics/ASCGraphics.cpp

@@ -3,36 +3,15 @@
 #include "stdafx.h"
 #include "resource.h"
 
-//#include "Objects\ASCGraphics.h"
-//#include "Objects\ASCEdgeText.h"
-//#include "Objects\ASCShadow.h"
-//#include "Objects\ASCStringFormat.h"
 #include "Objects\ASCFontManager.h"
 #include "Objects\ASCWinFonts.h"
-//#include "Objects\ASCImage.h"
 
-#include "Objects\VMLPainter.h"
-#include "Objects\TextPainter.h"
-#include "Objects\EffectTransform.h"
-
-#include "Interfaces\ASCMetafile.h"
-#include "Interfaces\ASCDocumentRenderer.h"
 #include "Interfaces\ASCGdiplusRenderer.h"
 #include "Interfaces\ASCGraphicsRenderer.h"
 #include "Interfaces\ASCRenderer.h"
-#include "Interfaces\ASCDocumentPainter.h"
-#include "Interfaces\ASCEffectPainter.h"
 #include "Interfaces\ASCGraphicsSimpleConverter.h"
 #include "Interfaces\SVGRenderer.h"
-
-// for animation
-
-#include "Objects\AnimationLayer.h"
-#include "Objects\AnimationTransformer.h"
-
-// viewer
-#include "DocumentViewer\DocumentViewer.h"
-#include "DocumentViewer\ViewerThumbnails.h"
+#include "Interfaces\ASCMetafile.h"
 
 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [ module(dll, uuid = "{AB5F2678-2773-44c4-A637-33DFBC51233B}", 

ASCImageStudio3/ASCGraphics/ASCGraphics.rc

@@ -2,7 +2,7 @@
 //
 #include "resource.h"
 #define COMPONENT_NAME "Graphics"
-#include "FileInfo.h"
+#include "../../Common/FileInfo.h"
 #include "version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -43,10 +43,6 @@ END
 //
 // Cursor
 //
-
-IDC_CURSOR_HAND_CLOSE       CURSOR                  "Images\\Cursors\\closehand.cur"
-IDC_CURSOR_HAND             CURSOR                  "Images\\Cursors\\hand.cur"
-IDC_CURSOR_LINK             CURSOR                  "Images\\Cursors\\harrow.cur"
 #endif    // Russian resources
 /////////////////////////////////////////////////////////////////////////////
 

ASCImageStudio3/ASCGraphics/ASCGraphics.vcproj

@@ -401,14 +401,6 @@
 		<Filter
 			Name="Interfaces"
 			>
-			<File
-				RelativePath=".\Interfaces\IASCBrush.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Interfaces\IASCEdgeText.h"
-				>
-			</File>
 			<File
 				RelativePath=".\Interfaces\IASCFontManager.h"
 				>
@@ -417,46 +409,14 @@
 				RelativePath=".\Interfaces\IASCGlyphImage.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Interfaces\IASCGraphics.h"
-				>
-			</File>
 			<File
 				RelativePath=".\Interfaces\IASCGraphicsBase.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Interfaces\IASCGraphicsPath.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Interfaces\IASCGraphicsState.h"
-				>
-			</File>
 			<File
 				RelativePath=".\Interfaces\IASCImage.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Interfaces\IASCMatrix.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Interfaces\IASCPattern.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Interfaces\IASCPen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Interfaces\IASCShadow.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Interfaces\IASCStringFormat.h"
-				>
-			</File>
 			<File
 				RelativePath=".\Interfaces\IASCWinFonts.h"
 				>
@@ -464,22 +424,6 @@
 			<Filter
 				Name="Renderers"
 				>
-				<File
-					RelativePath=".\Interfaces\ASCDocumentPainter.h"
-					>
-				</File>
-				<File
-					RelativePath=".\Interfaces\ASCDocumentRenderer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\Interfaces\ASCDocumentRenderer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\Interfaces\ASCEffectPainter.h"
-					>
-				</File>
 				<File
 					RelativePath=".\Interfaces\ASCGdiplusRenderer.h"
 					>
@@ -524,10 +468,6 @@
 					RelativePath=".\Interfaces\ImageFilesCache.h"
 					>
 				</File>
-				<File
-					RelativePath=".\Interfaces\ImageSerializeObjects2.h"
-					>
-				</File>
 				<File
 					RelativePath=".\Interfaces\StructuresASC.h"
 					>
@@ -549,38 +489,6 @@
 					>
 				</File>
 			</Filter>
-			<Filter
-				Name="TextMeasurer"
-				>
-				<File
-					RelativePath=".\Interfaces\TextMeasurer\Numeration.h"
-					>
-				</File>
-				<File
-					RelativePath=".\Interfaces\TextMeasurer\RendererCommands.h"
-					>
-				</File>
-				<File
-					RelativePath=".\Interfaces\TextMeasurer\SharedPtr.h"
-					>
-				</File>
-				<File
-					RelativePath=".\Interfaces\TextMeasurer\Structures.h"
-					>
-				</File>
-				<File
-					RelativePath=".\Interfaces\TextMeasurer\TextMeasurer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\Interfaces\TextMeasurer\Wrap.h"
-					>
-				</File>
-				<File
-					RelativePath=".\Interfaces\TextMeasurer\Xml.h"
-					>
-				</File>
-			</Filter>
 			<Filter
 				Name="Animation"
 				>
@@ -594,133 +502,9 @@
 				</File>
 			</Filter>
 		</Filter>
-		<Filter
-			Name="VectorGraphics"
-			>
-			<File
-				RelativePath=".\Common\Clip.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Common\Clip.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Common\GraphicsPath.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Common\GraphicsPath.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\MemoryUtils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Common\Pixels.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SBitmap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SBitmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SClip.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SClip.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SErrorCodes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SImage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SImage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SMathExt.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SPath.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SPath.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SPattern.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SPattern.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SScreen.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SScreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SState.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SState.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\STypes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SXPath.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SXPath.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SXPathScanner.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\VectorGraphics\SXPathScanner.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Common\Test.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Objects"
 			>
-			<File
-				RelativePath=".\Objects\ASCBrush.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Objects\ASCEdgeText.h"
-				>
-			</File>
 			<File
 				RelativePath=".\Objects\ASCFontManager.cpp"
 				>
@@ -745,50 +529,14 @@
 				RelativePath=".\Objects\ASCImage.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Objects\ASCMatrix.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Objects\ASCPen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Objects\ASCShadow.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Objects\ASCSolidPattern.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Objects\ASCStringFormat.h"
-				>
-			</File>
 			<File
 				RelativePath=".\Objects\ASCWinFonts.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Objects\EffectTransform.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Objects\ImagePainter.h"
-				>
-			</File>
 			<File
 				RelativePath=".\Objects\Structures.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Objects\TextPainter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Objects\VMLPainter.h"
-				>
-			</File>
 			<Filter
 				Name="FontManager"
 				>
@@ -892,14 +640,6 @@
 			<Filter
 				Name="Image"
 				>
-				<File
-					RelativePath=".\Objects\Image\EmfFile.h"
-					>
-				</File>
-				<File
-					RelativePath=".\Objects\Image\EMFInterpreter.h"
-					>
-				</File>
 				<Filter
 					Name="Wmf"
 					>
@@ -981,82 +721,6 @@
 					</File>
 				</Filter>
 			</Filter>
-			<Filter
-				Name="DocumentViewer"
-				>
-				<File
-					RelativePath=".\DocumentViewer\DIB.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\DocumentViewer\DIB.h"
-					>
-				</File>
-				<File
-					RelativePath=".\DocumentViewer\DocumentViewer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\DocumentViewer\DocumentViewer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\DocumentViewer\Interfaces.h"
-					>
-				</File>
-				<File
-					RelativePath=".\DocumentViewer\Metafile.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\DocumentViewer\Metafile.h"
-					>
-				</File>
-				<File
-					RelativePath=".\DocumentViewer\OfficeSource.h"
-					>
-				</File>
-				<File
-					RelativePath=".\DocumentViewer\PropertyManager.h"
-					>
-				</File>
-				<File
-					RelativePath=".\DocumentViewer\ThreadSafeList.h"
-					>
-				</File>
-				<File
-					RelativePath=".\DocumentViewer\Viewer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\DocumentViewer\ViewerCommon.h"
-					>
-				</File>
-				<File
-					RelativePath=".\DocumentViewer\ViewerThumbnails.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\DocumentViewer\ViewerThumbnails.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Animation"
-				>
-				<File
-					RelativePath=".\Objects\AnimationFramework.h"
-					>
-				</File>
-				<File
-					RelativePath=".\Objects\AnimationLayer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\Objects\AnimationTransformer.h"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="ASCWrapper"
@@ -1090,11 +754,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Common\OfficeDrawing\Elements.cpp"
+				RelativePath=".\agg\ASCWrapper\DIB.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Common\OfficeDrawing\Shapes\BaseShape\PPTXShape\Formula.cpp"
+				RelativePath=".\agg\ASCWrapper\DIB.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Common\OfficeDrawing\Elements.cpp"
 				>
 			</File>
 			<File
@@ -1128,6 +796,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\Common\OfficeDrawing\Shapes\BaseShape\PPTXShape\Formula.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\agg\ASCWrapper\Graphics.h"
 				>

ASCImageStudio3/ASCGraphics/ASCGraphics_VS2008.sln

-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCGraphics", "ASCGraphics_VS2008.vcproj", "{70078FE7-BE4F-493C-84F3-F98F151587F5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agg2d", "agg\agg2d_VS2008.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Tests\TestSvg\Test.csproj", "{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
-		{70078FE7-BE4F-493C-84F3-F98F151587F5} = {70078FE7-BE4F-493C-84F3-F98F151587F5}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|Win32 = Debug|Win32
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|Win32 = Release|Win32
-		ReleaseASC|Any CPU = ReleaseASC|Any CPU
-		ReleaseASC|Mixed Platforms = ReleaseASC|Mixed Platforms
-		ReleaseASC|Win32 = ReleaseASC|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.Debug|Win32.Build.0 = Debug|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.Release|Any CPU.ActiveCfg = Release|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.Release|Win32.ActiveCfg = Release|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.Release|Win32.Build.0 = Release|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.ReleaseASC|Any CPU.ActiveCfg = ReleaseASC|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.ReleaseASC|Mixed Platforms.ActiveCfg = ReleaseASC|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.ReleaseASC|Mixed Platforms.Build.0 = ReleaseASC|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.ReleaseASC|Win32.ActiveCfg = ReleaseASC|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.ReleaseASC|Win32.Build.0 = ReleaseASC|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Any CPU.ActiveCfg = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.ActiveCfg = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.Build.0 = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseASC|Any CPU.ActiveCfg = ReleaseASC|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseASC|Mixed Platforms.ActiveCfg = ReleaseASC|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseASC|Mixed Platforms.Build.0 = ReleaseASC|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseASC|Win32.ActiveCfg = ReleaseASC|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseASC|Win32.Build.0 = ReleaseASC|Win32
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Release|Win32.ActiveCfg = Release|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.ReleaseASC|Any CPU.ActiveCfg = Release|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.ReleaseASC|Any CPU.Build.0 = Release|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.ReleaseASC|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.ReleaseASC|Mixed Platforms.Build.0 = Release|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.ReleaseASC|Win32.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
-EndGlobal

ASCImageStudio3/ASCGraphics/Interfaces/ASCDocumentRenderer.cpp

-#pragma once
-#include "stdafx.h"
-#include "ASCDocumentRenderer.h"
-#include "ImageSerializeObjects2.h"
-
-void CAVSDocumentRenderer::DrawWatermark(LONG lPageNumber, IUnknown* punkRenderer)
-{
-	if (NULL == punkRenderer)
-		return;
-
-	IAVSRenderer* pRenderer = NULL;
-	punkRenderer->QueryInterface(__uuidof(IAVSRenderer), (void**)&pRenderer);
-
-	if (NULL == pRenderer)
-		return;
-
-	NSDocumentViewer::CDoubleRect oRect;
-	oRect.left = 0;
-	oRect.top = 0;
-
-	pRenderer->get_Width(&oRect.right);
-	pRenderer->get_Height(&oRect.bottom);
-
-	m_oWatermark.DrawOnRenderer(pRenderer, oRect);
-
-	RELEASEINTERFACE(pRenderer);
-}
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/ASCEffectPainter.h

-#pragma once
-
-#include "..\stdafx.h"
-#include "..\resource.h"       // main symbols
-#include "Registration.h"
-
-#include "..\DocumentViewer\Viewer.h"
-
-//  XML
-#include "..\..\..\..\Common\RSA\XMLDecoder.h"
-
-using namespace ImageStudio::Serialize::Paint::Common;
-
-// IAVSEffectPainter
-[object, uuid("99F1BCD5-6188-472c-B29A-F56E1F23F0EA"), dual, pointer_default(unique)]
-__interface IAVSEffectPainter : IDispatch
-{
-	[id(0)]				HRESULT SetXml([in] BSTR bstrXml);
-	[id(1)]				HRESULT Draw([in] IUnknown* punkRenderer);
-
-	[id(2000)]			HRESULT SetAdditionalParam([in] BSTR ParamName, [in] VARIANT ParamValue);
-	[id(2001)]			HRESULT GetAdditionalParam([in] BSTR ParamName, [out, retval] VARIANT* ParamValue);
-};
-
-[object, uuid("351A75D3-4FDD-48b5-9027-03CE0AB0D4F6"), dual, pointer_default(unique)]
-__interface IAVSEffectPainter2 : IDispatch
-{
-	[id(3000)]			HRESULT SaveImage([in] IUnknown* punkFrame, [in] BSTR bstrFile, [in] LONG lType);
-};
-
-// CAVSEffectPainter
-[coclass, uuid("98F3D2DD-7373-4c5a-BF3E-5B66670FE7F4"), threading(apartment), vi_progid("AVSEffectPainter"), progid("AVSEffectPainter.1"), version(1.0)]
-class ATL_NO_VTABLE CAVSEffectPainter :	public IAVSEffectPainter, public IAVSEffectPainter2
-{
-protected:
-
-	CAtlArray<NSDocumentViewer::CWatermark> m_arrWatermarks;
-
-public:
-
-	CAVSEffectPainter() : m_arrWatermarks()
-	{
-	}
-
-	~CAVSEffectPainter()
-	{
-	}
-
-public:
-	STDMETHOD(SetXml)(BSTR bstrXml)
-	{
-		m_arrWatermarks.RemoveAll();
-
-		XmlUtils::CXmlNode oNode;
-		if (oNode.FromXmlString((CString)bstrXml))
-		{
-			XmlUtils::CXmlNodes oNodes;
-			if (oNode.GetNodes(_T("Watermark"), oNodes))
-			{
-				int nCount = oNodes.GetCount();
-				size_t nWatermarks = 0;
-				for (int i = 0; i < nCount; ++i)
-				{
-					XmlUtils::CXmlNode oWatermark;
-					oNodes.GetAt(i, oWatermark);
-
-					m_arrWatermarks.Add();
-					m_arrWatermarks[nWatermarks].LoadFromXML(oWatermark);
-					++nWatermarks;
-				}
-			}
-		}
-		
-		return S_OK;
-	}
-	STDMETHOD(Draw)(IUnknown* punkRenderer)
-	{	
-		if (NULL == punkRenderer)
-			return S_FALSE;
-		
-		IAVSRenderer* pRenderer = NULL;
-		punkRenderer->QueryInterface(__uuidof(IAVSRenderer), (void**)&pRenderer);
-
-		if (NULL == pRenderer)
-			return S_FALSE;
-
-		NSDocumentViewer::CDoubleRect oRect;
-		oRect.left = 0;
-		oRect.top = 0;
-
-		pRenderer->get_Width(&oRect.right);
-		pRenderer->get_Height(&oRect.bottom);
-
-		size_t nCount = m_arrWatermarks.GetCount();
-		for (size_t i = 0; i < nCount; ++i)
-		{
-			m_arrWatermarks[i].DrawOnRenderer(pRenderer, oRect);
-		}
-
-		RELEASEINTERFACE(pRenderer);
-		return S_OK;
-	}
-
-	
-	STDMETHOD(SetAdditionalParam)(BSTR ParamName, VARIANT ParamValue)
-	{
-		return S_OK;
-	}
-	STDMETHOD(GetAdditionalParam)(BSTR ParamName, VARIANT* ParamValue)
-	{
-		return S_OK;
-	}
-
-	STDMETHOD(SaveImage)(IUnknown* punkFrame, BSTR bstrFile, LONG lType)
-	{
-		ImageStudio::IImageTransforms* pTransform = NULL;
-		CoCreateInstance(ImageStudio::CLSID_ImageTransforms, NULL ,CLSCTX_INPROC_SERVER, ImageStudio::IID_IImageTransforms, (void**)&pTransform);
-
-		VARIANT var;
-		var.vt = VT_UNKNOWN;
-		var.punkVal = punkFrame;
-		pTransform->SetSource(0, var);
-
-		CString strXml = _T("<transforms><ImageFile-SaveAsPng destinationpath=\"") + (CString)bstrFile + _T("\" format=\"888\"/></transforms>");
-		
-		VARIANT_BOOL vbSuccess = VARIANT_FALSE;
-		BSTR bsXml = strXml.AllocSysString();
-		pTransform->SetXml(bsXml, &vbSuccess);
-		SysFreeString(bsXml);
-
-		pTransform->Transform(&vbSuccess);
-
-		RELEASEINTERFACE(pTransform);
-
-		return S_OK;
-	}
-};

ASCImageStudio3/ASCGraphics/Interfaces/ASCGdiplusRenderer.h

@@ -3,17 +3,17 @@
 #include "GdiplusRenderer.h"
 
 [coclass, uuid("A6145D77-5C72-4d61-A2D7-7D8DB41E8260"), threading(apartment), vi_progid("GraphicsRenderer"), progid("GraphicsRenderer.1"), version(1.0)]
-class ATL_NO_VTABLE CAVSGdiplusRenderer :	public IAVSGraphicsRenderer
+class ATL_NO_VTABLE CASCGdiplusRenderer :	public IASCGraphicsRenderer
 {
 private:
 	CGdiplusRenderer m_oRenderer;
 
 public:
-	CAVSGdiplusRenderer() : m_oRenderer()
+	CASCGdiplusRenderer() : m_oRenderer()
 	{
 	}
 
-	~CAVSGdiplusRenderer()
+	~CASCGdiplusRenderer()
 	{
 	}
 
@@ -498,7 +498,7 @@ public:
 		return S_OK;
 	}
 
-// AVSGraphicsRenderer
+// ASCGraphicsRenderer
 	STDMETHOD(CreateFromMediaData)(IUnknown* punkMediaData, double dLeft, double dTop, double dWidth, double dHeight)
 	{
 		return S_OK;

ASCImageStudio3/ASCGraphics/Interfaces/ASCGraphicsRenderer.h

@@ -3,18 +3,18 @@
 #include "GraphicsRenderer.h"
 
 [coclass, uuid("F7D3319F-9B41-4d62-80A0-9D151860E915"), threading(apartment), vi_progid("GraphicsRenderer"), progid("GraphicsRenderer.1"), version(1.0)]
-class ATL_NO_VTABLE CAVSGraphicsRenderer :	public IAVSGraphicsRenderer
+class ATL_NO_VTABLE CASCGraphicsRenderer :	public IASCGraphicsRenderer
 {
 public:
 	CGraphicsRenderer m_oRenderer;
 
 public:
-	CAVSGraphicsRenderer() : m_oRenderer()
+	CASCGraphicsRenderer() : m_oRenderer()
 	{
-		m_oRenderer.SetRenderer((IAVSRenderer*)this);
+		m_oRenderer.SetRenderer((IASCRenderer*)this);
 	}
 
-	~CAVSGraphicsRenderer()
+	~CASCGraphicsRenderer()
 	{
 	}
 
@@ -503,7 +503,7 @@ public:
 		else
 		if (_T("FontManager") == strParamName)
 		{
-			SetFontManager((IAVSFontManager*)ParamValue.punkVal);
+			SetFontManager((IASCFontManager*)ParamValue.punkVal);
 			return S_OK;
 		}
 		else if ( _T("BaseTransform") == strParamName && VT_ARRAY == ParamValue.vt )
@@ -572,7 +572,7 @@ public:
 			ParamValue->vt		= VT_UNKNOWN;
 			ParamValue->punkVal	= NULL;
 
-			IAVSFontManager* pManager = m_oRenderer.GetFontManager();
+			IASCFontManager* pManager = m_oRenderer.GetFontManager();
 			if (NULL != pManager)
 			{
 				pManager->QueryInterface(IID_IUnknown, (void**)&ParamValue->punkVal);
@@ -583,7 +583,7 @@ public:
 		return S_OK;
 	}
 
-// AVSGraphicsRenderer
+// ASCGraphicsRenderer
 	STDMETHOD(CreateFromMediaData)(IUnknown* punkMediaData, double dLeft, double dTop, double dWidth, double dHeight)
 	{
 		m_oRenderer.CreateFromMediaData(punkMediaData);
@@ -595,9 +595,9 @@ public:
 		if (NULL == pHDC)
 			return S_FALSE;
 
-		IAVSFontManager* pManager = NULL;
+		IASCFontManager* pManager = NULL;
 		if (NULL != punkFontManager)
-			punkFontManager->QueryInterface(__uuidof(IAVSFontManager), (void**)&pManager);
+			punkFontManager->QueryInterface(__uuidof(IASCFontManager), (void**)&pManager);
 
 		m_oRenderer.CreateFromHDC((HDC)(*pHDC), pManager, dWidthMM, dHeightMM, dLeft, dTop, dWidth, dHeight, dAngle);
 
@@ -615,7 +615,7 @@ public:
 	}
 
 public:
-	STDMETHOD(SetFontManager)(IAVSFontManager* pMan)
+	STDMETHOD(SetFontManager)(IASCFontManager* pMan)
 	{
 		m_oRenderer.SetFontManager(pMan);
 		return S_OK;
@@ -661,7 +661,7 @@ public:
 
 		m_oRenderer.m_oBrush.m_arrSubColors.RemoveAll();
 
-		NSStructuresAVS::CBrush::TSubColor tSubColor;
+		NSStructuresASC::CBrush::TSubColor tSubColor;
 
 		for( int i = 0; i < count; i++ )
 		{

ASCImageStudio3/ASCGraphics/Interfaces/ASCGraphicsSimpleConverter.h

@@ -2,9 +2,9 @@
 #include "..\stdafx.h"
 #include "..\agg\ASCWrapper\GraphicsPath.h"
 
-// IAVSGraphicSimpleComverter
+// IASCGraphicSimpleComverter
 [object, uuid("45EC6624-B5E1-4e60-ADD4-8DD310B6CF96"), dual, pointer_default(unique)]
-__interface IAVSGraphicSimpleComverter : IDispatch
+__interface IASCGraphicSimpleComverter : IDispatch
 {
 	[id(0), propget]	HRESULT Renderer([out, retval] IUnknown** ppunkRenderer);
 	[id(0), propput]	HRESULT Renderer([in] IUnknown* punkRenderer);
@@ -19,9 +19,9 @@ __interface IAVSGraphicSimpleComverter : IDispatch
 	[id(107)]			HRESULT PathCommandEnd();
 	[id(108)]			HRESULT PathCommandStart();
 	[id(109)]			HRESULT PathCommandGetCurrentPoint([out] double* fX, [out] double* fY);
-	[id(110)]			HRESULT PathCommandText([in] BSTR bsText, [in] IAVSFontManager* pManager, 
+	[id(110)]			HRESULT PathCommandText([in] BSTR bsText, [in] IASCFontManager* pManager, 
 												[in] double fX, [in] double fY, [in] double fWidth, [in] double fHeight, [in] double fBaseLineOffset);
-	[id(111)]			HRESULT PathCommandTextEx([in] BSTR bsText, [in] BSTR bsGidText, [in] BSTR bsSourceCodeText, [in] IAVSFontManager* pManager, 
+	[id(111)]			HRESULT PathCommandTextEx([in] BSTR bsText, [in] BSTR bsGidText, [in] BSTR bsSourceCodeText, [in] IASCFontManager* pManager, 
 												  [in] double fX, [in] double fY, [in] double fWidth, [in] double fHeight, [in] double fBaseLineOffset, [in] DWORD lFlags);
 
 	[id(112)]			HRESULT PathCommandGetBounds([out] double* dLeft, [out] double* dTop, [out] double* dWidth, [out] double* dHeight);
@@ -31,25 +31,25 @@ __interface IAVSGraphicSimpleComverter : IDispatch
 };
 
 [dispinterface, uuid("DA3B4916-0C9E-4845-BD8C-FFC9CE6D3DB2")]
-__interface _IAVSGraphicSimpleComverterEvents
+__interface _IASCGraphicSimpleComverterEvents
 {
 };
 
-// CAVSGraphicSimpleComverter
+// CASCGraphicSimpleComverter
 [coclass, uuid("48AC5FEC-13E9-413b-BCB5-E74B55ACF4D3"), event_source(com), threading(apartment), vi_progid("SimpleComverter"), progid("SimpleComverter.1"), version(1.0)]
-class ATL_NO_VTABLE CAVSGraphicSimpleComverter : public IAVSGraphicSimpleComverter
+class ATL_NO_VTABLE CASCGraphicSimpleComverter : public IASCGraphicSimpleComverter
 {
 protected:
 	Aggplus::CGraphicsPathSimpleConverter m_oConverter;
 	
 public:
-	__event __interface _IAVSGraphicSimpleComverterEvents;
+	__event __interface _IASCGraphicSimpleComverterEvents;
 
-	CAVSGraphicSimpleComverter() : m_oConverter()
+	CASCGraphicSimpleComverter() : m_oConverter()
 	{
 	}
 
-	~CAVSGraphicSimpleComverter()
+	~CASCGraphicSimpleComverter()
 	{
 	}
 
@@ -113,11 +113,11 @@ public:
 		return S_OK;
 	}
 
-	STDMETHOD(PathCommandText)(BSTR bsText, IAVSFontManager* pManager, double fX, double fY, double fWidth, double fHeight, double fBaseLineOffset)
+	STDMETHOD(PathCommandText)(BSTR bsText, IASCFontManager* pManager, double fX, double fY, double fWidth, double fHeight, double fBaseLineOffset)
 	{
 		return (true == m_oConverter.PathCommandText(bsText, pManager, fX, fY, fWidth, fHeight, fBaseLineOffset)) ? S_OK : S_FALSE;
 	}
-	STDMETHOD(PathCommandTextEx)(BSTR bsText, BSTR bsGidText, BSTR bsSourceCodeText, IAVSFontManager* pManager, 
+	STDMETHOD(PathCommandTextEx)(BSTR bsText, BSTR bsGidText, BSTR bsSourceCodeText, IASCFontManager* pManager, 
 												  double fX, double fY, double fWidth, double fHeight, double fBaseLineOffset, DWORD lFlags)
 	{
 		return (true == m_oConverter.PathCommandTextEx(bsText, bsGidText, bsSourceCodeText, pManager,
@@ -138,7 +138,7 @@ public:
 		if (NULL == ppunkRenderer)
 			return S_FALSE;
 
-		IAVSRenderer* pRenderer = m_oConverter.GetRenderer();
+		IASCRenderer* pRenderer = m_oConverter.GetRenderer();
 
 		if (NULL == pRenderer)
 			return S_FALSE;
@@ -149,7 +149,7 @@ public:
 	
 	STDMETHOD(put_Renderer)(IUnknown* punkRenderer)
 	{
-		m_oConverter.SetRenderer((IAVSRenderer*)punkRenderer);
+		m_oConverter.SetRenderer((IASCRenderer*)punkRenderer);
 		return S_OK;
 	}
 };
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/ASCMetafile.h

 #pragma once
 #include "ASCRenderer.h"
-#include "..\DocumentViewer\Metafile.h"
-#include "..\..\ASCOfficeStudio\Common\OfficeFileTemplate.h"
+#include "Metafile.h"
+#include "..\..\..\Common\OfficeFileTemplate.h"
 
 
 #define PROPERTY_META(NameBase, Name, Type)				\
@@ -19,7 +19,7 @@
 	}
 
 [coclass, uuid("40D33F34-B681-46be-8649-FFBE7146569D"), threading(apartment), vi_progid("AVSMetafile"), progid("AVSMetafile.1"), version(1.0)]
-class ATL_NO_VTABLE CAVSMetafile :	public IAVSMetafile, public IAVSRenderer2
+class ATL_NO_VTABLE CASCMetafile :	public IASCMetafile, public IASCRenderer2
 {
 protected:
 
@@ -34,7 +34,7 @@ protected:
 
 public:
 
-	CAVSMetafile() : m_oPage()
+	CASCMetafile() : m_oPage()
 	{
 		m_pDocInstance	= NULL;
 		m_lPageIndex	= NULL;
@@ -42,7 +42,7 @@ public:
 		m_lCommandType  = c_nNone;
 	}
 
-	~CAVSMetafile()
+	~CASCMetafile()
 	{
 		RELEASEINTERFACE(m_pDocInstance);
 	}
@@ -312,8 +312,8 @@ public:
 	//  
 	STDMETHOD(Draw)(IUnknown* punkRenderer, BOOL* pBreak)
 	{		
-		IAVSRenderer* pRenderer = NULL;
-		punkRenderer->QueryInterface(__uuidof(IAVSRenderer), (void**)&pRenderer);
+		IASCRenderer* pRenderer = NULL;
+		punkRenderer->QueryInterface(__uuidof(IASCRenderer), (void**)&pRenderer);
 
 		if (NULL == pRenderer)
 			return S_FALSE;
@@ -339,8 +339,8 @@ public:
 			return S_FALSE;
 
 		//C2DRenderer* p2D = dynamic_cast<C2DRenderer*>(pRenderer);
-		IAVSRenderer* pRen = NULL;
-		pRenderer->QueryInterface(__uuidof(IAVSRenderer), (void**)&pRen);
+		IASCRenderer* pRen = NULL;
+		pRenderer->QueryInterface(__uuidof(IASCRenderer), (void**)&pRen);
 
 		if (NULL == m_pDocInstance)
 		{
@@ -442,7 +442,6 @@ public:
 	}
 	STDMETHOD(SetAdditionalCommands)(BSTR bsXML)
 	{
-		m_oPage.SetAdditionalCommands(bsXML);
 		return S_OK;
 	}
 

ASCImageStudio3/ASCGraphics/Interfaces/ASCRenderer.h

@@ -77,9 +77,9 @@ const long c_nDocxWriter		= 0x0008;
 const long c_nVifFormat			= 0x0009;
 
 
-// IAVSRenderer
+// IASCRenderer
 [object, uuid("97F3816A-C2BD-43b2-B480-24711DBE7C8D"), dual, pointer_default(unique)]
-__interface IAVSRenderer : IDispatch
+__interface IASCRenderer : IDispatch
 {
 //  -----------------------------------------------------------------------------
 	[id(1),   propget]	HRESULT Type([out, retval] LONG* lType);
@@ -223,9 +223,9 @@ __interface IAVSRenderer : IDispatch
 	[id(10002)]	HRESULT GetAdditionalParam([in] BSTR ParamName, [out] VARIANT *	ParamValue);
 };
 
-// IAVSRenderer2
+// IASCRenderer2
 [object, uuid("37F42FA1-A7DB-466e-ACFB-0E31F5D4126E"), dual, pointer_default(unique)]
-__interface IAVSRenderer2 : IDispatch
+__interface IASCRenderer2 : IDispatch
 {
 	[id(3010)]			HRESULT CommandLong([in] LONG lCommand);
 	[id(3011)]			HRESULT CommandDouble([in] double dCommand);

ASCImageStudio3/ASCGraphics/Interfaces/Common.h

 #pragma once
 #include "..\stdafx.h"
 
-#define AVS_OFFICEEDITOR_STATUS_NONE					0
-#define AVS_OFFICEEDITOR_STATUS_STARTED					1
-
 static LPCTSTR g_cpszXMLMultiSource				= _T("MultiSource");
 static LPCTSTR g_cpszXMLSingleSource			= _T("SingleSource");
 static LPCTSTR g_cpszXMLVideoSources			= _T("VideoSources");

ASCImageStudio3/ASCGraphics/Interfaces/GraphicsRenderer.h

@@ -3,13 +3,13 @@
 #include "..\..\..\..\Common\mediaformatdefine.h"
 #include "..\agg\ASCWrapper\Graphics.h"
 #include "StructuresASC.h"
-#include "..\DocumentViewer\ViewerCommon.h"
 #include "ImageFilesCache.h"
+#include "Metafile.h"
 
 class CGraphicsRenderer
 {
 	friend class CAVSMetafile;
-	friend class CAVSGraphicsRenderer;
+	friend class CASCGraphicsRenderer;
 
 protected:
 
@@ -67,18 +67,18 @@ protected:
 
 protected:
 
-	IAVSFontManager*						m_pFontManager;
-	IAVSRenderer*							m_pAVSRenderer;
+	IASCFontManager*						m_pFontManager;
+	IASCRenderer*							m_pASCRenderer;
 
 	Aggplus::CGraphics*						m_pRenderer;
 	Aggplus::CGraphicsPath*					m_pPath;
 
 public:
-	NSStructuresAVS::CPen					m_oPen;
-	NSStructuresAVS::CBrush					m_oBrush;
-	NSStructuresAVS::CFont					m_oFont;
-	NSStructuresAVS::CShadow				m_oShadow;
-	NSStructuresAVS::CEdgeText				m_oEdge;
+	NSStructuresASC::CPen					m_oPen;
+	NSStructuresASC::CBrush					m_oBrush;
+	NSStructuresASC::CFont					m_oFont;
+	NSStructuresASC::CShadow				m_oShadow;
+	NSStructuresASC::CEdgeText				m_oEdge;
 
 protected:
 
@@ -112,7 +112,7 @@ protected:
 
 public:
 
-	CGraphicsRenderer(IAVSFontManager* pManager = NULL)
+	CGraphicsRenderer(IASCFontManager* pManager = NULL)
 	{
 		m_pRenderer = NULL;
 		m_pPath = NULL;
@@ -137,16 +137,16 @@ public:
 
 		m_pCache = NULL;
 
-		m_pAVSRenderer = NULL;
+		m_pASCRenderer = NULL;
 	}
 
-	void SetFontManager(IAVSFontManager* pManager = NULL)
+	void SetFontManager(IASCFontManager* pManager = NULL)
 	{
 		RELEASEINTERFACE(m_pFontManager);
 		
 		if (NULL == pManager)
 		{
-			CoCreateInstance(__uuidof(CAVSFontManager), NULL, CLSCTX_INPROC, __uuidof(IAVSFontManager), (void**)&m_pFontManager);
+			CoCreateInstance(__uuidof(CASCFontManager), NULL, CLSCTX_INPROC, __uuidof(IASCFontManager), (void**)&m_pFontManager);
 			m_pFontManager->Initialize(L"");
 			m_pFontManager->SetDefaultFont( L"Arial" );
 		}
@@ -170,7 +170,7 @@ public:
 		ADDREFINTERFACE(m_pCache);
 	}
 
-	inline IAVSFontManager* GetFontManager()
+	inline IASCFontManager* GetFontManager()
 	{
 		return m_pFontManager;
 	}
@@ -189,9 +189,9 @@ public:
 		RELEASEOBJECT(m_pDIB);
 		RELEASEINTERFACE(m_pFontManager);
 	}
-	inline void SetRenderer(IAVSRenderer* pRenderer)
+	inline void SetRenderer(IASCRenderer* pRenderer)
 	{
-		m_pAVSRenderer = pRenderer;
+		m_pASCRenderer = pRenderer;
 	}
 
 	inline void ClearInstallFont()
@@ -266,7 +266,7 @@ public:
 			}
 		}
 	}
-	BOOL CreateFromHDC(HDC hDC, IAVSFontManager* pManager, double dWidthMM, double dHeightMM, double dLeft, double dTop, double dWidth, double dHeight, double dAngle)
+	BOOL CreateFromHDC(HDC hDC, IASCFontManager* pManager, double dWidthMM, double dHeightMM, double dLeft, double dTop, double dWidth, double dHeight, double dAngle)
 	{
 		RELEASEOBJECT(m_pDIB);
 
@@ -736,7 +736,7 @@ public:
 		LONG lFillType = (nType & 0xFF00);
 		BOOL bIsStroke = (0x01 == (nType & 0x01));
 
-		if ((lFillType != 0) && (m_oBrush.Type == c_BrushTypeTexture || m_oBrush.Type == c_BrushTypePattern) && (NULL != m_pAVSRenderer))
+		if ((lFillType != 0) && (m_oBrush.Type == c_BrushTypeTexture || m_oBrush.Type == c_BrushTypePattern) && (NULL != m_pASCRenderer))
 		{
 			CImageExt oExt;
 			
@@ -750,7 +750,7 @@ public:
 				m_pPath->GetBounds(x, y, w, h);
 
 				BSTR bsPath = m_oBrush.TexturePath.AllocSysString();
-				oExt.DrawOnRenderer(m_pAVSRenderer, bsPath, x, y, w, h);
+				oExt.DrawOnRenderer(m_pASCRenderer, bsPath, x, y, w, h);
 				SysFreeString(bsPath);			
 				
 				if (bIsStroke)
@@ -985,9 +985,9 @@ public:
 			LONG lType = oImageExt.GetImageType((CString)bstrVal);
 			if (0 != lType)
 			{
-				if (NULL != m_pAVSRenderer)
+				if (NULL != m_pASCRenderer)
 				{
-					oImageExt.DrawOnRenderer(m_pAVSRenderer, bstrVal, fX, fY, fWidth, fHeight);
+					oImageExt.DrawOnRenderer(m_pASCRenderer, bstrVal, fX, fY, fWidth, fHeight);
 				}
 				else
 				{

ASCImageStudio3/ASCGraphics/Interfaces/IASCBrush.h

-#pragma once
-#include "..\stdafx.h"
-
-#include "IASCGraphicsBase.h"
-
-[object, uuid("64AE5000-6CF6-461a-A766-344F88DC8381"), dual, pointer_default(unique)]
-__interface IAVSBrush : IAVSGraphicsBase
-{
-	[id(100), propget]	HRESULT Xml([out, retval] BSTR* bstrXML);
-	[id(100), propput]	HRESULT Xml([in] BSTR bstrXML);
-	
-	// general ------------------------------------------------------------
-	[id(101), propget]	HRESULT Color1([out, retval] LONG* lColor);
-	[id(101), propput]	HRESULT Color1([in] LONG lColor);
-
-	[id(102), propget]	HRESULT Color2([out, retval] LONG* lColor);
-	[id(102), propput]	HRESULT Color2([in] LONG lColor);
-
-	[id(103), propget]	HRESULT Alpha1([out, retval] LONG* Alpha);
-	[id(103), propput]	HRESULT Alpha1([in] LONG Alpha);
-
-	[id(104), propget]	HRESULT Alpha2([out, retval] LONG* Alpha);
-	[id(104), propput]	HRESULT Alpha2([in] LONG Alpha);
-
-	[id(105), propget]	HRESULT Type([out, retval] LONG* lType);
-	[id(105), propput]	HRESULT Type([in] LONG lType);
-
-	[id(106), propget]	HRESULT TextureAlpha([out, retval] LONG* lType);
-	[id(106), propput]	HRESULT TextureAlpha([in] LONG lType);
-
-	[id(107), propget]	HRESULT TextureMode([out, retval] LONG* lType);
-	[id(107), propput]	HRESULT TextureMode([in] LONG lType);
-
-	[id(108), propget]	HRESULT TexturePath([out, retval] BSTR* bstrPath);
-	[id(108), propput]	HRESULT TexturePath([in] BSTR bstrPath);
-
-	[id(109)]			HRESULT SetRect([in]  double  dLeft, [in]  double  dTop, [in]  double  dRight, [in]  double  dBottom);
-	[id(110)]			HRESULT GetRect([out] double* dLeft, [out] double* dTop, [out] double* dRight, [out] double* dBottom);
-};
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/IASCEdgeText.h

-#pragma once
-#include "..\stdafx.h"
-
-#include "IASCGraphics.h"
-
-[object, uuid("20B29BAC-2ECF-4c29-B590-D32CC278EDAF"), dual, pointer_default(unique)]
-__interface IAVSEdgeText : IAVSGraphicsBase
-{
-	[id(100), propget]	HRESULT Xml([out, retval] BSTR* bstrXML);
-	[id(100), propput]	HRESULT Xml([in] BSTR bstrXML);
-	
-	// general ------------------------------------------------------------
-	[id(101), propget]	HRESULT Visible([out, retval] LONG* lVisible);
-	[id(101), propput]	HRESULT Visible([in] LONG lVisible);
-
-	[id(102), propget]	HRESULT Color([out, retval] LONG* lColor);
-	[id(102), propput]	HRESULT Color([in] LONG lColor);
-
-	[id(103), propget]	HRESULT Alpha([out, retval] LONG* Alpha);
-	[id(103), propput]	HRESULT Alpha([in] LONG Alpha);
-
-	[id(104), propget]	HRESULT Distance([out, retval] double* dDist);
-	[id(104), propput]	HRESULT Distance([in] double dDist);
-
-	[id(201)]			HRESULT DrawText([in] IAVSGraphics* pGraphics, [in] IAVSFontManager* pFont, [in] BSTR bsText, [in] double dLeft, [in] double  dTop, [in] double  dRight, [in] double  dBottom);
-};
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/IASCFontManager.h

@@ -5,7 +5,7 @@
 #include "IASCGlyphImage.h"
 
 [object, uuid("472691CD-1FC6-424a-A44E-8E7549ECDCFF"), dual, pointer_default(unique)]
-__interface IAVSFontManager : IAVSGraphicsBase
+__interface IASCFontManager : IASCGraphicsBase
 {
 	//----- /  --------------------------------------------------------------------
 	[id(001)]  HRESULT Initialize([in] BSTR bsXmlOptions);
@@ -46,9 +46,8 @@ __interface IAVSFontManager : IAVSGraphicsBase
 	[id(301)]  HRESULT LoadString([in] BSTR bsString, [in] float fX, [in] float fY);
 	[id(302)]  HRESULT LoadString2([in] BSTR bsString, [in] float fX, [in] float fY);
 	[id(303)]  HRESULT GetStringPath([out, retval] BSTR *pbsXmlPath);
-	[id(304)]  HRESULT GetStringPath2([out, retval] IAVSGraphicsBase **ppPath);
 	[id(305)]  HRESULT GetNextChar([out] IUnknown **ppImage, [out] float *pfX, [out] float *pfY, [out, retval] VARIANT_BOOL *pvbSuccess);
-	[id(306)]  HRESULT GetNextChar2([out] IAVSGlyphImage **ppImage, [out] float *pfX, [out] float *pfY, [out, retval] VARIANT_BOOL *pvbSuccess);
+	[id(306)]  HRESULT GetNextChar2([out] IGlyphImage **ppImage, [out] float *pfX, [out] float *pfY, [out, retval] VARIANT_BOOL *pvbSuccess);
 	[id(307)]  HRESULT GetCharBBox([out] float *pfX, [out] float *pfY, [out] float *pfWidth, [out] float *pfHeight);
 	[id(308)]  HRESULT GetUnderline([out] float *pfStartX, [out] float *pfStartY, [out] float *pfEndX, [out] float *pfEndY, [out] float *pfSize);
 	[id(309)]  HRESULT MeasureString([out] float *pfX, [out] float *pfY, [out] float *pfWidth, [out] float *pfHeight);
@@ -70,7 +69,7 @@ __interface IAVSFontManager : IAVSGraphicsBase
 };
 
 [object, uuid("2A13E1F7-424C-4996-A39B-A1449C9F232C"), dual, pointer_default(unique)]
-__interface IAVSFontManager2 : IDispatch
+__interface IASCFontManager2 : IDispatch
 {
 	[id(1001)]  HRESULT UseDefaultFont([in] BOOL bUseDefFont);
 	[id(1002)]  HRESULT GetFontPath([out]BSTR *pbsFontPath);

ASCImageStudio3/ASCGraphics/Interfaces/IASCGlyphImage.h

@@ -4,7 +4,7 @@
 #include "IASCGraphicsBase.h"
 
 [object, uuid("280F9CFE-D5F6-4594-B6C5-A7F3D6984CF2"), dual, pointer_default(unique)]
-__interface IAVSGlyphImage : IAVSGraphicsBase
+__interface IGlyphImage : IASCGraphicsBase
 {
 	[id(101), propget]	HRESULT Width([out, retval] LONG* width);
 
@@ -16,7 +16,7 @@ __interface IAVSGlyphImage : IAVSGraphicsBase
 };
 
 [object, uuid("1F21202B-9983-4164-B6B8-1BF82D66BF90"), dual, pointer_default(unique)]
-__interface IAVSGlyphImage2 : IAVSGlyphImage
+__interface IGlyphImage2 : IGlyphImage
 {
 	[id(401)]			HRESULT Create([in] BYTE* pBuffer, [in] LONG lX, [in] LONG lY, [in] LONG lWidth, [in] LONG lHeight, [in] BOOL bIsFreeData);
 };
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/IASCGraphics.h

-#pragma once
-
-#include "IASCPen.h"
-#include "IASCBrush.h"
-#include "IASCGraphicsPath.h"
-#include "IASCGraphicsState.h"
-#include "IASCImage.h"
-#include "IASCStringFormat.h"
-#include "IASCFontManager.h"
-
-[object, uuid("AEC96193-2754-4340-9AEB-365D539C7044"), dual, pointer_default(unique)]
-__interface IAVSGraphics: IAVSGraphicsBase
-{
-	// pPixels -    (     - ,  )
-	//   lPitch -    IAVSGraphics  IAVSGraphics,
-	//        dpi   .     gdi,
-	//      .        ,   lPitch
-	[id(001)]			HRESULT Create([in] BYTE* pPixels, [in] LONG lWidth, [in] LONG lHeight, [in] LONG lStride, [in] LONG lPitch, [in] LONG lColorSpace);
-
-	//        . (  [id(001)])
-	[id(002)]			HRESULT CreatePart([in] LONG lLeft, [in] LONG lTop, [in] LONG lWidth, [in] LONG lHeight, [out, retval] IAVSGraphics** ppPart);
-
-
-	//     DPI,  
-	[id(101), propget]	HRESULT DpiX([out, retval] double* lDpiX);
-	[id(101), propput]	HRESULT DpiX([in] double lDpiX);
-
-	[id(102), propget]	HRESULT DpiY([out, retval] double* lDpiY);
-	[id(102), propput]	HRESULT DpiY([in] double lDpiY);
-
-	[id(110)]			HRESULT SetPageWidth([in] double lWidth, [in] LONG lUnit);
-	[id(111)]			HRESULT SetPageHeight([in] double lHeight, [in] LONG lUnit);
-	
-	[id(112), propget]	HRESULT PageUnit([out, retval] LONG* lUnit);
-	[id(112), propput]	HRESULT PageUnit([in] LONG lUnit);
-
-	[id(120), propget]	HRESULT Transform([out, retval] IAVSMatrix** ppTransform);
-	[id(120), propput]	HRESULT Transform([in] IAVSMatrix* pTransform);
-
-	[id(121), propget]	HRESULT BaseTransform([out, retval] IAVSMatrix** ppTransform);
-	[id(121), propput]	HRESULT BaseTransform([in] IAVSMatrix* pTransform);
-
-	[id(123)]			HRESULT TranslateTransform([in] double dX, [in] double dY, [in] LONG lMatrixOrder);
-	[id(124)]			HRESULT RotateTransform([in] double dAngle, [in] LONG lMatrixOrder);
-	[id(125)]			HRESULT ScaleTransform([in] double dScaleX, [in] double dScaleY, [in] LONG lMatrixOrder);
-
-	[id(126)]			HRESULT MultiplyTransform([in] IAVSMatrix* pTransform, [in] LONG lMatrixOrder);
-
-	[id(131)]			HRESULT Save([out, retval] IAVSGraphicsState** pState);
-	[id(132)]			HRESULT Restore([in] IAVSGraphicsState* pState);
-
-	//  
-	[id(200)]			HRESULT SetClip1([in] double dLeft, [in] double dTop, [in] double dWidth, [in] double dHeight, [in] LONG lCombineMode);
-	[id(201)]			HRESULT SetClip2([in] IAVSGraphicsPath* pPath, [in] LONG lCombineMode);
-	[id(202)]			HRESULT SetClip3([in] IUnknown* pRegion, [in] LONG lCombineMode);
-	[id(251)]			HRESULT ExludeClip1([in] double dLeft, [in] double dTop, [in] double dWidth, [in] double dHeight, [in] LONG lCombineMode);
-	[id(252)]			HRESULT ExludeClip2([in] IAVSGraphicsPath* pPath, [in] LONG lCombineMode);
-	[id(253)]			HRESULT ExludeClip3([in] IUnknown* pRegion, [in] LONG lCombineMode);
-
-
-	//  
-	[id(300)]			HRESULT MeasureString([in] BSTR bstrText, [in] IAVSFontManager* pManager, [out] double* lWidth, [out] double* lHeight);
-
-	//     , .  , ,   DrawString
-
-	[id(350)]			HRESULT Clear([in] LONG lColor);
-
-	//  
-	[id(401), propget]	HRESULT SmoothingMode([out, retval] LONG* lMode);
-	[id(401), propput]	HRESULT SmoothingMode([in] LONG lMode);
-
-	[id(402), propget]	HRESULT TextRenderingHint([out, retval] LONG* lMode);
-	[id(402), propput]	HRESULT TextRenderingHint([in] LONG lMode);
-
-	[id(403), propget]	HRESULT CompositingMode([out, retval] LONG* lMode);
-	[id(403), propput]	HRESULT CompositingMode([in] LONG lMode);
-
-	[id(404), propget]	HRESULT CompositingQuality([out, retval] LONG* lMode);
-	[id(404), propput]	HRESULT CompositingQuality([in] LONG lMode);
-
-	[id(405), propget]	HRESULT InterpolationMode([out, retval] LONG* lMode);
-	[id(405), propput]	HRESULT InterpolationMode([in] LONG lMode);
-
-	[id(406), propget]	HRESULT PixelOffsetMode([out, retval] LONG* lMode);
-	[id(406), propput]	HRESULT PixelOffsetMode([in] LONG lMode);
-
-	//   ( )
-	[id(500)]			HRESULT DrawArc([in] IAVSPen* pPen, [in] double x, [in] double y, [in] double width, [in] double height, [in] double startAngle, [in] double sweepAngle);
-	[id(501)]			HRESULT DrawBezier([in] IAVSPen* pPen, [in] double x1, [in] double y1, [in] double x2, [in] double y2, [in] double x3, [in] double y3, [in] double x4, [in] double y4);
-	[id(502)]			HRESULT DrawBeziers([in] IAVSPen* pPen, [in,  satype("double")] LPSAFEARRAY ppPoints);
-	[id(503)]			HRESULT DrawCurve([in] IAVSPen* pPen, [in,  satype("double")] LPSAFEARRAY ppPoints);
-	[id(504)]			HRESULT DrawLine([in] IAVSPen* pPen, [in] double x1, [in] double y1, [in] double x2, [in] double y2);
-    [id(505)]			HRESULT DrawLines([in] IAVSPen* pPen, [in,  satype("double")] LPSAFEARRAY ppPoints);
-	[id(506)]			HRESULT DrawEllipse([in] IAVSPen* pPen, [in] double x, [in] double y, [in] double width, [in] double height);
-	[id(507)]			HRESULT DrawPath([in] IAVSPen* pPen, [in] IAVSGraphicsPath* pPath);
-
-	// 
-	[id(550)]			HRESULT FillEllipse([in] IAVSBrush* pBrush, [in] double x, [in] double y, [in] double width, [in] double height);
-	[id(551)]			HRESULT FillPath([in] IAVSBrush* pBrush, [in] IAVSGraphicsPath* pPath);
-	[id(552)]			HRESULT FillPolygon([in] IAVSBrush* pBrush, [in,  satype("double")] LPSAFEARRAY ppPoints);
-
-	//  
-	[id(591)]			HRESULT DrawImage([in] IAVSImage* pImage, [in] double x, [in] double y, [in] double width, [in] double height);
-	[id(592)]			HRESULT DrawImage2([in] IAVSImage* pImage, [in,  satype("double")] LPSAFEARRAY ppPoints);
-	[id(593)]			HRESULT DrawImageUnscaled([in] IAVSImage* pImage, [in] double x, [in] double y);
-
-	//  
-	[id(600)]			HRESULT DrawString([in] BSTR bstrText, [in] IAVSFontManager* pFont, [in] IAVSBrush* pBrush, [in] double x, [in] double y);
-	[id(601)]			HRESULT DrawString2([in] BSTR bstrText, [in] IAVSFontManager* pFont, [in] IAVSBrush* pBrush, 
-														[in] IAVSStringFormat* pFormat, [in] double x, [in] double y, [in] double width, [in] double height);
-};
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/IASCGraphicsBase.h

@@ -17,10 +17,10 @@ const long c_ag_PageUnitInch					= 2;
 const long c_ag_PageUnitMillimeter				= 3;
 
 [object, uuid("01CD8265-7CF2-4af6-819D-73B27542D8CA"), dual, pointer_default(unique)]
-__interface IAVSGraphicsBase : IDispatch
+__interface IASCGraphicsBase : IDispatch
 {
 	[id(1001)]			HRESULT SetAdditionalParam([in] BSTR ParamName, [in] VARIANT ParamValue);
 	[id(1002)]			HRESULT GetAdditionalParam([in] BSTR ParamName, [out, retval] VARIANT* ParamValue);
 
-	[id(1003)]			HRESULT CreateDublicate([out, retval] IAVSGraphicsBase** ppGraphicsBase);
+	[id(1003)]			HRESULT CreateDublicate([out, retval] IASCGraphicsBase** ppGraphicsBase);
 };
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/IASCGraphicsPath.h

-#pragma once
-#include "../stdafx.h"
-
-#include "IASCStringFormat.h"
-#include "IASCFontManager.h"
-#include "IASCPattern.h"
-
-const long c_ag_FillModeAlternate			= 0;
-const long c_ag_FillModeWinding				= 1;
-
-[object, uuid("60F0549A-5963-40e2-B7FC-71EEC8E1C8CC"), dual, pointer_default(unique)]
-__interface IAVSGraphicsPath : IAVSGraphicsBase
-{
-	[id(100), propget]	HRESULT FillMode([out, retval] LONG* lMode);
-	[id(100), propput]	HRESULT FillMode([in] LONG lMode);
-
-	[id(101), propget]	HRESULT PathPoints([out, retval, satype("double")] SAFEARRAY** ppPoints);
-	[id(102), propget]	HRESULT PointsCount([out, retval] LONG* lCount);
-
-	[id(201)]			HRESULT StartFigure();
-	[id(202)]			HRESULT CloseFigure();
-	[id(203)]			HRESULT CloseAllFigures();
-
-	[id(500)]			HRESULT AddArc([in] double x, [in] double y, [in] double width, [in] double height, [in] double startAngle, [in] double sweepAngle);
-	[id(501)]			HRESULT AddBezier([in] double x1, [in] double y1, [in] double x2, [in] double y2, [in] double x3, [in] double y3, [in] double x4, [in] double y4);
-	[id(502)]			HRESULT AddBeziers([in,  satype("double")] SAFEARRAY* ppPoints);
-	[id(503)]			HRESULT AddCurve([in,  satype("double")] SAFEARRAY* ppPoints);
-	[id(504)]			HRESULT AddLine([in] double x1, [in] double y1, [in] double x2, [in] double y2);
-    [id(505)]			HRESULT AddLines([in,  satype("double")] SAFEARRAY* ppPoints);
-	[id(506)]			HRESULT AddEllipse([in] double x, [in] double y, [in] double width, [in] double height);
-	[id(507)]			HRESULT AddPath([in] IAVSGraphicsPath* pPath);
-	[id(508)]			HRESULT AddPolygon([in,  satype("double")] SAFEARRAY* ppPoints);
-	[id(509)]			HRESULT AddRectangle([in] double x, [in] double y, [in] double width, [in] double height);
-	
-	[id(600)]			HRESULT AddString([in] BSTR bstrText, [in] IAVSFontManager* pFont, [in] double x, [in] double y);
-	[id(601)]			HRESULT AddString2([in] BSTR bstrText, [in] IAVSFontManager* pFont, [in] IAVSStringFormat* pFormat, [in] double x, [in] double y, [in] double width, [in] double height);
-
-	[id(701)]			HRESULT PathCommandMoveTo  ([in] double fX,  [in] double fY);
-	[id(702)]			HRESULT PathCommandLineTo  ([in] double fX,  [in] double fY);
-	[id(703)]			HRESULT PathCommandLinesTo ([in,  satype("double")] SAFEARRAY* ppPoints);
-	[id(704)]			HRESULT PathCommandCurveTo ([in] double fX1, [in] double fY1, [in] double fX2, [in] double fY2, [in] double fX3, [in] double fY3);
-	[id(705)]			HRESULT PathCommandCurvesTo([in,  satype("double")] SAFEARRAY* ppPoints);
-	[id(706)]			HRESULT PathCommandArcTo   ([in] double fX,  [in] double fY, [in] double fWidth, [in] double fHeight, [in] double fStartAngle, [in] double fSweepAngle);
-	[id(707)]			HRESULT PathCommandClose();
-	[id(708)]			HRESULT PathCommandEnd();
-	[id(709)]			HRESULT PathCommandStart();
-	[id(710)]			HRESULT GetCurrentPoint([out] double* fX, [out] double* fY);
-
-	[id(800)]			HRESULT Pattern([in] IAVSGraphicsBase* pObject, [out, retval] IAVSPattern** ppPattern);
-};
-
-class ISimpleGraphicsPath
-{
-public:
-	virtual bool _MoveTo(double x, double y)													= 0;
-	virtual bool _LineTo(double x, double y)													= 0;
-	virtual bool _CurveTo(double x1, double y1, double x2, double y2, double x3, double y3)		= 0;
-	virtual bool _Close()																		= 0;
-};
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/IASCGraphicsRenderer.h

 #pragma once
 #include "ASCRenderer.h"
 
-// IAVSGraphicsRenderer
+// IASCGraphicsRenderer
 [object, uuid("A278FE9F-622A-43a3-9F18-363311637073"), dual, pointer_default(unique)]
-__interface IAVSGraphicsRenderer : IAVSRenderer
+__interface IASCGraphicsRenderer : IASCRenderer
 {
 	[id(20000 + 1)]	HRESULT CreateFromMediaData([in] IUnknown* punkMediaData, [in] double dLeft, [in] double dTop, [in] double dWidth, [in] double dHeight);
 	[id(20000 + 2)]	HRESULT CreateFromHDC([in] LONG* pHDC, [in] IUnknown* punkFontManager, [in] double dWidthMM, [in] double dHeightMM,

ASCImageStudio3/ASCGraphics/Interfaces/IASCGraphicsState.h

-#pragma once
-#include "IASCMatrix.h"
-
-const long c_ag_CompositingModeSourceOver				= 0;
-const long c_ag_CompositingModeSourceCopy				= 1;
-
-const long c_ag_CompositingQualityInvalid				= -1;
-const long c_ag_CompositingQualityDefault				= 0;
-const long c_ag_CompositingQualityHighSpeed				= 1;
-const long c_ag_CompositingQualityHighQuality			= 2;
-const long c_ag_CompositingQualityGammaCorrected		= 3;
-const long c_ag_CompositingQualityAssumeLinear			= 4;
-
-const long c_ag_InterpolationModeInvalid				= -1;
-const long c_ag_InterpolationModeDefault				= 0;
-const long c_ag_InterpolationModeLow					= 1;
-const long c_ag_InterpolationModeHigh					= 2;
-const long c_ag_InterpolationModeBilinear				= 3;
-const long c_ag_InterpolationModeBicubic				= 4;
-const long c_ag_InterpolationModeNearestNeighbor		= 5;
-const long c_ag_InterpolationModeHighQualityBilinear	= 6;
-const long c_ag_InterpolationModeHighQualityBicubic		= 7;
-
-const long c_ag_PixelOffsetModeInvalid					= -1;
-const long c_ag_PixelOffsetModeDefault					= 0;
-const long c_ag_PixelOffsetModeHighSpeed				= 1;
-const long c_ag_PixelOffsetModeHighQuality				= 2;
-const long c_ag_PixelOffsetModeNone						= 3;
-const long c_ag_PixelOffsetModeHalf						= 4;
-
-const long c_ag_SmoothingModeInvalid					= -1;
-const long c_ag_SmoothingModeDefault					= 0;
-const long c_ag_SmoothingModeHighSpeed					= 1;
-const long c_ag_SmoothingModeHighQuality				= 2;
-const long c_ag_SmoothingModeNone						= 3;
-const long c_ag_SmoothingModeAntiAlias					= 4;
-
-const long c_ag_TextRenderingHintSystemDefault					= 0;
-const long c_ag_TextRenderingHintSingleBitPerPixelGridFit		= 1;
-const long c_ag_TextRenderingHintSingleBitPerPixel				= 2;
-const long c_ag_TextRenderingHintAntiAliasGridFit				= 3;
-const long c_ag_TextRenderingHintAntiAlias						= 4;
-const long c_ag_TextRenderingHintClearTypeGridFit				= 5;
-
-[object, uuid("49427C80-016B-48bc-ADA1-16A887AB6629"), dual, pointer_default(unique)]
-__interface IAVSGraphicsState : IAVSGraphicsBase
-{
-	[id(001)]			HRESULT LoadFromXml([in] BSTR bstrXML);
-	
-	// general ------------------------------------------------------------
-	[id(100), propget]	HRESULT BaseMatrix([out, retval] IAVSMatrix** ppMatrix);
-	[id(100), propput]	HRESULT BaseMatrix([in] IAVSMatrix* pMatrix);
-
-	[id(101), propget]	HRESULT Matrix([out, retval] IAVSMatrix** ppMatrix);
-	[id(101), propput]	HRESULT Matrix([in] IAVSMatrix* pMatrix);
-
-	[id(201), propget]	HRESULT DpiX([out, retval] double* dDpiX);
-	[id(201), propput]	HRESULT DpiX([in] double dDpiX);
-
-	[id(202), propget]	HRESULT DpiY([out, retval] double* dDpiY);
-	[id(202), propput]	HRESULT DpiY([in]  double dDpiY);
-
-	[id(301), propget]	HRESULT SmoothingMode([out, retval] LONG* lMode);
-	[id(301), propput]	HRESULT SmoothingMode([in] LONG lMode);
-
-	[id(302), propget]	HRESULT TextRenderingHint([out, retval] LONG* lMode);
-	[id(302), propput]	HRESULT TextRenderingHint([in] LONG lMode);
-
-	[id(303), propget]	HRESULT CompositingMode([out, retval] LONG* lMode);
-	[id(303), propput]	HRESULT CompositingMode([in] LONG lMode);
-
-	[id(304), propget]	HRESULT CompositingQuality([out, retval] LONG* lMode);
-	[id(304), propput]	HRESULT CompositingQuality([in] LONG lMode);
-
-	[id(305), propget]	HRESULT InterpolationMode([out, retval] LONG* lMode);
-	[id(305), propput]	HRESULT InterpolationMode([in] LONG lMode);
-
-	[id(306), propget]	HRESULT PixelOffsetMode([out, retval] LONG* lMode);
-	[id(306), propput]	HRESULT PixelOffsetMode([in] LONG lMode);
-};
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/IASCImage.h

@@ -8,7 +8,7 @@ const long c_ag_ImageTypeMetafile		= 1;
 #include "IASCFontManager.h"
 
 [object, uuid("73F78025-69A1-4094-8C53-6066930D49E3"), dual, pointer_default(unique)]
-__interface IAVSImage : IAVSGraphicsBase
+__interface IAVSImage : IASCGraphicsBase
 {
 	[id(100), propget] HRESULT Type([out, retval] LONG* lType);
 
@@ -24,11 +24,11 @@ __interface IAVSImage : IAVSGraphicsBase
 	[id(202), propget] HRESULT DpiY([out, retval] double* dDpiY);
 	[id(202), propput] HRESULT DpiY([in] double dDpiY);
 
-	[id(300)]		   HRESULT Draw([in] IAVSGraphicsBase* pGraphics);
+	[id(300)]		   HRESULT Draw([in] IASCGraphicsBase* pGraphics);
 	
-	[id(301), propget] HRESULT FontManager([out, retval] IAVSFontManager** ppManager);
-	[id(301), propput] HRESULT FontManager([in] IAVSFontManager* pManager);
+	[id(301), propget] HRESULT FontManager([out, retval] IASCFontManager** ppManager);
+	[id(301), propput] HRESULT FontManager([in] IASCFontManager* pManager);
 
 	[id(400)]          HRESULT LoadFromFile([in] BSTR bsFilePath);
-	[id(401)]          HRESULT DrawOnRenderer([in]IAVSRenderer* pRenderer, [in] double dX, [in] double dY, [in] double dWidth, [in] double dHeight);
+	[id(401)]          HRESULT DrawOnRenderer([in]IASCRenderer* pRenderer, [in] double dX, [in] double dY, [in] double dWidth, [in] double dHeight);
 };
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/IASCMatrix.h

-#pragma once
-
-const long c_ag_MatrixOrderAppend			= 0;
-const long c_ag_MatrixOrderPrepend			= 1;
-
-#include "IASCGraphicsBase.h"
-
-[object, uuid("5DB462B5-941B-46e7-B80F-9C9B38FF4BE6"), dual, pointer_default(unique)]
-__interface IAVSMatrix : IAVSGraphicsBase
-{
-	[id(100)] HRESULT LoadFromXml([in] BSTR bstrXML);
-
-	[id(101)] HRESULT SetElements([in]	double  m11, [in]  double  m12, [in]  double  m21, [in]  double  m22, [in]  double  dx, [in]  double  dy);
-	[id(102)] HRESULT GetElements([out] double* m11, [out] double* m12, [out] double* m21, [out] double* m22, [out] double* dx, [out] double* dy);
-
-	[id(201)] HRESULT Multiply([in] IAVSMatrix* pMatrix, [in] LONG lMatrixOrder);
-	
-	[id(211)] HRESULT Rotate([in] double dAngle, [in] LONG lMatrixOrder);
-	[id(212)] HRESULT RotateAt([in] double dAngle, [in] double dPointX, [in] double dPointY, [in] LONG lMatrixOrder);
-
-	[id(221)] HRESULT Scale([in] double dScaleX, [in] double dScaleY, [in] LONG lMatrixOrder);
-
-	[id(231)] HRESULT Translate([in] double dOffsetX, [in] double dOffsetY, [in] LONG lMatrixOrder);
-
-	[id(301)] HRESULT Transpose();
-	[id(302)] HRESULT Invert();
-	[id(303)] HRESULT Reset();
-};
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/IASCPattern.h

-#pragma once
-#include "..\stdafx.h"
-
-#include "IASCGraphicsBase.h"
-
-[object, uuid("90445113-FEDD-4e88-AC18-06564C5399E6"), dual, pointer_default(unique)]
-__interface IAVSPattern : IAVSGraphicsBase
-{
-	[id(100), propget]	HRESULT Type([out, retval] LONG* lType);
-	
-	[id(201), propget]	HRESULT Width([out, retval] LONG* lWidth);
-	[id(202), propget]  HRESULT Height([out, retval] LONG* lHeight);
-
-	[id(300)]			HRESULT GetPixel([in] LONG lX, [in] LONG lY, [out] LONG* pColor);
-};
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/IASCPen.h

-#pragma once
-#include "..\stdafx.h"
-
-#include "IASCGraphicsBase.h"
-
-[object, uuid("166BB233-E93A-4159-8BC7-A2B2B5394B23"), dual, pointer_default(unique)]
-__interface IAVSPen : IAVSGraphicsBase
-{
-	[id(100), propget]	HRESULT Xml([out, retval] BSTR* bstrXML);
-	[id(100), propput]  HRESULT Xml([in] BSTR bstrXML);
-	
-	// general ------------------------------------------------------------
-	[id(101), propget]	HRESULT Color([out, retval] LONG* lColor);
-	[id(101), propput]	HRESULT Color([in] LONG lColor);
-
-	[id(102), propget]	HRESULT Alpha([out, retval] LONG* Alpha);
-	[id(102), propput]	HRESULT Alpha([in] LONG Alpha);
-
-	[id(103), propget]	HRESULT Size([out, retval] double* dSize);
-	[id(103), propput]	HRESULT Size([in] double dSize);
-
-	// dash-style ---------------------------------------------------------
-	[id(201), propget]	HRESULT DashStyle([out, retval] LONG* lColor);
-	[id(201), propput]	HRESULT DashStyle([in] LONG lColor);
-
-	[id(202), propget]	HRESULT DashOffset([out, retval] double* dOffset);
-	[id(202), propput]	HRESULT DashOffset([in] double dOffset);
-
-	[id(203), propget]	HRESULT DashPattern([out, retval] LPSAFEARRAY* lpArray);
-	[id(203), propput]	HRESULT DashPattern([in] LPSAFEARRAY lpArray);
-
-	[id(204), propget]	HRESULT DashCap([out, retval] LONG* lDashCap);
-	[id(204), propput]	HRESULT DashCap([in] LONG lDashCap);
-
-	// pen-style ----------------------------------------------------------
-	[id(301), propget]	HRESULT LineStartCap([out, retval] LONG* lStartCap);
-	[id(301), propput]	HRESULT LineStartCap([in] LONG lStartCap);
-
-	[id(302), propget]	HRESULT LineEndCap([out, retval] LONG* lEndCap);
-	[id(302), propput]	HRESULT LineEndCap([in] LONG lEndCap);
-
-	[id(303), propget]	HRESULT LineJoin([out, retval] LONG* lJoin);
-	[id(303), propput]	HRESULT LineJoin([in] LONG lJoin);
-
-	[id(304), propget]	HRESULT LineMiterLimit([out, retval] LONG* lMiterLimit);
-	[id(304), propput]	HRESULT LineMiterLimit([in] LONG lMiterLimit);
-
-	[id(305), propget]	HRESULT Alignment([out, retval] LONG* lAlignment);
-	[id(305), propput]	HRESULT Alignment([in] LONG lAlignment);
-
-	// --------------------------------------------------------------------
-	[id(400)]			HRESULT SetLineCap([in] LONG lStartCap, [in] LONG lEndCap, [in] LONG lDashCap);
-};
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/IASCShadow.h

-#pragma once
-#include "stdafx.h"
-
-#include "IASCGraphics.h"
-
-[object, uuid("E7F899B8-B190-431c-AB24-BC3BC630084C"), dual, pointer_default(unique)]
-__interface IAVSShadow : IAVSGraphicsBase
-{
-	[id(100), propget]	HRESULT Xml([out, retval] BSTR* bstrXML);
-	[id(100), propput]	HRESULT Xml([in] BSTR bstrXML);
-	
-	// general ------------------------------------------------------------
-	[id(101), propget]	HRESULT Visible([out, retval] VARIANT_BOOL* vbVisible);
-	[id(101), propput]	HRESULT Visible([in] VARIANT_BOOL vbVisible);
-
-	[id(102), propget]	HRESULT Color([out, retval] LONG* lColor);
-	[id(102), propput]	HRESULT Color([in] LONG lColor);
-
-	[id(103), propget]	HRESULT Alpha([out, retval] LONG* Alpha);
-	[id(103), propput]	HRESULT Alpha([in] LONG Alpha);
-
-	[id(104), propget]	HRESULT DistanceX([out, retval] double* dDist);
-	[id(104), propput]	HRESULT DistanceX([in] double dDist);
-
-	[id(105), propget]	HRESULT DistanceY([out, retval] double* dDist);
-	[id(105), propput]	HRESULT DistanceY([in] double dDist);
-
-	[id(106), propget]	HRESULT BlurSize([out, retval] double* dSize);
-	[id(106), propput]	HRESULT BlurSize([in] double dSize);
-
-	[id(201)]			HRESULT DrawText([in] IAVSGraphics* pGraphics, [in] IAVSFontManager* pFont, [in] BSTR bsText, [in] double dLeft, [in] double dTop, [in] double  dRight, [in] double  dBottom);
-	[id(202)]			HRESULT DrawPath([in] IAVSGraphics* pGraphics, [in] IAVSGraphicsPath* pPath);
-};
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/IASCStringFormat.h

-#pragma once
-#include "../stdafx.h"
-
-#include "IASCGraphicsBase.h"
-
-[object, uuid("A03E5FD2-2F5D-464a-9CFF-F9B09BC5FC72"), dual, pointer_default(unique)]
-__interface IAVSStringFormat : IAVSGraphicsBase
-{
-	[id(101), propget]	HRESULT AlignmentH([out, retval] LONG* lVal);
-	[id(101), propput]	HRESULT AlignmentH([in] LONG lVal);
-
-	[id(102), propget]	HRESULT AlignmentV([out, retval] LONG* lVal);
-	[id(102), propput]	HRESULT AlignmentV([in] LONG lVal);
-};
\ No newline at end of file

ASCImageStudio3/ASCGraphics/Interfaces/IASCWinFonts.h

@@ -4,6 +4,6 @@
 #include "IASCGraphicsBase.h"
 
 [object, uuid("6C1AFC19-C954-4b74-B66C-9194D22A448A"), dual, pointer_default(unique)]
-__interface IAVSWinFonts : IAVSGraphicsBase
+__interface IASCWinFonts : IASCGraphicsBase
 {
 };

ASCImageStudio3/ASCGraphics/Interfaces/IAnimationLayer.h

-#pragma once
-
-// IAnimationLayer
-[
-	object,
-	uuid("B865893C-5ED9-49D7-BEED-2B85D1496B1C"),
-	dual,	helpstring("IAnimationLayer Interface"),
-	pointer_default(unique)
-]
-
-__interface IAnimationLayer : IDispatch
-{
-	[id(10000)] HRESULT LoadFromXml([in] BSTR Xml);
-	[id(20201)] HRESULT AddSubLayer([in]IUnknown* pUnk);
-
-	[id(20501), propget] HRESULT BeginTime([out, retval] double* dTime);
-	[id(20501), propput] HRESULT BeginTime([in] double dSize);
-	
-	[id(20502), propget] HRESULT EndTime([out, retval] double* dTime);
-	[id(20502), propput] HRESULT EndTime([in] double dTime);
-	
-	[id(20600), propget] HRESULT Duration([out, retval] double* dTime);
-
-	[id(30100)] HRESULT Draw([in]IAVSRenderer* pRenderer,[in]double dTime);
-	[id(30200)] HRESULT DrawOnMediaData([in]IUnknown* punkFrame,[in]double dTime);
-
-	[id(40100), propget] HRESULT IsStatic([out, retval] VARIANT_BOOL* bStatic);
-	[id(40200)] HRESULT ClearCache();
-
-	[id(50201)]	HRESULT SetAdditionalParam([in] BSTR ParamName, [in] VARIANT  ParamValue);
-	[id(50202)]	HRESULT GetAdditionalParam([in] BSTR ParamName, [out]VARIANT* ParamValue);
-};

ASCImageStudio3/ASCGraphics/Interfaces/ISStream.h

-#pragma once
-
-// IStream
-[
-	object,
-	uuid("578D1CDC-286B-4bca-A2C9-EBB35393270D"),
-	dual,	helpstring("IStream Interface"),
-	pointer_default(unique)
-]
-
-__interface ISStream : IDispatch
-{
-	[id(10000)] HRESULT LoadFromXml([in] BSTR Xml);
-
-	[id(12000)] HRESULT GetFrame([out]IUnknown** ppUnk);
-	[id(13000)] HRESULT Seek([in] double nVal);
-	
-	[id(50201)]	HRESULT SetAdditionalParam([in] BSTR ParamName, [in] VARIANT  ParamValue);
-	[id(50202)]	HRESULT GetAdditionalParam([in] BSTR ParamName, [out]VARIANT* ParamValue);
-};

ASCImageStudio3/ASCGraphics/Interfaces/XmlConst.h

 #pragma once
-#include "..\Interfaces\XmlUtils.h"
+#include "../../../Common/XmlUtils.h"
 
 static _bstr_t g_cpszXML_Font_Family						= L"font-family";
 static _bstr_t g_cpszXML_Font_Family_EA						= L"font-family-ea";

ASCImageStudio3/ASCGraphics/Objects/Font/FontPath.h

@@ -91,7 +91,6 @@ public:
 	void AddStrokeAdjustHint(int nFirstControl, int nSecondControl, int nFirstPoint, int nLastPoint);
 
 	CString ToXmlString();
-	BOOL    ToInterface(IAVSGraphicsPath **ppPath);
 	BOOL    ToInterface(ISimpleGraphicsPath *pPath);
 
 private: