git-svn-id:...

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

.gitattributes

@@ -390,6 +390,7 @@ OfficeCore/Test/TestConsole/bin/Release/TestConsole.pdb svn_mime_002dtype=applic
 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/ASCImageJBig2.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/ASCImageStudio3.dll svn_mime_002dtype=application%2Foctet-stream

ASCImageStudio3/ASCImageJBig2/ASCImageJBig2.rc

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

ASCImageStudio3/ASCImageJBig2/ASCImageJBig2_vs2005.vcproj

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

ASCImageStudio3/ASCImageJBig2/JBig2File.h

@@ -5,7 +5,7 @@
 
 #include "jbig2encoder.h"
 
-#include "xmlutils.h"
+#include "../../Common/xmlutils.h"
 
 #if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA)
 #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."

ASCImageStudio3/ASCImageJBig2/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//2
-#define INTVER 1,0,0,2
-#define STRVER "1,0,0,2\0"
+//4
+#define INTVER 1,0,0,4
+#define STRVER "1,0,0,4\0"