git-svn-id:...

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

ASCImageStudio3/ASCGraphics/Objects/ASCImage.h

@@ -198,36 +198,7 @@ private:
 			
 			//      (Wmf/Emf)
 			// TODO:   Bitmap
-
-			ImageStudio::IImageTransforms* pTransforms = NULL;
-			CoCreateInstance(ImageStudio::CLSID_ImageTransforms, NULL, CLSCTX_INPROC, ImageStudio::IID_IImageTransforms, (void**)&pTransforms);
-
-			if (NULL == pTransforms)
-				return;
-
-			CStringW strXml = L"<ImageFile-LoadImage sourcepath='";
-			strXml += CStringW(bsFilePath);
-			strXml += L"'/>";
-
-			VARIANT_BOOL vbRes = VARIANT_FALSE;
-
-			BSTR bsXml = strXml.AllocSysString();
-			pTransforms->SetXml(bsXml, &vbRes);
-			if (VARIANT_TRUE == vbRes)
-			{
-				pTransforms->Transform(&vbRes);
-			}
-
-			if (VARIANT_TRUE == vbRes)
-			{
-				VARIANT var;
-				pTransforms->GetResult(0, &var);
-				m_pMediaData = var.punkVal;
-				var.punkVal = NULL;
-			}
-
-			RELEASEINTERFACE(pTransforms);
-
+			m_pMediaData = ImageStudio::ISLoadImage(bsFilePath);
 			m_lImageType = c_lImageTypeBitmap;
 		}
 

ASCImageStudio3/ASCGraphics/Objects/Font/WinFontStorage.h

 #pragma once
 
-#include "../../../../Common/RSA/XmlDecoder.h"
 #include "../../../../Common/ShareMemArray.h"
 
 //  

ASCImageStudio3/ASCGraphics/stdafx.h

@@ -73,8 +73,8 @@ using namespace ATL;
 namespace MediaCore
 {
 	typedef OfficeCore::IUncompressedFrame IAVSUncompressedVideoFrame;
-	const GUID CLSID_CUncompressedVideoFrame = OfficeCore::CLSID_CUncompressedFrame;
-	const GUID IID_IUncompressedVideoFrame = OfficeCore::IID_IUncompressedFrame;
+	const GUID CLSID_CAVSUncompressedVideoFrame = OfficeCore::CLSID_CUncompressedFrame;
+	const GUID IID_IAVSUncompressedVideoFrame = OfficeCore::IID_IUncompressedFrame;
 }
 
 #else