Skip to content

O
onlyoffice_core
Commit fe156513 authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov
Browse files
Options

git-svn-id:... 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52496 954022d7-b5bf-4e40-9824-e11837661b57
parent 507a289d
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 63 deletions
.gitattributes
View file @ fe156513
......@@ -397,6 +397,7 @@ 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/ASCImageStudio3.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/ASCImageStudio3/ASCImageStudio.rc
View file @ fe156513
......@@ -2,7 +2,7 @@
//
#include "resource.h"
#define COMPONENT_NAME "ImageStudio3"
#include "FileInfo.h"
#include "../../Common/FileInfo.h"
#include "version.h"
#define APSTUDIO_READONLY_SYMBOLS
......
ASCImageStudio3/ASCImageStudio3/ASCImageStudio.vcproj
View file @ fe156513
......@@ -128,7 +128,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"
......@@ -222,7 +222,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Copy to redist"
CommandLine="copy $(TargetPath) ..\..\Redist\ASCImageStudio3.dll"
CommandLine="copy $(TargetPath) &quot;..\..\Redist&quot;"
/>
</Configuration>
<Configuration
......
ASCImageStudio3/ASCImageStudio3/ImageTransforms.h
View file @ fe156513
......@@ -235,6 +235,7 @@ public:
return S_OK;
}
/*
FileCache::IAVSImageFilesCache* pFileCache = NULL;
Source.punkVal->QueryInterface( __uuidof(FileCache::IAVSImageFilesCache), (void**)&pFileCache );
if( pFileCache )
......@@ -243,6 +244,8 @@ public:
pFileCache->Release();
return S_OK;
}
*/
return S_OK;
}
// gdiplus
......
ASCImageStudio3/ASCImageStudio3/stdafx.h
View file @ fe156513
......@@ -69,6 +69,7 @@ using namespace ATL;
using namespace Gdiplus;
#define DISABLE_SWF
#define NO_RAW_CHECKER
#import "../../Redist/ASCImageFile3.dll" named_guids rename_namespace("ImageFile")
//#import "../../../../AVS/Redist/AVSImageTransform3.dll" named_guids rename_namespace("ImageTransform")
......@@ -79,11 +80,15 @@ using namespace Gdiplus;
#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 "../../Redist/ASCImagePaint3.dll" named_guids rename_namespace("ImagePaint")
#ifndef DISABLE_SWF
#import "../../Redist/ASCSWFFile3.dll" named_guids rename_namespace("SWF")
#endif
#import "../../../../AVS/Redist/AVSUniversalVideoConverter.dll" named_guids rename_namespace("FileCache")
#import "../../../../AVS/Redist/AVSImageRaw3.dll" named_guids rename_namespace("ImageRaw")
namespace FileCache
{
typedef IUnknown IAVSImageFilesCache;
}
//#import "../../../../AVS/Redist/AVSUniversalVideoConverter.dll" named_guids rename_namespace("FileCache")
//#import "../../../../AVS/Redist/AVSImageRaw3.dll" named_guids rename_namespace("ImageRaw")
ASCImageStudio3/ASCImageStudio3/version.h
View file @ fe156513
......@@ -2,6 +2,6 @@
//3
//4
//0
//79
#define INTVER 3,4,0,79
#define STRVER "3,4,0,79\0"
//80
#define INTVER 3,4,0,80
#define STRVER "3,4,0,80\0"
ASCImageStudio3/Common/ImageSerializeObjects.h
View file @ fe156513
#pragma once
#include <registration.h>
#define USE_ATL_CSTRING
#include <StringUtils.h>
......@@ -11819,6 +11818,8 @@ namespace ImageStudio
int Color;
int Alpha;
};
class DrawGraphicPath : public Core::Effect
{
protected:
......@@ -11841,44 +11842,29 @@ namespace ImageStudio
}
virtual void InternalFromXmlNode(XmlUtils::CXmlNode& oXmlNode)
{
RELEASEINTERFACE(m_pPainter);
CoCreateInstance(AVSGraphics::CLSID_CAVSVMLPainter, NULL, CLSCTX_ALL, AVSGraphics::IID_IAVSVMLPainter, (void**)&m_pPainter);
if (NULL != m_pPainter)
{
BSTR bsXml = oXmlNode.GetXml().AllocSysString();
m_pPainter->OpenXml(bsXml);
RELEASESYSSTRING(bsXml);
}
return;
}
virtual void InternalClear()
{
RELEASEINTERFACE(m_pPainter);
}
public:
DrawGraphicPath()
{
Initialize(c_nSerializePaintDrawPath, c_strSerializePaintDrawPath);
m_pPainter = NULL;
Clear();
}
BOOL Draw(IUnknown* punkSource)
{
if (NULL != m_pPainter)
{
m_pPainter->DrawOnMediaData(punkSource, 1.0);
return TRUE;
}
return FALSE;
}
private:
AVSGraphics::IAVSVMLPainter* m_pPainter;
};
class DrawAutoShape : public Core::Effect
{
......@@ -11969,6 +11955,7 @@ namespace ImageStudio
//IOOXMLShape* m_pShape;
};
class DrawTextEx : public Core::Effect
{
public:
......@@ -11988,38 +11975,23 @@ namespace ImageStudio
}
virtual void InternalFromXmlNode(XmlUtils::CXmlNode& oXmlNode)
{
RELEASEINTERFACE(m_pPainter);
CoCreateInstance(AVSGraphics::CLSID_CAVSTextPainter, NULL, CLSCTX_ALL, AVSGraphics::IID_IAVSTextPainter, (void**)&m_pPainter);
if (NULL != m_pPainter)
{
BSTR bsXml = oXmlNode.GetXml().AllocSysString();
m_pPainter->OpenXml(bsXml);
RELEASESYSSTRING(bsXml);
}
}
public:
DrawTextEx()
{
Initialize(c_nSerializePaintDrawTextEx, c_strSerializePaintDrawTextEx);
m_pPainter = NULL;
Clear();
}
BOOL Draw(IUnknown* punkSource, double dCompleteness)
{
if (NULL != m_pPainter)
{
m_pPainter->DrawOnMediaData(punkSource, dCompleteness);
return TRUE;
}
return FALSE;
}
private:
AVSGraphics::IAVSTextPainter* m_pPainter;
};
class DrawCountdown : public Core::Effect
{
......@@ -15261,10 +15233,7 @@ namespace ImageStudio
//
if( nCountNewEffects > 0 )
{
if (!CRegistratorClient::IsRegistered())
{
CRegistratorClient::Register();
}
}
// ( , , )
......
ASCImageStudio3/Common/ImageTransformsProcessor.h
View file @ fe156513
......@@ -2618,8 +2618,6 @@ namespace ImageStudio
// ImageCache
IMemoryStorage* m_pMemoryStorage;
// ImageRaw RAW
ImageRaw::IImageRaw3* m_pRawFile;
FileCache::IAVSImageFilesCache* m_pFileCache;
......@@ -6392,7 +6390,7 @@ namespace ImageStudio
{
if( m_pFileCache )
{
m_pFileCache->raw_LoadImageW( _bstr_t( pAction->FilePath ), -1, -1, &pInterfaceImage );
//m_pFileCache->raw_LoadImageW( _bstr_t( pAction->FilePath ), -1, -1, &pInterfaceImage );
if( pInterfaceImage )
//if( Core::c_nErrorNone == Core::COM::COM_LoadImage( &pInterfaceImage, pAction->FilePath ) )
......@@ -6476,7 +6474,7 @@ namespace ImageStudio
{
if( m_pFileCache )
{
m_pFileCache->raw_LoadImageW( _bstr_t( pAction->sFilePath ), -1, -1, &pSrcInterface );
//m_pFileCache->raw_LoadImageW( _bstr_t( pAction->sFilePath ), -1, -1, &pSrcInterface );
if( pSrcInterface )
{
......@@ -7929,12 +7927,8 @@ namespace ImageStudio
BOOL CheckRaw()
{
if( m_pRawFile )
return TRUE;
::CoCreateInstance( ImageRaw::CLSID_CImageRaw3, NULL, CLSCTX_INPROC, ImageRaw::IID_IImageRaw3, (void**)&m_pRawFile );
return m_pRawFile != NULL;
return FALSE;
}
BOOL SaveAsGdiplus( int nSrcId, CString path, int type, const Gdiplus::EncoderParameters* pEncoderSettings = NULL, int dpi = 0,CString sMetaData=_T("") )
......@@ -8099,7 +8093,6 @@ namespace ImageStudio
m_pMemoryStorage = NULL;
m_pRawFile = NULL;
m_pFileCache = NULL;
......@@ -8116,7 +8109,6 @@ namespace ImageStudio
RELEASEINTERFACE(m_pMemoryStorage);
RELEASEINTERFACE(m_pRawFile);
RELEASEINTERFACE(m_pFileCache);
}
......@@ -8158,11 +8150,14 @@ namespace ImageStudio
{
RELEASEINTERFACE(m_pFileCache);
/*
if( pCache )
{
pCache->AddRef();
m_pFileCache = pCache;
}
*/
}
void ResizeSourceBuffer( int size )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7