pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Oleg Korshul
2022-08-03 18:43:51 +03:00
parent 9977c2f4c2
commit 0469fe7b59
11 changed files with 206 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
DesktopEditor/graphics/pro/js/qt/raster/raster.pro
View File

@ -45,11 +45,16 @@ LIB_GRAPHICS_PRI_PATH = $$PWD/../../../../..
INCLUDEPATH += \
$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11 \
$$CORE_ROOT_DIR/OfficeUtils/src \
$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/include
$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/include \
$$LIB_GRAPHICS_PRI_PATH/agg-2.4/include
include($$CORE_ROOT_DIR/DesktopEditor/xml/build/qt/libxml2.pri)
SOURCES += \
$$CORE_ROOT_DIR/DesktopEditor/common/File.cpp \
$$CORE_ROOT_DIR/DesktopEditor/common/Base64.cpp
$$CORE_ROOT_DIR/DesktopEditor/common/Base64.cpp \
$$CORE_ROOT_DIR/DesktopEditor/common/StringBuilder.cpp \
$$CORE_ROOT_DIR/DesktopEditor/common/StringExt.cpp
SOURCES += \
$$CORE_ROOT_DIR/OfficeUtils/src/zlib_addon.c \
@ -312,5 +317,70 @@ SOURCES += \
SOURCES += $$CORE_ROOT_DIR/DesktopEditor/graphics/pro/lepton_lib_all.cpp
HEADERS += \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/CXmlOutput.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Common/CPathConverter.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Common/IOutputDevice.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Common/MetaFile.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Common/MetaFileClip.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Common/MetaFileObjects.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Common/MetaFileRenderer.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Common/MetaFileTypes.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Common/MetaFileUtils.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretator.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorArray.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorBase.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorRender.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorSvg.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorXml.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfParser/CEmfParser.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfParser/CEmfParserBase.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfParser/CEmfPlusParser.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfParser/CEmfxParser.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretatorSvg.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Wmf/WmfParser/CWmfParser.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Wmf/WmfParser/CWmfParserBase.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretatorBase.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretatorRender.h \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretator.h
SOURCES += \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/CXmlOutput.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Common/CPathConverter.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Common/MetaFileTypes.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Common/MetaFileUtils.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretator.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorArray.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorRender.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorSvg.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorXml.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfParser/CEmfParser.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfParser/CEmfParserBase.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfParser/CEmfPlusParser.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfParser/CEmfxParser.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretatorSvg.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Wmf/WmfParser/CWmfParser.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Wmf/WmfParser/CWmfParserBase.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretatorRender.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretator.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/MetaFile.cpp \
\
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfClip.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfObjects.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfPath.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfPlayer.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Emf/EmfFile.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Wmf/WmfClip.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Wmf/WmfObjects.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/Wmf/WmfPlayer.cpp \
\
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/StarView/SvmClip.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/StarView/SvmFile.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/StarView/SvmObjects.cpp \
$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/StarView/SvmPlayer.cpp
SOURCES += \
../../../pro_base.cpp
SOURCES += ./raster.cpp
HEADERS += ./raster.h

52
DesktopEditor/graphics/pro/pro_Fonts.cpp
View File

@ -34,10 +34,7 @@
#include "../../common/File.h"
#include "../../common/StringExt.h"
#include "../../fontengine/ApplicationFonts.h"
#ifdef __APPLE__
#include <libkern/OSAtomic.h>
#endif
#include "./pro_base.cpp"
NSFonts::IFontsMemoryStorage* g_global_fonts_memory_storage = NULL;
@ -54,53 +51,6 @@ namespace NSFonts
}
}
namespace NSBase
{
CBaseRefCounter::CBaseRefCounter()
{
m_lRef = 1;
}
CBaseRefCounter::~CBaseRefCounter()
{
}
#ifdef __APPLE__
int CBaseRefCounter::AddRef()
{
OSAtomicIncrement32(&m_lRef);
return m_lRef;
}
int CBaseRefCounter::Release()
{
int32_t ret = OSAtomicDecrement32(&m_lRef);
if (0 == m_lRef)
delete this;
return ret;
}
#else
int CBaseRefCounter::AddRef()
{
++m_lRef;
return m_lRef;
}
int CBaseRefCounter::Release()
{
int ret = --m_lRef;
if (0 == m_lRef)
delete this;
return ret;
}
#endif
void Release(CBaseRefCounter* base)
{
delete base;
}
}
namespace NSFonts
{
IFontPath::IFontPath() : NSBase::CBaseRefCounter() {}

80
DesktopEditor/graphics/pro/pro_base.cpp Normal file
View File

@ -0,0 +1,80 @@
/*
* (c) Copyright Ascensio System SIA 2010-2019
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
#include "Fonts.h"
namespace NSBase
{
CBaseRefCounter::CBaseRefCounter()
{
m_lRef = 1;
}
CBaseRefCounter::~CBaseRefCounter()
{
}
#ifdef __APPLE__
int CBaseRefCounter::AddRef()
{
OSAtomicIncrement32(&m_lRef);
return m_lRef;
}
int CBaseRefCounter::Release()
{
int32_t ret = OSAtomicDecrement32(&m_lRef);
if (0 == m_lRef)
delete this;
return ret;
}
#else
int CBaseRefCounter::AddRef()
{
++m_lRef;
return m_lRef;
}
int CBaseRefCounter::Release()
{
int ret = --m_lRef;
if (0 == m_lRef)
delete this;
return ret;
}
#endif
void Release(CBaseRefCounter* base)
{
delete base;
}
}