pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-20 05:48:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ivan.Shulga
2013-11-22 11:40:45 +00:00
committed by Alexander Trofimov
parent 393e66d5af
commit 7d45ff4e79
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ASCImageStudio3/AVSImageCompose3/ASCImageCompose.rc
View File

@ -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

2
ASCImageStudio3/AVSImageCompose3/ImageCompose.cpp
View File

@ -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 )

6
ASCImageStudio3/AVSImageCompose3/ImageCompose.h
View File

@ -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;
}

4
ASCImageStudio3/AVSImageCompose3/stdafx.h
View File

@ -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")