git-svn-id:...

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

ASCImageStudio3/AVSImageCompose3/ASCImageCompose.rc

@@ -3,7 +3,7 @@
 #include "resource.h"
 
 #define COMPONENT_NAME "ImageCompose3"
-#include "FileInfo.h"
+#include "../../Common/FileInfo.h"
 #include "version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS

ASCImageStudio3/AVSImageCompose3/ImageCompose.cpp

@@ -3,7 +3,7 @@
 #include "stdafx.h"
 #include "ImageCompose.h"
 #include "ImageComposeIPP.h"
-#include <ImageTransformsCoreWrappers.h>
+#include "../Common/ImageTransformsCoreWrappers.h"
 
 
 inline int AlphaBlend( int dst, int src, int alpha )

ASCImageStudio3/AVSImageCompose3/ImageCompose.h

@@ -3,7 +3,6 @@
 #include "resource.h"
 #include "smartimage.h"
 #include "patterns.h"
-#include <registration.h>
 
 [object, oleautomation, uuid("242590FA-727C-4a8e-9784-6CB5B84FF90A"), dual, pointer_default(unique)]
 __interface IImageCompose3 : IDispatch
@@ -954,8 +953,7 @@ public:
 
 	void ApplyRegister()
 	{
-		if (!CRegistratorClient::IsRegistered())
-			CRegistratorClient::Register();
+
 	}
 	double Clamp(double value)
 	{
@@ -1054,7 +1052,7 @@ public:
 	
 	STDMETHOD(Register)(BSTR User, BSTR Password)
 	{
-		CRegistratorClient::Register();
+
 		
 		return S_OK;
 	}

ASCImageStudio3/AVSImageCompose3/stdafx.h

@@ -62,5 +62,5 @@
 // include namespaces
 using namespace ATL;
 
-#import "../../Redist/OfficeCore.dll"				named_guids rename_namespace("MediaCore")
-//#import "../../../../AVS/Redist/AVSMediaFormatSettings3.dll"	named_guids rename_namespace("MediaFormat")
+#import "../../Redist/ASCMediaCore3.dll"				named_guids rename_namespace("MediaCore")
+#import "../../Redist/ASCMediaFormatSettings3.dll"	named_guids rename_namespace("MediaFormat")