Kulikova Svetlana 607c9b57f7 Merge remote-tracking branch 'origin/release/v7.2.0' into feature/pdfwriter ...

# Conflicts:
#	Common/3dParty/html/css/src/CCompiledStyle.cpp
#	Common/3dParty/html/css/src/ConstValues.h
#	Common/3dParty/html/css/src/xhtml/CDocumentStyle.cpp
#	HtmlFile2/htmlfile2.cpp

2022-06-09 17:19:14 +03:00

..

pro

Merge remote-tracking branch 'origin/release/v7.2.0' into feature/pdfwriter

2022-06-09 17:19:14 +03:00

AggPlusEnums.h

…

aggplustypes.h

…

ArrowHead.cpp

…

ArrowHead.h

…

BaseThread.cpp

[Network] debug

2022-01-25 00:18:32 +03:00

BaseThread.h

[Network] changed checking for 'aborted' thread's flag

2022-01-24 23:59:37 +03:00

Brush.cpp

For bug 56865

2022-05-03 19:32:44 +03:00

Brush.h

For bug 56865

2022-05-03 19:32:44 +03:00

Clip.cpp

…

Clip.h

…

Color.h

Fix bug 53947

2021-12-01 16:49:47 +03:00

config.h

…

Defines.h

…

Graphics.cpp

Fix bug with draw images with transparency

2022-05-07 17:27:26 +03:00

Graphics.h

Refactoring image interpolation

2022-01-27 22:04:18 +03:00

GraphicsPath_private.h

…

GraphicsPath.cpp

…

GraphicsPath.h

…

GraphicsRenderer.cpp

For bug 56865

2022-05-03 19:32:44 +03:00

GraphicsRenderer.h

…

Image.cpp

deferred rendering setSoftMaskFromImageMask

2022-05-13 17:52:11 +03:00

Image.h

deferred rendering setSoftMaskFromImageMask

2022-05-13 17:52:11 +03:00

ImageFilesCache.h

Add UnLock method to imagecache

2022-05-04 11:10:47 +03:00

IRenderer.h

Merge remote-tracking branch 'origin/master' into feature/pdfwriter

2022-06-08 13:20:43 +03:00

Matrix_private.h

…

Matrix.cpp

radius fix

2021-05-25 19:20:22 +03:00

Matrix.h

radius fix

2021-05-25 19:20:22 +03:00

MetafileToGraphicsRenderer.cpp

Move ft_library to cache class from manager

2022-04-04 20:04:54 +03:00

MetafileToGraphicsRenderer.h

…

MetafileToRenderer.cpp

create CSignatureFormPr

2022-06-07 18:20:36 +03:00

MetafileToRenderer.h

Merge remote-tracking branch 'origin/develop' into feature/pdfwriter

2022-05-17 12:20:43 +03:00

MetafileToRendererCheck.h

…

shading_info.h

.

2022-05-17 15:13:46 +03:00

structures.h

Fix bugs with pdf to docx convertation

2022-02-20 16:21:30 +03:00

TemporaryCS.cpp

…

TemporaryCS.h

…

Timer.cpp

…

Timer.h

…