git-svn-id:...

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

.gitattributes

@@ -394,6 +394,7 @@ OfficeCore/Test/TestConsole/bin/Release/TestConsole.exe svn_mime_002dtype=applic
 OfficeCore/Test/TestConsole/bin/Release/TestConsole.pdb svn_mime_002dtype=application%2Foctet-stream
 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/ASCMediaCore3.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCMediaFormatSettings3.dll svn_mime_002dtype=application%2Foctet-stream

ASCImageStudio3/ASCImageFile3/ASCImageFile3.rc

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

ASCImageStudio3/ASCImageFile3/ASCImageFile3.vcproj

@@ -127,7 +127,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="D:\Work\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
+				CommandLine="..\..\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"

ASCImageStudio3/ASCImageFile3/ImageFile3.h

@@ -4,7 +4,6 @@
 #include <atlsafe.h>
 #include <comdef.h>
 #include <stdio.h>
-#include <registration.h>
 #include <gdiplusex.h>
 #include <graydither.h>
 #include <math.h>
@@ -1261,12 +1260,6 @@ protected:
 		// reset output value
 		VARIANT_BOOL Success = VARIANT_FALSE;
 
-#ifndef DISABLE_REGISTRATION
-
-		// check for registered component
-		if (!CRegistratorClient::IsRegistered())
-			return Success;
-#endif
 		try 
 		{
 			MetaDataFromFile( Path );		// load metadata from file			
@@ -1411,13 +1404,6 @@ protected:
 		// reset output value
 		VARIANT_BOOL Success = VARIANT_TRUE;
 
-#ifndef DISABLE_REGISTRATION
-
-		// check for registered component
-		if (!CRegistratorClient::IsRegistered())
-			return VARIANT_FALSE;
-
-#endif
 
 		// Gdi+ Bitmap object
 		BYTE* pixels = 0;
@@ -1460,13 +1446,7 @@ protected:
 		// reset output value
 		VARIANT_BOOL Success = VARIANT_FALSE;
 
-#ifndef DISABLE_REGISTRATION
 
-		// check for registered component
-		if (!CRegistratorClient::IsRegistered())
-			return VARIANT_FALSE;
-
-#endif
 		// check for valid input parameters
 		if (Frame < 0)
 			return VARIANT_FALSE;
@@ -1540,13 +1520,6 @@ protected:
 		// update result flag
 		VARIANT_BOOL Success = VARIANT_TRUE;
 
-#ifndef DISABLE_REGISTRATION
-
-		// check for registered component
-		if (!CRegistratorClient::IsRegistered())
-			return Success;
-#endif
-
 		// variables
 		Bitmap* bitmap = 0;
 
@@ -1870,12 +1843,6 @@ protected:
 	{
 		VARIANT_BOOL Success = VARIANT_FALSE;
 
-#ifndef DISABLE_REGISTRATION
-
-		if (!CRegistratorClient::IsRegistered())
-			return VARIANT_FALSE;
-
-#endif
 
 		int nWidth = 0;
 		int nHeight = 0;
@@ -1912,12 +1879,6 @@ protected:
 
 		VARIANT_BOOL Success = VARIANT_TRUE;
 
-#ifndef DISABLE_REGISTRATION
-
-		if (!CRegistratorClient::IsRegistered())
-			return VARIANT_FALSE;
-		
-#endif
 
 		int nWidth = 0;
 		int nHeight = 0;
@@ -2256,14 +2217,6 @@ public:
 	{
 		// update result flag
 		*Success = VARIANT_FALSE;
-
-#ifndef DISABLE_REGISTRATION
-
-		// check for registered component
-		if (!CRegistratorClient::IsRegistered())
-			return S_OK;
-
-#endif
 		// save image to file
 		try 
 		{

ASCImageStudio3/ASCImageFile3/MetaData.h

 

ASCImageStudio3/ASCImageFile3/version.h

@@ -2,6 +2,6 @@
 //3
 //4
 //0
-//82
-#define INTVER 3,4,0,82
-#define STRVER "3,4,0,82\0"
+//83
+#define INTVER 3,4,0,83
+#define STRVER "3,4,0,83\0"

ASCImageStudio3/ASCImageStudio3/stdafx.h

@@ -68,14 +68,16 @@
 using namespace ATL;
 using namespace Gdiplus;
 
-#import "../../../../AVS/Redist/AVSImageFile3.dll"				named_guids rename_namespace("ImageFile")
+#import "../../Redist/ASCImageFile3.dll"				named_guids rename_namespace("ImageFile")
 //#import "../../../../AVS/Redist/AVSImageTransform3.dll"			named_guids rename_namespace("ImageTransform")
-#import "../../../../AVS/Redist/AVSImagePaint3.dll"				named_guids rename_namespace("ImagePaint")
 //#import "../../../../AVS/Redist/AVSImageCompose3.dll"			named_guids rename_namespace("ImageCompose")
-#import "../../../../AVS/Redist/AVSMediaCore3.dll"				named_guids rename_namespace("MediaCore"), exclude("tagRECT")
-#import "../../../../AVS/Redist/AVSMediaFormatSettings3.dll"	named_guids rename_namespace("MediaFormat"), exclude("tagRECT")
+#import "../../Redist/ASCMediaCore3.dll"				named_guids rename_namespace("MediaCore"), exclude("tagRECT")
+#import "../../Redist/ASCMediaFormatSettings3.dll"	named_guids rename_namespace("MediaFormat"), exclude("tagRECT")
+
+#import "../../Redist/ASCImageJpeg2000.dll"           named_guids rename_namespace("Jpeg2000")
+#import "../../Redist/ASCGraphics.dll"				named_guids rename_namespace("AVSGraphics")
+
+#import "../../../../AVS/Redist/AVSImagePaint3.dll"				named_guids rename_namespace("ImagePaint")
+#import "../../../../AVS/Redist/AVSSWFFile3.dll"				named_guids rename_namespace("SWF")
 #import "../../../../AVS/Redist/AVSUniversalVideoConverter.dll" named_guids rename_namespace("FileCache")
 #import "../../../../AVS/Redist/AVSImageRaw3.dll"	            named_guids rename_namespace("ImageRaw")
-#import "../../../../AVS/Redist/AVSImageJpeg2000.dll"           named_guids rename_namespace("Jpeg2000")
-#import "../../../../AVS/Redist/AVSGraphics.dll"				named_guids rename_namespace("AVSGraphics")
-#import "../../../../AVS/Redist/AVSSWFFile3.dll"				named_guids rename_namespace("SWF")