git-svn-id:...

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

.gitattributes

@@ -396,6 +396,7 @@ Redist/ASCFontConverter.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCGraphics.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCImageFile3.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCImageJpeg2000.dll svn_mime_002dtype=application%2Foctet-stream
+Redist/ASCImagePaint3.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCMediaCore3.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCMediaFormatSettings3.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeDocxFile2.dll svn_mime_002dtype=application%2Foctet-stream

ASCImageStudio3/ASCImagePaint3/ASCImagePaint3.rc

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

ASCImageStudio3/ASCImagePaint3/ASCImagePaint3.vcproj

@@ -125,7 +125,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="../../Redist/VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
+				CommandLine="&quot;../../Redist/VersionControl.exe&quot; &quot;$(SolutionDir)\version.h&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -210,7 +210,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy to redist"
-				CommandLine="copy $(TargetPath) ..\..\Redist\ASCImagePaint3.dll"
+				CommandLine="copy &quot;$(TargetPath)&quot; &quot;../../Redist&quot;"
 			/>
 		</Configuration>
 		<Configuration

ASCImageStudio3/ASCImagePaint3/ImagePaint3.h

 #pragma once
 			
 #include "resource.h"
-#include <registration.h>
 #include <PaintStruct.h>
 #include <ImageColors.h>
 #include <ImageCore.h>
@@ -205,8 +204,6 @@ protected:
 	}
 	void Start()
 	{
-		if (!CRegistratorClient::IsRegistered())
-			return;
 
 		// variables
 		BITMAPINFO info;

ASCImageStudio3/ASCImagePaint3/ImageTextDynamic3.h

 #pragma once
 		
 #include "resource.h"
-#include <registration.h>
 #include <PaintStruct.h>
 #include <ImageColors.h>
 #include <ImageCore.h>
@@ -209,8 +208,6 @@ public:
 		if (!pSafeArray || !*pSafeArray)
 			return S_FALSE;
 
-		if (!CRegistratorClient::IsRegistered())
-			return S_FALSE;
 
 		int nChannels = 0;
 
@@ -232,8 +229,6 @@ public:
 
 		*pInterfaceOutput = NULL;
 
-		if (!CRegistratorClient::IsRegistered())
-			return S_FALSE;
 
 		if (!m_oMediaData.Create(pInterfaceInput, FALSE) || !m_oMediaData.IsValidBGRA())
 			return S_FALSE;

ASCImageStudio3/ASCImagePaint3/ImageTextStatic3.h

 #pragma once
 	
 #include "resource.h"
-#include <registration.h>
 #include <PaintStruct.h>
 #include "TextFormat.h"
 #include "TextToPath.h"
@@ -310,8 +309,7 @@ protected:
 	}
 	void Draw(void** Image, BSTR Text, long Left, long Top, long Right, long Bottom, BOOL bArray = TRUE)
 	{	
-		if (!CRegistratorClient::IsRegistered())
-			return;
+
 
 		// create bitmap
 		ImageStudio::Core::MediaData oMediaData;
@@ -365,8 +363,7 @@ protected:
 	}
 	void DrawEllipse(void** Image, BSTR Text, long Left, long Top, long Right, long Bottom, double StartAngle, double SweepAngle, BOOL bArray = TRUE)
 	{	
-		if (!CRegistratorClient::IsRegistered())
-			return;
+
 
 		// create bitmap
 		ImageStudio::Core::MediaData oMediaData;
@@ -403,8 +400,7 @@ protected:
 	}
 	void DrawPolyline(void** Image, SAFEARRAY** Array, BSTR Text, BOOL bArray = TRUE)
 	{
-		if (!CRegistratorClient::IsRegistered())
-			return;
+
 
 		// check Polyline
 		if (!Array || !*Array)

ASCImageStudio3/ASCImagePaint3/stdafx.h

@@ -58,6 +58,6 @@ using namespace ATL;
 
 #import <msxml3.dll> rename_namespace("XML")
 
-#import "../../../../AVS/Redist/AVSMediaCore3.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")
 

ASCImageStudio3/ASCImagePaint3/version.h

@@ -2,6 +2,6 @@
 //3
 //3
 //3
-//1540
-#define INTVER 3,3,3,1540
-#define STRVER "3,3,3,1540\0"
+//1541
+#define INTVER 3,3,3,1541
+#define STRVER "3,3,3,1541\0"