Fix indents and move operator for CImage

Common/3dParty/harfbuzz/test/main.cpp

@@ -1,818 +0,0 @@
-// https://android.googlesource.com/platform/external/harfbuzz/+/ics-mr0/contrib/tables/script-properties.h
-
-/*
- * https://unicode.org/reports/tr29/
-
-As far as a user is concerned, the underlying representation of text is not important,
-but it is important that an editing interface present a uniform implementation of what
-the user thinks of as characters. Grapheme clusters can be treated as units, by default,
-for processes such as the formatting of drop caps, as well as the implementation of text
-selection, arrow key movement or backspacing through text, and so forth. For example,
-when a grapheme cluster is represented internally by a character sequence consisting of
-base character + accents, then using the right arrow key would skip from the start of the
-base character to the end of the last accent.
-
-This document defines a default specification for grapheme clusters. It may be customized
- for particular languages, operations, or other situations. For example, arrow key movement
-could be tailored by language, or could use knowledge specific to particular fonts to move
-in a more granular manner, in circumstances where it would be useful to edit individual
-components. This could apply, for example, to the complex editorial requirements for the
-Northern Thai script Tai Tham (Lanna). Similarly, editing a grapheme cluster element by
-element may be preferable in some circumstances. For example, on a given system the backspace
-key might delete by code point, while the delete key may delete an entire cluster.
- * */
-
-#include "../../../core/DesktopEditor/common/File.h"
-#include "../../../core/DesktopEditor/raster/BgraFrame.h"
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_GLYPH_H
-#include FT_OUTLINE_H
-
-#include <hb-ft.h>
-#include <hb-ot.h>
-#include <hb.h>
-
-class CDrawer
-{
-public:
-	CBgraFrame m_oFrame;
-	BYTE *pixels;
-	int width;
-	int height;
-	int pitch;
-	BYTE Rshift;
-	BYTE Gshift;
-	BYTE Bshift;
-	BYTE Ashift;
-
-public:
-	CDrawer(int w, int h)
-	{
-		width = w;
-		height = h;
-		pitch = 4 * width;
-		m_oFrame.put_Width(width);
-		m_oFrame.put_Height(height);
-		m_oFrame.put_Stride(pitch);
-
-		int size = 4 * width * height;
-		BYTE *pPixels = new BYTE[size];
-		for (int i = 0; i < size; i += 4)
-		{
-			pPixels[i] = 0xFF;
-			pPixels[i + 1] = 0xFF;
-			pPixels[i + 2] = 0xFF;
-			pPixels[i + 3] = 0xFF;
-		}
-		pixels = pPixels;
-		m_oFrame.put_Data(pPixels);
-
-		Bshift = 24;
-		Gshift = 16;
-		Rshift = 8;
-		Ashift = 0;
-	}
-	void Save()
-	{
-		m_oFrame.SaveFile(NSFile::GetProcessDirectory() + L"/output.png", 4);
-	}
-};
-
-#define NUM_EXAMPLES 3
-
-/* fonts */
-const char *fonts_paths[NUM_EXAMPLES] = {
-	"C:/Windows/Fonts/calibri.ttf",
-	//"C:/Windows/Fonts/arial.ttf",
-	"C:/Users/korol/AppData/Local/Microsoft/Windows/Fonts/ArabicTest.ttf",
-	"C:/Windows/Fonts/simsun.ttc"
-};
-
-#define NUM_GLYPH_TYPES 5
-const char *num_glyph_types[NUM_GLYPH_TYPES] = {"UNCLASSIFIED", "BASE_GLYPH", "LIGATURE", "MARK", "COMPONENT"};
-
-/* tranlations courtesy of google */
-const char *texts[NUM_EXAMPLES] = {
-	"fi",
-	"لا لآ لأ لا",
-	"懶惰的姜貓"
-};
-
-const hb_direction_t text_directions[NUM_EXAMPLES] = {
-	HB_DIRECTION_LTR,
-	HB_DIRECTION_RTL,
-	HB_DIRECTION_TTB,
-};
-
-const int text_skip[NUM_EXAMPLES] = {
-	0,
-	0,
-	1,
-};
-
-/* XXX: These are not correct, though it doesn't seem to break anything
- *      regardless of their value. */
-const char *languages[NUM_EXAMPLES] = {
-	"en",
-	"ar",
-	"ch",
-};
-
-const hb_script_t scripts[NUM_EXAMPLES] = {
-	HB_SCRIPT_LATIN,
-	HB_SCRIPT_ARABIC,
-	HB_SCRIPT_HAN,
-};
-
-enum
-{
-	ENGLISH = 0,
-	ARABIC,
-	CHINESE
-};
-
-typedef struct _spanner_baton_t
-{
-	/* rendering part - assumes 32bpp surface */
-	uint32_t *pixels;					// set to the glyph's origin.
-	uint32_t *first_pixel, *last_pixel; // bounds check
-	uint32_t pitch;
-	uint32_t rshift;
-	uint32_t gshift;
-	uint32_t bshift;
-	uint32_t ashift;
-
-	/* sizing part */
-	int min_span_x;
-	int max_span_x;
-	int min_y;
-	int max_y;
-} spanner_baton_t;
-
-/* This spanner is write only, suitable for write-only mapped buffers,
-   but can cause dark streaks where glyphs overlap, like in arabic scripts.
-
-   Note how spanners don't clip against surface width - resize the window
-   and see what it leads to. */
-void spanner_wo(int y, int count, const FT_Span *spans, void *user)
-{
-	spanner_baton_t *baton = (spanner_baton_t *)user;
-	uint32_t *scanline = baton->pixels - y * ((int)baton->pitch / 4);
-	if (scanline < baton->first_pixel)
-		return;
-	for (int i = 0; i < count; i++)
-	{
-		uint32_t color = ((spans[i].coverage / 2) << baton->rshift) | ((spans[i].coverage / 2) << baton->gshift) | ((spans[i].coverage / 2) << baton->bshift);
-
-		uint32_t *start = scanline + spans[i].x;
-		if (start + spans[i].len > baton->last_pixel)
-			return;
-
-		for (int x = 0; x < spans[i].len; x++)
-			*start++ = color;
-	}
-}
-
-/* This spanner does read/modify/write, trading performance for accuracy.
-   The color here is simply half coverage value in all channels,
-   effectively mid-gray.
-   Suitable for when artifacts mostly do come up and annoy.
-   This might be optimized if one does rmw only for some values of x.
-   But since the whole buffer has to be rw anyway, and the previous value
-   is probably still in the cache, there's little point to. */
-void spanner_rw(int y, int count, const FT_Span *spans, void *user)
-{
-	spanner_baton_t *baton = (spanner_baton_t *)user;
-	uint32_t *scanline = baton->pixels - y * ((int)baton->pitch / 4);
-	if (scanline < baton->first_pixel)
-		return;
-
-	for (int i = 0; i < count; i++)
-	{
-		uint32_t color = ((spans[i].coverage / 2) << baton->rshift) | ((spans[i].coverage / 2) << baton->gshift) | ((spans[i].coverage / 2) << baton->bshift);
-		uint32_t *start = scanline + spans[i].x;
-		if (start + spans[i].len > baton->last_pixel)
-			return;
-
-		for (int x = 0; x < spans[i].len; x++)
-			*start++ |= color;
-	}
-}
-
-/*  This spanner is for obtaining exact bounding box for the string.
-	Unfortunately this can't be done without rendering it (or pretending to).
-	After this runs, we get min and max values of coordinates used.
-*/
-void spanner_sizer(int y, int count, const FT_Span *spans, void *user)
-{
-	spanner_baton_t *baton = (spanner_baton_t *)user;
-
-	if (y < baton->min_y)
-		baton->min_y = y;
-	if (y > baton->max_y)
-		baton->max_y = y;
-	for (int i = 0; i < count; i++)
-	{
-		if (spans[i].x + spans[i].len > baton->max_span_x)
-			baton->max_span_x = spans[i].x + spans[i].len;
-		if (spans[i].x < baton->min_span_x)
-			baton->min_span_x = spans[i].x;
-	}
-}
-
-FT_SpanFunc spanner = spanner_wo;
-
-void ftfdump(FT_Face ftf)
-{
-	for (int i = 0; i < ftf->num_charmaps; i++)
-	{
-		printf(
-			"%d: %s %s %c%c%c%c plat=%hu id=%hu\n", i, ftf->family_name, ftf->style_name, ftf->charmaps[i]->encoding >> 24, (ftf->charmaps[i]->encoding >> 16) & 0xff,
-			(ftf->charmaps[i]->encoding >> 8) & 0xff, (ftf->charmaps[i]->encoding) & 0xff, ftf->charmaps[i]->platform_id, ftf->charmaps[i]->encoding_id);
-	}
-}
-
-/*  See http://www.microsoft.com/typography/otspec/name.htm
-	for a list of some possible platform-encoding pairs.
-	We're interested in 0-3 aka 3-1 - UCS-2.
-	Otherwise, fail. If a font has some unicode map, but lacks
-	UCS-2 - it is a broken or irrelevant font. What exactly
-	Freetype will select on face load (it promises most wide
-	unicode, and if that will be slower that UCS-2 - left as
-	an excercise to check. */
-int force_ucs2_charmap(FT_Face ftf)
-{
-	for (int i = 0; i < ftf->num_charmaps; i++)
-		if (((ftf->charmaps[i]->platform_id == 0) && (ftf->charmaps[i]->encoding_id == 3)) || ((ftf->charmaps[i]->platform_id == 3) && (ftf->charmaps[i]->encoding_id == 1)))
-			return FT_Set_Charmap(ftf, ftf->charmaps[i]);
-	return -1;
-}
-
-void hline(CDrawer *s, int min_x, int max_x, int y, uint32_t color)
-{
-	if (y < 0)
-		y = 0;
-	uint32_t *pix = (uint32_t *)s->pixels + (y * s->pitch) / 4 + min_x;
-	uint32_t *end = (uint32_t *)s->pixels + (y * s->pitch) / 4 + max_x;
-
-	while (pix - 1 != end)
-		*pix++ = color;
-}
-
-void vline(CDrawer *s, int min_y, int max_y, int x, uint32_t color)
-{
-	if (min_y < 0)
-		min_y = 0;
-
-	uint32_t *pix = (uint32_t *)s->pixels + (min_y * s->pitch) / 4 + x;
-	uint32_t *end = (uint32_t *)s->pixels + (max_y * s->pitch) / 4 + x;
-
-	while (pix - s->pitch / 4 != end)
-	{
-		*pix = color;
-		pix += s->pitch / 4;
-	}
-}
-
-void assert(const bool &valid)
-{
-	// TODO:
-}
-
-#define MAIN_CC_NO_PRIVATE_API
-#ifndef MAIN_CC_NO_PRIVATE_API
-/* Only this part of this mini app uses private API */
-#include "hb-open-file.hh"
-#include "hb-ot-layout-gdef-table.hh"
-#include "hb-ot-layout-gsubgpos.hh"
-#include "hb-static.cc"
-
-using namespace OT;
-
-static void print_layout_info_using_private_api(hb_blob_t *blob)
-{
-	const char *font_data = hb_blob_get_data(blob, nullptr);
-	hb_blob_t *font_blob = hb_sanitize_context_t().sanitize_blob<OpenTypeFontFile>(blob);
-	const OpenTypeFontFile *sanitized = font_blob->as<OpenTypeFontFile>();
-	if (!font_blob->data)
-	{
-		printf("Sanitization of the file wasn't successful. Exit");
-		exit(1);
-	}
-	const OpenTypeFontFile &ot = *sanitized;
-
-	switch (ot.get_tag())
-	{
-	case OpenTypeFontFile::TrueTypeTag:
-		printf("OpenType font with TrueType outlines\n");
-		break;
-	case OpenTypeFontFile::CFFTag:
-		printf("OpenType font with CFF (Type1) outlines\n");
-		break;
-	case OpenTypeFontFile::TTCTag:
-		printf("TrueType Collection of OpenType fonts\n");
-		break;
-	case OpenTypeFontFile::TrueTag:
-		printf("Obsolete Apple TrueType font\n");
-		break;
-	case OpenTypeFontFile::Typ1Tag:
-		printf("Obsolete Apple Type1 font in SFNT container\n");
-		break;
-	case OpenTypeFontFile::DFontTag:
-		printf("DFont Mac Resource Fork\n");
-		break;
-	default:
-		printf("Unknown font format\n");
-		break;
-	}
-
-	unsigned num_faces = hb_face_count(blob);
-	printf("%d font(s) found in file\n", num_faces);
-	for (unsigned n_font = 0; n_font < num_faces; ++n_font)
-	{
-		const OpenTypeFontFace &font = ot.get_face(n_font);
-		printf("Font %d of %d:\n", n_font, num_faces);
-
-		unsigned num_tables = font.get_table_count();
-		printf("  %d table(s) found in font\n", num_tables);
-		for (unsigned n_table = 0; n_table < num_tables; ++n_table)
-		{
-			const OpenTypeTable &table = font.get_table(n_table);
-			printf("  Table %2d of %2d: %.4s (0x%08x+0x%08x)\n", n_table, num_tables, (const char *)table.tag, (unsigned)table.offset, (unsigned)table.length);
-
-			switch (table.tag)
-			{
-
-			case HB_OT_TAG_GSUB:
-			case HB_OT_TAG_GPOS:
-			{
-
-				const GSUBGPOS &g = *reinterpret_cast<const GSUBGPOS *>(font_data + table.offset);
-
-				unsigned num_scripts = g.get_script_count();
-				printf("    %d script(s) found in table\n", num_scripts);
-				for (unsigned n_script = 0; n_script < num_scripts; ++n_script)
-				{
-					const Script &script = g.get_script(n_script);
-					printf("    Script %2d of %2d: %.4s\n", n_script, num_scripts, (const char *)g.get_script_tag(n_script));
-
-					if (!script.has_default_lang_sys())
-						printf("      No default language system\n");
-					int num_langsys = script.get_lang_sys_count();
-					printf("      %d language system(s) found in script\n", num_langsys);
-					for (int n_langsys = script.has_default_lang_sys() ? -1 : 0; n_langsys < num_langsys; ++n_langsys)
-					{
-						const LangSys &langsys = n_langsys == -1 ? script.get_default_lang_sys() : script.get_lang_sys(n_langsys);
-						if (n_langsys == -1)
-							printf("      Default Language System\n");
-						else
-							printf("      Language System %2d of %2d: %.4s\n", n_langsys, num_langsys, (const char *)script.get_lang_sys_tag(n_langsys));
-						if (!langsys.has_required_feature())
-							printf("        No required feature\n");
-						else
-							printf("        Required feature index: %d\n", langsys.get_required_feature_index());
-
-						unsigned num_features = langsys.get_feature_count();
-						printf("        %d feature(s) found in language system\n", num_features);
-						for (unsigned n_feature = 0; n_feature < num_features; ++n_feature)
-						{
-							printf("        Feature index %2d of %2d: %d\n", n_feature, num_features, langsys.get_feature_index(n_feature));
-						}
-					}
-				}
-
-				unsigned num_features = g.get_feature_count();
-				printf("    %d feature(s) found in table\n", num_features);
-				for (unsigned n_feature = 0; n_feature < num_features; ++n_feature)
-				{
-					const Feature &feature = g.get_feature(n_feature);
-					unsigned num_lookups = feature.get_lookup_count();
-					printf("    Feature %2d of %2d: %c%c%c%c\n", n_feature, num_features, HB_UNTAG(g.get_feature_tag(n_feature)));
-
-					printf("        %d lookup(s) found in feature\n", num_lookups);
-					for (unsigned n_lookup = 0; n_lookup < num_lookups; ++n_lookup)
-					{
-						printf("        Lookup index %2d of %2d: %d\n", n_lookup, num_lookups, feature.get_lookup_index(n_lookup));
-					}
-				}
-
-				unsigned num_lookups = g.get_lookup_count();
-				printf("    %d lookup(s) found in table\n", num_lookups);
-				for (unsigned n_lookup = 0; n_lookup < num_lookups; ++n_lookup)
-				{
-					const Lookup &lookup = g.get_lookup(n_lookup);
-					printf("    Lookup %2d of %2d: type %d, props 0x%04X\n", n_lookup, num_lookups, lookup.get_type(), lookup.get_props());
-				}
-			}
-			break;
-
-			case GDEF::tableTag:
-			{
-
-				const GDEF &gdef = *reinterpret_cast<const GDEF *>(font_data + table.offset);
-
-				printf("    Has %sglyph classes\n", gdef.has_glyph_classes() ? "" : "no ");
-				printf("    Has %smark attachment types\n", gdef.has_mark_attachment_types() ? "" : "no ");
-				printf("    Has %sattach points\n", gdef.has_attach_points() ? "" : "no ");
-				printf("    Has %slig carets\n", gdef.has_lig_carets() ? "" : "no ");
-				printf("    Has %smark sets\n", gdef.has_mark_sets() ? "" : "no ");
-
-				hb_position_t caret_array[16];
-				unsigned int caret_count = 16;
-
-				unsigned int num_carets = gdef.get_lig_carets(nullptr, HB_DIRECTION_LTR, 302, 0, &caret_count, caret_array);
-				int y = 0;
-				++y;
-
-				break;
-			}
-			}
-		}
-	}
-}
-/* end of private API use */
-#endif
-
-struct hb_feature_test {
-	hb_tag_t tag;
-	uint32_t value;
-};
-
-int main(int argc, char *argv[])
-{
-	// hb_blob_t* blobFileTest = hb_blob_create_from_file("C:/Windows/Fonts/calibri.ttf");
-	// print_layout_info_using_private_api(blobFileTest);
-
-	int ptSize = 40 * 64;
-	int device_hdpi = 72;
-	int device_vdpi = 72;
-
-	/* Init freetype */
-	FT_Library ft_library;
-	assert(!FT_Init_FreeType(&ft_library));
-
-	/* Load our fonts */
-	FT_Face ft_face[NUM_EXAMPLES];
-	assert(!FT_New_Face(ft_library, fonts_paths[0], 0, &ft_face[ENGLISH]));
-	assert(!FT_Set_Char_Size(ft_face[ENGLISH], 0, ptSize, device_hdpi, device_vdpi));
-	ftfdump(ft_face[ENGLISH]); // wonderful world of encodings ...
-	// force_ucs2_charmap(ft_face[ENGLISH]); // which we ignore.
-
-	assert(!FT_New_Face(ft_library, fonts_paths[1], 0, &ft_face[ARABIC]));
-	assert(!FT_Set_Char_Size(ft_face[ARABIC], 0, ptSize, device_hdpi, device_vdpi));
-	ftfdump(ft_face[ARABIC]);
-	// force_ucs2_charmap(ft_face[ARABIC]);
-
-	assert(!FT_New_Face(ft_library, fonts_paths[2], 0, &ft_face[CHINESE]));
-	assert(!FT_Set_Char_Size(ft_face[CHINESE], 0, ptSize, device_hdpi, device_vdpi));
-	ftfdump(ft_face[CHINESE]);
-	// force_ucs2_charmap(ft_face[CHINESE]);
-
-	/* Get our harfbuzz font structs */
-	hb_font_t *hb_ft_font[NUM_EXAMPLES];
-	hb_ft_font[ENGLISH] = hb_ft_font_create(ft_face[ENGLISH], NULL);
-
-	// hb_blob_t* blobFile = hb_blob_create_from_file(sFont1.c_str());
-	// hb_face_t* faceFile = hb_face_create(blobFile, 0);
-	// hb_ft_font[ENGLISH] = hb_font_create(faceFile);
-
-	hb_ft_font[ARABIC] = hb_ft_font_create(ft_face[ARABIC], NULL);
-	hb_ft_font[CHINESE] = hb_ft_font_create(ft_face[CHINESE], NULL);
-
-	hb_ft_font_set_funcs(hb_ft_font[ENGLISH]);
-	hb_ft_font_set_funcs(hb_ft_font[ARABIC]);
-	hb_ft_font_set_funcs(hb_ft_font[CHINESE]);
-
-	/** Setup our SDL window **/
-	int width = 800;
-	int height = 600;
-	int bpp = 32;
-
-	CDrawer oDrawer(width, height);
-
-	/* Create a buffer for harfbuzz to use */
-	hb_buffer_t *buf = hb_buffer_create();
-	for (int i = 0; i < NUM_EXAMPLES; ++i)
-	{
-		if (text_skip[i])
-			continue;
-
-		hb_buffer_set_direction(buf, text_directions[i]); /* or LTR */
-		hb_buffer_set_script(buf, scripts[i]);			  /* see hb-unicode.h */
-		hb_buffer_set_language(buf, hb_language_from_string(languages[i], strlen(languages[i])));
-		// hb_buffer_set_cluster_level (buf, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES);
-		// hb_buffer_set_cluster_level (buf, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS);
-		hb_buffer_set_cluster_level(buf, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES);
-
-		hb_feature_test features[] {
-			{HB_TAG('r','l','i','g'), 1},
-			{HB_TAG('l','i','g','a'), 0},
-			{HB_TAG('c','l','i','g'), 1},
-			{HB_TAG('h','l','i','g'), 1},
-			{HB_TAG('d','l','i','g'), 1},
-			{HB_TAG('k','e','r','n'), 2},
-			{0, 0}
-		};
-
-		int userfeatures_count = 0;
-		hb_feature_t userfeatures[100];
-
-		hb_feature_test* current_feature = features;
-		while (current_feature->tag != 0)
-		{
-			if (current_feature->value != 2)
-			{
-				userfeatures[userfeatures_count].tag   = current_feature->tag;
-				userfeatures[userfeatures_count].value = current_feature->value;
-				userfeatures[userfeatures_count].start = HB_FEATURE_GLOBAL_START;
-				userfeatures[userfeatures_count].end   = HB_FEATURE_GLOBAL_END;
-				userfeatures_count++;
-			}
-			current_feature++;
-		}
-
-		/* Layout the text */
-		hb_buffer_add_utf8(buf, texts[i], strlen(texts[i]), 0, strlen(texts[i]));
-
-		// detect script by codes
-		hb_buffer_guess_segment_properties(buf);
-
-		// const char*const pHbShapers[] = { "graphite2", "coretext_aat", "ot", "fallback", nullptr };
-		// bool ok = hb_shape_full(hb_ft_font[i], buf, userfeatures, userfeatures_count, pHbShapers);
-
-		hb_shape(hb_ft_font[i], buf, (userfeatures_count != 0) ? userfeatures : NULL, userfeatures_count);
-
-		unsigned int glyph_count;
-		hb_glyph_info_t *glyph_info = hb_buffer_get_glyph_infos(buf, &glyph_count);
-		hb_glyph_position_t *glyph_pos = hb_buffer_get_glyph_positions(buf, &glyph_count);
-
-#if 1
-		hb_position_t caret_array[16];
-		unsigned int caret_count = 16;
-
-		unsigned int num_carets = hb_ot_layout_get_ligature_carets(hb_ft_font[i], text_directions[i], glyph_info[0].codepoint, -1, &caret_count, caret_array);
-#endif
-
-		/* set up rendering via spanners */
-		spanner_baton_t stuffbaton;
-
-		FT_Raster_Params ftr_params;
-		ftr_params.target = 0;
-		ftr_params.flags = FT_RASTER_FLAG_DIRECT | FT_RASTER_FLAG_AA;
-		ftr_params.user = &stuffbaton;
-		ftr_params.black_spans = 0;
-		ftr_params.bit_set = 0;
-		ftr_params.bit_test = 0;
-
-		/* Calculate string bounding box in pixels */
-		ftr_params.gray_spans = spanner_sizer;
-
-		/* See http://www.freetype.org/freetype2/docs/glyphs/glyphs-3.html */
-
-		int max_x = INT_MIN; // largest coordinate a pixel has been set at, or the pen was advanced to.
-		int min_x = INT_MAX; // smallest coordinate a pixel has been set at, or the pen was advanced to.
-		int max_y = INT_MIN; // this is max topside bearing along the string.
-		int min_y = INT_MAX; // this is max value of (height - topbearing) along the string.
-		/*  Naturally, the above comments swap their meaning between horizontal and vertical scripts,
-			since the pen changes the axis it is advanced along.
-			However, their differences still make up the bounding box for the string.
-			Also note that all this is in FT coordinate system where y axis points upwards.
-		 */
-
-		int sizer_x = 0;
-		int sizer_y = 0; /* in FT coordinate system. */
-
-		printf("----------------------------------------------------\n");
-		for (unsigned j = 0; j < glyph_count; ++j)
-		{
-			hb_ot_layout_glyph_class_t glyph_type = hb_ot_layout_get_glyph_class(hb_font_get_face(hb_ft_font[i]), glyph_info[j].codepoint);
-			hb_glyph_flags_t glyph_type_flags = hb_glyph_info_get_glyph_flags(&glyph_info[j]);
-			printf(
-				"glyph(%s, flags: %d): gid:%d, cluster:%d, [%d, %d, %d, %d, %d]\n", num_glyph_types[glyph_type], glyph_type_flags, (int)glyph_info[j].codepoint, (int)glyph_info[j].cluster,
-				glyph_pos[j].x_advance, glyph_pos[j].y_advance, glyph_pos[j].x_offset, glyph_pos[j].y_offset, glyph_pos[j].var);
-		}
-
-		FT_Error fterr;
-		for (unsigned j = 0; j < glyph_count; ++j)
-		{
-			if ((fterr = FT_Load_Glyph(ft_face[i], glyph_info[j].codepoint, 0)))
-			{
-				printf("load %08x failed fterr=%d.\n", glyph_info[j].codepoint, fterr);
-			}
-			else
-			{
-				if (ft_face[i]->glyph->format != FT_GLYPH_FORMAT_OUTLINE)
-				{
-					printf("glyph->format = %4s\n", (char *)&ft_face[i]->glyph->format);
-				}
-				else
-				{
-					int gx = sizer_x + (glyph_pos[j].x_offset / 64);
-					int gy = sizer_y + (glyph_pos[j].y_offset / 64); // note how the sign differs from the rendering pass
-
-					stuffbaton.min_span_x = INT_MAX;
-					stuffbaton.max_span_x = INT_MIN;
-					stuffbaton.min_y = INT_MAX;
-					stuffbaton.max_y = INT_MIN;
-
-					if ((fterr = FT_Outline_Render(ft_library, &ft_face[i]->glyph->outline, &ftr_params)))
-						printf("FT_Outline_Render() failed err=%d\n", fterr);
-
-					if (stuffbaton.min_span_x != INT_MAX)
-					{
-						/* Update values if the spanner was actually called. */
-						if (min_x > stuffbaton.min_span_x + gx)
-							min_x = stuffbaton.min_span_x + gx;
-
-						if (max_x < stuffbaton.max_span_x + gx)
-							max_x = stuffbaton.max_span_x + gx;
-
-						if (min_y > stuffbaton.min_y + gy)
-							min_y = stuffbaton.min_y + gy;
-
-						if (max_y < stuffbaton.max_y + gy)
-							max_y = stuffbaton.max_y + gy;
-					}
-					else
-					{
-						/* The spanner wasn't called at all - an empty glyph, like space. */
-						if (min_x > gx)
-							min_x = gx;
-						if (max_x < gx)
-							max_x = gx;
-						if (min_y > gy)
-							min_y = gy;
-						if (max_y < gy)
-							max_y = gy;
-					}
-				}
-			}
-
-			sizer_x += glyph_pos[j].x_advance / 64;
-			sizer_y += glyph_pos[j].y_advance / 64; // note how the sign differs from the rendering pass
-		}
-		/* Still have to take into account last glyph's advance. Or not? */
-		if (min_x > sizer_x)
-			min_x = sizer_x;
-		if (max_x < sizer_x)
-			max_x = sizer_x;
-		if (min_y > sizer_y)
-			min_y = sizer_y;
-		if (max_y < sizer_y)
-			max_y = sizer_y;
-
-		/* The bounding box */
-		int bbox_w = max_x - min_x;
-		int bbox_h = max_y - min_y;
-
-		/* Two offsets below position the bounding box with respect to the 'origin',
-			which is sort of origin of string's first glyph.
-
-			baseline_offset - offset perpendecular to the baseline to the topmost (horizontal),
-							  or leftmost (vertical) pixel drawn.
-
-			baseline_shift  - offset along the baseline, from the first drawn glyph's origin
-							  to the leftmost (horizontal), or topmost (vertical) pixel drawn.
-
-			Thus those offsets allow positioning the bounding box to fit the rendered string,
-			as they are in fact offsets from the point given to the renderer, to the top left
-			corner of the bounding box.
-
-			NB: baseline is defined as y==0 for horizontal and x==0 for vertical scripts.
-			(0,0) here is where the first glyph's origin ended up after shaping, not taking
-			into account glyph_pos[0].xy_offset (yeah, my head hurts too).
-		*/
-
-		int baseline_offset;
-		int baseline_shift;
-
-		if (HB_DIRECTION_IS_HORIZONTAL(hb_buffer_get_direction(buf)))
-		{
-			baseline_offset = max_y;
-			baseline_shift = min_x;
-		}
-		if (HB_DIRECTION_IS_VERTICAL(hb_buffer_get_direction(buf)))
-		{
-			baseline_offset = min_x;
-			baseline_shift = max_y;
-		}
-
-		/* The pen/baseline start coordinates in window coordinate system
-			- with those text placement in the window is controlled.
-			- note that for RTL scripts pen still goes LTR */
-		int x = 0, y = 50 + i * 75;
-		if (i == ENGLISH)
-		{
-			x = 20;
-		} /* left justify */
-		if (i == ARABIC)
-		{
-			x = width - bbox_w - 20;
-		} /* right justify */
-		if (i == CHINESE)
-		{
-			x = width / 2 - bbox_w / 2;
-		} /* center, and for TTB script h_advance is half-width. */
-
-		/* Draw baseline and the bounding box */
-		/* The below is complicated since we simultaneously
-		   convert to the window coordinate system. */
-		int left, right, top, bottom;
-
-		if (HB_DIRECTION_IS_HORIZONTAL(hb_buffer_get_direction(buf)))
-		{
-			/* bounding box in window coordinates without offsets */
-			left = x;
-			right = x + bbox_w;
-			top = y - bbox_h;
-			bottom = y;
-
-			/* apply offsets */
-			left += baseline_shift;
-			right += baseline_shift;
-			top -= baseline_offset - bbox_h;
-			bottom -= baseline_offset - bbox_h;
-
-			/* draw the baseline */
-			hline(&oDrawer, x, x + bbox_w, y, 0x0000ff00);
-		}
-
-		if (HB_DIRECTION_IS_VERTICAL(hb_buffer_get_direction(buf)))
-		{
-			left = x;
-			right = x + bbox_w;
-			top = y;
-			bottom = y + bbox_h;
-
-			left += baseline_offset;
-			right += baseline_offset;
-			top -= baseline_shift;
-			bottom -= baseline_shift;
-
-			vline(&oDrawer, y, y + bbox_h, x, 0x0000ff00);
-		}
-
-		/* +1/-1 are for the bbox borders be the next pixel outside the bbox itself */
-		hline(&oDrawer, left - 1, right + 1, top - 1, 0xffff0000);
-		hline(&oDrawer, left - 1, right + 1, bottom + 1, 0xffff0000);
-		vline(&oDrawer, top - 1, bottom + 1, left - 1, 0xffff0000);
-		vline(&oDrawer, top - 1, bottom + 1, right + 1, 0xffff0000);
-
-		/* set rendering spanner */
-		ftr_params.gray_spans = spanner;
-
-		/* initialize rendering part of the baton */
-		stuffbaton.pixels = NULL;
-		stuffbaton.first_pixel = (uint32_t *)oDrawer.pixels;
-		stuffbaton.last_pixel = (uint32_t *)(((uint8_t *)oDrawer.pixels) + oDrawer.pitch * oDrawer.height);
-		stuffbaton.pitch = oDrawer.pitch;
-		stuffbaton.rshift = oDrawer.Rshift;
-		stuffbaton.gshift = oDrawer.Gshift;
-		stuffbaton.bshift = oDrawer.Bshift;
-
-		/* render */
-		for (unsigned j = 0; j < glyph_count; ++j)
-		{
-			if ((fterr = FT_Load_Glyph(ft_face[i], glyph_info[j].codepoint, 0)))
-			{
-				printf("load %08x failed fterr=%d.\n", glyph_info[j].codepoint, fterr);
-			}
-			else
-			{
-				if (ft_face[i]->glyph->format != FT_GLYPH_FORMAT_OUTLINE)
-				{
-					printf("glyph->format = %4s\n", (char *)&ft_face[i]->glyph->format);
-				}
-				else
-				{
-					int gx = x + (glyph_pos[j].x_offset / 64);
-					int gy = y - (glyph_pos[j].y_offset / 64);
-
-					stuffbaton.pixels = (uint32_t *)(((uint8_t *)oDrawer.pixels) + gy * oDrawer.pitch) + gx;
-
-					if ((fterr = FT_Outline_Render(ft_library, &ft_face[i]->glyph->outline, &ftr_params)))
-						printf("FT_Outline_Render() failed err=%d\n", fterr);
-				}
-			}
-
-			x += glyph_pos[j].x_advance / 64;
-			y -= glyph_pos[j].y_advance / 64;
-		}
-
-		/* clean up the buffer, but don't kill it just yet */
-		hb_buffer_clear_contents(buf);
-	}
-
-	/* Cleanup */
-	hb_buffer_destroy(buf);
-	for (int i = 0; i < NUM_EXAMPLES; ++i)
-		hb_font_destroy(hb_ft_font[i]);
-
-	FT_Done_FreeType(ft_library);
-
-	oDrawer.Save();
-
-	return 0;
-}

Common/3dParty/harfbuzz/test/test.pro

@@ -1,19 +0,0 @@
-CONFIG -= qt
-TARGET = test
-TEMPLATE = app
-CONFIG += console
-CONFIG -= app_bundle
-
-CORE_ROOT_DIR = $$PWD/../../../../../core
-PWD_ROOT_DIR = $$PWD
-include($$CORE_ROOT_DIR/Common/base.pri)
-
-include($$CORE_ROOT_DIR/DesktopEditor/graphics/pro/freetype.pri)
-include($$CORE_ROOT_DIR/Common/3dParty/harfbuzz/harfbuzz.pri)
-
-SOURCES += main.cpp
-
-ADD_DEPENDENCY(UnicodeConverter, kernel, graphics)
-DESTDIR = $$PWD/build
-
-

DesktopEditor/fontengine/FontManager.cpp

@@ -351,11 +351,17 @@ CFontManager::~CFontManager()
 	RELEASEINTERFACE(m_pFont);
 	RELEASEOBJECT(m_pOwnerCache);
 }
+
 void CFontManager::SetOwnerCache(NSFonts::IFontsCache* pCache)
 {
 	m_pOwnerCache = (CFontsCache*)pCache;
 }
 
+void CFontManager::ClearOwnerCache()
+{
+	m_pOwnerCache->Clear();
+}
+
 NSFonts::IFontsCache* CFontManager::GetCache() { return m_pOwnerCache; }
 NSFonts::IApplicationFonts* CFontManager::GetApplication() { return m_pApplication; }
 NSFonts::IFontFile* CFontManager::GetFile() { return m_pFont; }

DesktopEditor/fontengine/FontManager.h

@@ -132,6 +132,7 @@ public:
 
 	virtual void Initialize();
 	virtual void SetOwnerCache(NSFonts::IFontsCache* pCache);
+	virtual void ClearOwnerCache();
 
 	virtual NSFonts::IFontsCache* GetCache();
 	virtual NSFonts::IApplicationFonts* GetApplication();

DesktopEditor/graphics/Brush.cpp

@@ -33,479 +33,647 @@
 
 namespace Aggplus
 {
-	////////////////////////////////////////////////////////////////////////////////
-
-	CBrush::CBrush(BrushType bType) : m_bType(bType)
+	CBrush::CBrush()
 	{
 	}
-	 
+
+	CBrush::CBrush(const BrushType& type)
+		: m_bType(type)
+	{
+	}
+
 	CBrush::~CBrush()
 	{
 	}
 
-	BrushType CBrush::GetType() const 
-	{ 
-		return m_bType; 
+	BrushType CBrush::GetType() const
+	{
+		return m_bType;
 	}
 
-	////////////////////////////////////////////////////////////////////////////////
-
-	CBrushSolid::CBrushSolid(CColor dwColor) : CBrush(BrushTypeSolidColor), m_dwColor(dwColor)		
+	CBrushSolid::CBrushSolid() : CBrush()
 	{
 	}
-	CBrushSolid::~CBrushSolid()																
+
+	CBrushSolid::CBrushSolid(CColor color)
+		: CBrush(),
+		m_dwColor(color)
 	{
 	}
-	CBrush* CBrushSolid::Clone() const 
-	{ 
-		return new CBrushSolid(m_dwColor);
+
+	CBrushSolid::CBrushSolid(const CBrushSolid& other) : CBrush()
+	{
+		*this = other;
 	}
 
-	void CBrushSolid::GetColor(CColor* color) const { *color = m_dwColor; }
-	void CBrushSolid::SetColor(const CColor &color) { m_dwColor = color; }
-
-	////////////////////////////////////////////////////////////////////////////////
-
-	CBrushHatch::CBrushHatch() : CBrush(BrushTypeHatchFill)
+	CBrushSolid::~CBrushSolid()
 	{
 	}
-	CBrushHatch::~CBrushHatch()																
+
+	void CBrushSolid::GetColor(CColor* color) const
+	{
+		*color = m_dwColor;
+	}
+
+	void CBrushSolid::SetColor(const CColor &color)
+	{
+		m_dwColor = color;
+	}
+
+	CBrushSolid& CBrushSolid::operator=(const CBrushSolid& other)
+	{
+		if (this == &other)
+			return *this;
+
+		m_dwColor = other.m_dwColor;
+		return *this;
+	}
+
+	CBrushHatch::CBrushHatch()
+		: CBrush(BrushTypeHatchFill)
 	{
 	}
-	CBrush* CBrushHatch::Clone() const 
-	{ 
-		CBrushHatch* clone = new CBrushHatch();
-		clone->m_name		= m_name;
-		clone->m_dwColor1	= m_dwColor1;
-		clone->m_dwColor2	= m_dwColor2;
-		return clone;
-	}
-	
-	////////////////////////////////////////////////////////////////////////////////
 
-	CBrushLinearGradient::CBrushLinearGradient( const PointF& p1, const PointF& p2, const CColor& c1, const CColor& c2 ) 
+	CBrushHatch::CBrushHatch(const CBrushHatch& other)
+		: CBrush(BrushTypeHatchFill)
+	{
+		*this = other;
+	}
+
+	CBrushHatch::CBrushHatch(CBrushHatch&& other) noexcept
+		: CBrush(BrushTypeHatchFill)
+	{
+		*this = std::move(other);
+	}
+
+	CBrushHatch::~CBrushHatch()
+	{
+	}
+
+	void CBrushHatch::SetName(const std::wstring& name)
+	{
+		m_wsName = name;
+	}
+
+	std::wstring CBrushHatch::GetName() const
+	{
+		return m_wsName;
+	}
+
+	void CBrushHatch::SetColor1(const CColor& color)
+	{
+		m_dwColor1 = color;
+	}
+
+	CColor CBrushHatch::GetColor1() const
+	{
+		return m_dwColor1;
+	}
+
+	void CBrushHatch::SetColor2(const CColor& color)
+	{
+		m_dwColor2 = color;
+	}
+
+	CColor CBrushHatch::GetColor2() const
+	{
+		return m_dwColor2;
+	}
+
+	void CBrushHatch::SetBounds(const CDoubleRect& rect)
+	{
+		m_oBounds = rect;
+	}
+
+	CDoubleRect& CBrushHatch::GetBounds()
+	{
+		return m_oBounds;
+	}
+
+	CBrushHatch& CBrushHatch::operator=(const CBrushHatch& other)
+	{
+		if (this == &other)
+			return *this;
+
+		m_wsName = other.m_wsName;
+		m_dwColor1 = other.m_dwColor1;
+		m_dwColor2 = other.m_dwColor2;
+		return *this;
+	}
+
+	CBrushHatch& CBrushHatch::operator=(CBrushHatch&& other) noexcept
+	{
+		if (this == &other)
+			return *this;
+
+		m_wsName = std::move(other.m_wsName);
+		m_dwColor1 = other.m_dwColor1;
+		m_dwColor2 = other.m_dwColor2;
+		return *this;
+	}
+
+	CBrushLinearGradient::CBrushLinearGradient()
 		: CBrush(BrushTypeLinearGradient)
 	{
-		m_points[0] = p1;
-		m_points[1] = p2;
-
-		m_colors[0] = c1;
-		m_colors[1] = c2;
-
-		m_angle = 0;
-		m_wrap = Aggplus::WrapModeTile;
-
-		m_bAngleScalable = FALSE;
-		m_bRectable = FALSE;
-		m_bRelativeCoords = FALSE;
 	}
 
-	CBrushLinearGradient::CBrushLinearGradient( const Point& p1, const Point& p2, const CColor& c1, const CColor& c2 ) 
+	CBrushLinearGradient::CBrushLinearGradient(const PointF& p1, const PointF& p2, const CColor& c1, const CColor& c2)
 		: CBrush(BrushTypeLinearGradient)
 	{
-		m_points[0].X = (float)p1.X;
-		m_points[0].Y = (float)p1.Y;
-		m_points[1].X = (float)p2.X;
-		m_points[1].Y = (float)p2.Y;
+		m_arPoints[0] = p1;
+		m_arPoints[1] = p2;
 
-		m_colors[0] = c1;
-		m_colors[1] = c2;
-
-		m_angle = 0;
-		
-		m_wrap = Aggplus::WrapModeTile;
-
-		m_bAngleScalable = FALSE;
-		m_bRectable = FALSE;
-		m_bRelativeCoords = FALSE;
+		m_arColors[0] = c1;
+		m_arColors[1] = c2;
 	}
 
-	CBrushLinearGradient::CBrushLinearGradient( const RectF& rect, const CColor& c1, const CColor& c2, float angle, INT isAngleScalable ) 
+	CBrushLinearGradient::CBrushLinearGradient(const Point& p1, const Point& p2, const CColor& c1, const CColor& c2)
 		: CBrush(BrushTypeLinearGradient)
 	{
-		m_points[0].X = rect.GetLeft();
-		m_points[0].Y = rect.GetTop();
-		m_points[1].X = rect.GetRight();
-		m_points[1].Y = rect.GetBottom();
+		m_arPoints[0].X = static_cast<float>(p1.X);
+		m_arPoints[0].Y = static_cast<float>(p1.Y);
+		m_arPoints[1].X = static_cast<float>(p2.X);
+		m_arPoints[1].Y = static_cast<float>(p2.Y);
 
-		m_colors[0] = c1;
-		m_colors[1] = c2;
+		m_arColors[0] = c1;
+		m_arColors[1] = c2;
+	}
 
-		m_angle = angle;
-		
-		m_wrap = Aggplus::WrapModeTile;
+	CBrushLinearGradient::CBrushLinearGradient(const RectF& rect, const CColor& c1, const CColor& c2, float angle, bool isAngleScalable)
+		: CBrush(BrushTypeLinearGradient)
+	{
+		m_arPoints[0].X = rect.GetLeft();
+		m_arPoints[0].Y = rect.GetTop();
+		m_arPoints[1].X = rect.GetRight();
+		m_arPoints[1].Y = rect.GetBottom();
+
+		m_arColors[0] = c1;
+		m_arColors[1] = c2;
+
+		m_fAngle = angle;
 
 		m_bAngleScalable = isAngleScalable;
-		m_bRectable = TRUE;
-		m_bRelativeCoords = FALSE;
+		m_bRectable = true;
 	}
 
-	CBrushLinearGradient::CBrushLinearGradient( const Rect& rect, const CColor& c1, const CColor& c2, float angle, INT isAngleScalable ) 
+	CBrushLinearGradient::CBrushLinearGradient(const Rect& rect, const CColor& c1, const CColor& c2, float angle, bool isAngleScalable)
 		: CBrush(BrushTypeLinearGradient)
 	{
-		m_points[0].X = (float)rect.GetLeft();
-		m_points[0].Y = (float)rect.GetTop();
-		m_points[1].X = (float)rect.GetRight();
-		m_points[1].Y = (float)rect.GetBottom();
+		m_arPoints[0].X = static_cast<float>(rect.GetLeft());
+		m_arPoints[0].Y = static_cast<float>(rect.GetTop());
+		m_arPoints[1].X = static_cast<float>(rect.GetRight());
+		m_arPoints[1].Y = static_cast<float>(rect.GetBottom());
 
-		m_colors[0] = c1;
-		m_colors[1] = c2;
+		m_arColors[0] = c1;
+		m_arColors[1] = c2;
 
-		m_angle = angle;
-		
-		m_wrap = Aggplus::WrapModeTile;
+		m_fAngle = angle;
 
 		m_bAngleScalable = isAngleScalable;
-		m_bRectable = TRUE;
-		m_bRelativeCoords = FALSE;
+		m_bRectable = true;
 	}
 
-	CBrushLinearGradient::CBrushLinearGradient( const RectF& rect, const CColor& c1, const CColor& c2, Aggplus::LinearGradientMode mode ) 
+	CBrushLinearGradient::CBrushLinearGradient(const RectF& rect, const CColor& c1, const CColor& c2, Aggplus::LinearGradientMode mode)
 		: CBrush(BrushTypeLinearGradient)
 	{
-		m_points[0].X = rect.GetLeft();
-		m_points[0].Y = rect.GetTop();
-		m_points[1].X = rect.GetRight();
-		m_points[1].Y = rect.GetBottom();
+		m_arPoints[0].X = rect.GetLeft();
+		m_arPoints[0].Y = rect.GetTop();
+		m_arPoints[1].X = rect.GetRight();
+		m_arPoints[1].Y = rect.GetBottom();
 
 		switch( mode )
 		{
 		case LinearGradientModeHorizontal:
-			m_angle = 0;
+			m_fAngle = 0;
 			break;
-
 		case LinearGradientModeVertical:
-			m_angle = 90;
+			m_fAngle = 90;
 			break;
-
 		case LinearGradientModeForwardDiagonal:
-			m_angle = 45;
+			m_fAngle = 45;
 			break;
-
 		default:
-			m_angle = 315;
+			m_fAngle = 315;
 		}
 
-		m_colors[0] = c1;
-		m_colors[1] = c2;
+		m_arColors[0] = c1;
+		m_arColors[1] = c2;
 
-		m_wrap = Aggplus::WrapModeTile;
-
-		m_bAngleScalable = TRUE;
-		m_bRectable = TRUE;
-		m_bRelativeCoords = FALSE;
+		m_bAngleScalable = true;
+		m_bRectable = true;
 	}
 
-	CBrushLinearGradient::CBrushLinearGradient( const Rect& rect, const CColor& c1, const CColor& c2, Aggplus::LinearGradientMode mode ) 
+	CBrushLinearGradient::CBrushLinearGradient(const Rect& rect, const CColor& c1, const CColor& c2, Aggplus::LinearGradientMode mode)
 		: CBrush(BrushTypeLinearGradient)
 	{
-		m_points[0].X = (REAL)rect.GetLeft();
-		m_points[0].Y = (REAL)rect.GetTop();
-		m_points[1].X = (REAL)rect.GetRight();
-		m_points[1].Y = (REAL)rect.GetBottom();
+		m_arPoints[0].X = static_cast<float>(rect.GetLeft());
+		m_arPoints[0].Y = static_cast<float>(rect.GetTop());
+		m_arPoints[1].X = static_cast<float>(rect.GetRight());
+		m_arPoints[1].Y = static_cast<float>(rect.GetBottom());
 
 		switch( mode )
 		{
 		case LinearGradientModeHorizontal:
-			m_angle = 0;
+			m_fAngle = 0;
 			break;
-
 		case LinearGradientModeVertical:
-			m_angle = 90;
+			m_fAngle = 90;
 			break;
-
 		case LinearGradientModeForwardDiagonal:
-			m_angle = 45;
+			m_fAngle = 45;
 			break;
-
 		default:
-			m_angle = 315;
+			m_fAngle = 315;
 		}
 
-		m_colors[0] = c1;
-		m_colors[1] = c2;
+		m_arColors[0] = c1;
+		m_arColors[1] = c2;
 
-		m_wrap = Aggplus::WrapModeTile;
-
-		m_bAngleScalable = TRUE;
-		m_bRectable = TRUE;
-		m_bRelativeCoords = FALSE;
+		m_bAngleScalable = true;
+		m_bRectable = true;
 	}
 
-
-	CBrushLinearGradient::CBrushLinearGradient( const CBrushLinearGradient& out )
-		: CBrush(out.m_bType)
+	CBrushLinearGradient::CBrushLinearGradient(const CBrushLinearGradient& other)
+		: CBrush(other.m_bType)
 	{
-		m_colors[0] = out.m_colors[0];
-		m_colors[1] = out.m_colors[1];
-		m_points[0] = out.m_points[0];
-		m_points[1] = out.m_points[1];
-
-		m_subcolors = out.m_subcolors;
-
-		m_matrix = out.m_matrix;
-		m_angle = out.m_angle;
-
-		m_wrap = out.m_wrap;
-		m_bAngleScalable = out.m_bAngleScalable;
-		m_bRectable = out.m_bRectable;
-		m_bRelativeCoords = out.m_bRelativeCoords;
+		*this = other;
 	}
 
-	Status CBrushLinearGradient::GetLinearColors( CColor* colors ) const
+	CBrushLinearGradient::CBrushLinearGradient(CBrushLinearGradient&& other) noexcept
 	{
-		if( !colors )
+		*this = std::move(other);
+	}
+
+	CBrushLinearGradient::~CBrushLinearGradient()
+	{
+	}
+
+	Status CBrushLinearGradient::GetLinearColors(CColor* colors) const
+	{
+		if(!colors)
 			return InvalidParameter;
 
-		colors[0] = m_colors[0];
-		colors[1] = m_colors[1];
+		colors[0] = m_arColors[0];
+		colors[1] = m_arColors[1];
 
 		return Ok;
 	}
 
-	Status CBrushLinearGradient::GetRectangle( Rect *rect ) const
+	Status CBrushLinearGradient::GetRectangle(Rect *rect) const
 	{
-		if( !rect )
+		if(!rect)
 			return InvalidParameter;
 
-		rect->X = (int)( m_points[0].X );
-		rect->Y = (int)( m_points[0].Y );
-		rect->Width = (int)( m_points[1].X ) - rect->X;
-		rect->Height = (int)( m_points[1].Y ) - rect->Y;
+		rect->X		 = static_cast<int>((m_arPoints[0].X));
+		rect->Y 	 = static_cast<int>((m_arPoints[0].Y));
+		rect->Width  = static_cast<int>((m_arPoints[1].X) - rect->X);
+		rect->Height = static_cast<int>((m_arPoints[1].Y) - rect->Y);
+		return Ok;
+	}
+
+	Status CBrushLinearGradient::GetRectangle(RectF *rect) const
+	{
+		if(!rect)
+			return InvalidParameter;
+
+		rect->X 	 = m_arPoints[0].X;
+		rect->Y 	 = m_arPoints[0].Y;
+		rect->Width  = m_arPoints[1].X - rect->X;
+		rect->Height = m_arPoints[1].Y - rect->Y;
 
 		return Ok;
 	}
 
-	Status CBrushLinearGradient::GetRectangle( RectF *rect ) const
+	Status CBrushLinearGradient::GetTransform(CMatrix* matrix) const
 	{
-		if( !rect )
+		if(!matrix)
 			return InvalidParameter;
 
-		rect->X = m_points[0].X;
-		rect->Y = m_points[0].Y;
-		rect->Width = m_points[1].X - rect->X;
-		rect->Height = m_points[1].Y - rect->Y;
+		*matrix = m_Matrix;
 
 		return Ok;
 	}
 
-	Status CBrushLinearGradient::GetTransform( CMatrix* matrix ) const
+	Status CBrushLinearGradient::MultiplyTransform(const CMatrix *matrix, MatrixOrder order)
 	{
 		if( !matrix )
 			return InvalidParameter;
 
-		*matrix = m_matrix;
-
-		return Ok;
-	}
-
-	Status CBrushLinearGradient::MultiplyTransform( const CMatrix *matrix, MatrixOrder order)
-	{
-		if( !matrix )
-			return InvalidParameter;
-
-		m_matrix.Multiply( matrix, order );
+		m_Matrix.Multiply(matrix, order);
 
 		return Ok;
 	}
 
 	Status CBrushLinearGradient::ResetTransform()
 	{
-		m_matrix.Reset();
+		m_Matrix.Reset();
 
 		return Ok;
 	}
 
-	Status CBrushLinearGradient::RotateTransform( REAL angle, MatrixOrder order )
+	Status CBrushLinearGradient::RotateTransform(float angle, MatrixOrder order)
 	{
-		m_matrix.Rotate( angle, order );
+		m_Matrix.Rotate(angle, order);
 
 		return Ok;
 	}
 
-	Status CBrushLinearGradient::ScaleTransform( REAL sx, REAL sy, MatrixOrder order )
+	Status CBrushLinearGradient::ScaleTransform(float sx, float sy, MatrixOrder order)
 	{
-		m_matrix.Scale( sx, sy, order );
+		m_Matrix.Scale(sx, sy, order);
 
 		return Ok;
 	}
 
-	void CBrushLinearGradient::SetWrapMode( WrapMode mode )
+	void CBrushLinearGradient::SetWrapMode(WrapMode mode)
 	{
-		m_wrap = mode;
+		m_eWrap = mode;
 	}
 
 	WrapMode CBrushLinearGradient::GetWrapMode() const
 	{
-		return m_wrap;
+		return m_eWrap;
 	}
 
-	CBrush* CBrushLinearGradient::Clone() const
+	Status CBrushLinearGradient::SetInterpolationColors(const CColor *presetColors, const float *blendPositions, int count)
 	{
-		return new CBrushLinearGradient( *this ); 
-	}
+		m_arSubColors.clear();
 
-	Status CBrushLinearGradient::SetInterpolationColors( const CColor *presetColors, const REAL *blendPositions, INT count )
-	{
-        m_subcolors.clear();
-
-		if( count > 0 && presetColors && blendPositions )
+		if(count > 0 && presetColors && blendPositions)
 		{
-            m_subcolors.resize( count );
+			m_arSubColors.resize(count);
 
-			for( int i = 0; i < count; i++ )
+			for(int i = 0; i < count; i++)
 			{
-				m_subcolors[i].color = presetColors[i];
-				m_subcolors[i].position = blendPositions[i];
+				m_arSubColors[i].color = presetColors[i];
+				m_arSubColors[i].position = blendPositions[i];
 			}
 		}
 
 		return Ok;
 	}
 
-	Status CBrushLinearGradient::GetInterpolationColors( CColor *presetColors, REAL *blendPositions, INT count ) const
+	Status CBrushLinearGradient::GetInterpolationColors(CColor *presetColors, float *blendPositions, int count) const
 	{
-        if( count > 0 && count <= (INT)m_subcolors.size() && presetColors && blendPositions )
+		if( count > 0 && count <= (int)m_arSubColors.size() && presetColors && blendPositions )
 		{
 			for( int i = 0; i < count; i++ )
 			{
-				presetColors[i] = m_subcolors[i].color;
-				blendPositions[i] = m_subcolors[i].position;
+				presetColors[i] = m_arSubColors[i].color;
+				blendPositions[i] = m_arSubColors[i].position;
 			}
 		}
 
 		return Ok;
 	}
 
-	INT CBrushLinearGradient::GetInterpolationColorsCount() const
+	int CBrushLinearGradient::GetInterpolationColorsCount() const
 	{
-        return (INT)m_subcolors.size();
+		return static_cast<int>(m_arSubColors.size());
 	}
 
-	// additional methods
-	void CBrushLinearGradient::GetSubColor( int nIndex, CColor* pColor, float* pPosition ) const
+	void CBrushLinearGradient::GetSubColor(int index, CColor* color, float* position) const
 	{
-		*pColor = m_subcolors[nIndex].color;
-		*pPosition = m_subcolors[nIndex].position;
+		*color = m_arSubColors[index].color;
+		*position = m_arSubColors[index].position;
 	}
-	
-	void CBrushLinearGradient::SetRelativeCoords( INT bRelative )
+
+	void CBrushLinearGradient::SetRelativeCoords(bool relative)
 	{
-		m_bRelativeCoords = bRelative;
+		m_bRelativeCoords = relative;
 	}
-	INT CBrushLinearGradient::IsRelativeCoords() const
+
+	bool CBrushLinearGradient::IsRelativeCoords() const
 	{
 		return m_bRelativeCoords;
 	}
 
-	INT CBrushLinearGradient::IsAngleScalable() const
+	bool CBrushLinearGradient::IsAngleScalable() const
 	{
 		return m_bAngleScalable;
 	}
-	INT CBrushLinearGradient::IsRectable() const
+
+	bool CBrushLinearGradient::IsRectable() const
 	{
 		return m_bRectable;
 	}
+
 	float CBrushLinearGradient::GetAngle() const
 	{
-		return m_angle;
+		return m_fAngle;
 	}
 
-	////////////////////////////////////////////////////////////////////////////////
-
-	CBrushTexture::CBrushTexture() : CBrush(BrushTypeTextureFill)											
+	void CBrushLinearGradient::SetBounds(const CDoubleRect& rect)
 	{
-		m_pImage = NULL;
-		m_bReleaseImage = FALSE;
-		Alpha = 255;
-        m_bUseBounds = false;
+		m_oBounds = rect;
 	}
 
-	CBrushTexture::CBrushTexture(const std::wstring& strName, WrapMode wrapMode) : CBrush(BrushTypeTextureFill), m_wrapMode(wrapMode)
+	CDoubleRect& CBrushLinearGradient::GetBounds()
 	{
-		m_pImage = new CImage(strName);
-		m_bReleaseImage = TRUE;
-		Alpha = 255;
-        m_bUseBounds = false;
+		return m_oBounds;
 	}
 
-	CBrushTexture::CBrushTexture(CImage *pImage, WrapMode wrapMode) : CBrush(BrushTypeTextureFill), m_wrapMode(wrapMode)
+	CBrushLinearGradient& CBrushLinearGradient::operator=(const CBrushLinearGradient& other)
 	{
-		m_pImage = pImage;
-		m_bReleaseImage = FALSE;
-		Alpha = 255;
-        m_bUseBounds = false;
+		if (this == &other)
+			return *this;
+
+		m_arColors[0] = other.m_arColors[0];
+		m_arColors[1] = other.m_arColors[1];
+		m_arPoints[0] = other.m_arPoints[0];
+		m_arPoints[1] = other.m_arPoints[1];
+
+		m_arSubColors = other.m_arSubColors;
+
+		m_Matrix = other.m_Matrix;
+		m_fAngle = other.m_fAngle;
+
+		m_eWrap = other.m_eWrap;
+
+		m_bAngleScalable = other.m_bAngleScalable;
+		m_bRectable = other.m_bRectable;
+		m_bRelativeCoords = other.m_bRelativeCoords;
+
+		return *this;
 	}
-	
-	CBrushTexture::~CBrushTexture() 
+
+	CBrushLinearGradient& CBrushLinearGradient::operator=(CBrushLinearGradient&& other) noexcept
+	{
+		if (this == &other)
+			return *this;
+
+		m_arColors[0] = other.m_arColors[0];
+		m_arColors[1] = other.m_arColors[1];
+		m_arPoints[0] = other.m_arPoints[0];
+		m_arPoints[1] = other.m_arPoints[1];
+
+		m_arSubColors = other.m_arSubColors;
+
+		m_Matrix = std::move(other.m_Matrix);
+
+		m_eWrap = other.m_eWrap;
+
+		m_bAngleScalable = other.m_bAngleScalable;
+		m_bRectable = other.m_bRectable;
+		m_bRelativeCoords = other.m_bRelativeCoords;
+
+		return *this;
+	}
+
+	CBrushTexture::CBrushTexture()
+		: CBrush(BrushTypeTextureFill)
+	{
+	}
+
+	CBrushTexture::CBrushTexture(const std::wstring& name, WrapMode mode)
+		: CBrush(BrushTypeTextureFill),
+		m_eWrapMode(mode)
+	{
+		m_pImage = new CImage(name);
+		m_bReleaseImage = true;
+	}
+
+	CBrushTexture::CBrushTexture(CImage *image, WrapMode mode)
+		: CBrush(BrushTypeTextureFill),
+		m_eWrapMode(mode)
+	{
+		m_pImage = image;
+	}
+
+	CBrushTexture::CBrushTexture(const CBrushTexture& other)
+	{
+		*this = other;
+	}
+
+	CBrushTexture::CBrushTexture(CBrushTexture&& other)
+	{
+		*this = std::move(other);
+	}
+
+	CBrushTexture::~CBrushTexture()
 	{
 		if (m_bReleaseImage)
-		{
 			RELEASEOBJECT(m_pImage);
-		}
 	}
-	
-	CBrush* CBrushTexture::Clone() const
+
+	void CBrushTexture::TranslateTransform(double x, double y, MatrixOrder order)
 	{
-		CBrushTexture *pRet = new CBrushTexture(m_pImage, m_wrapMode);
-		if( pRet )
-		{
-			pRet->m_mtx = m_mtx;
-		}
-
-		return pRet;
+		m_Matrix.Translate(x, y, order);
 	}
 
-	void CBrushTexture::TranslateTransform(double dX, double dY, MatrixOrder order) 
-	{ 
-		m_mtx.Translate(dX, dY, order); 
-	}
-	void CBrushTexture::ScaleTransform(double dX, double dY, MatrixOrder order) 
-	{ 
-		m_mtx.Scale(dX, dY, order); 
-	}
-	void CBrushTexture::RotateTransform(double angle, MatrixOrder order) 
-	{ 
-		m_mtx.Rotate(angle, order); 
-	}
-	void CBrushTexture::GetTransform(CMatrix* matrix) const 
-	{ 
-		*matrix = m_mtx; 
-	}
-	void CBrushTexture::SetTransform(const CMatrix* matrix) 
-	{ 
-		m_mtx = *matrix;
+	void CBrushTexture::ScaleTransform(double x, double y, MatrixOrder order)
+	{
+		m_Matrix.Scale(x, y, order);
 	}
 
-	void CBrushTexture::SetWrapMode(WrapMode wMode) 
-	{ 
-		m_wrapMode = wMode; 
+	void CBrushTexture::RotateTransform(double angle, MatrixOrder order)
+	{
+		m_Matrix.Rotate(angle, order);
 	}
-	WrapMode CBrushTexture::GetWrapMode() const 
-	{ 
-		return(m_wrapMode); 
+
+	void CBrushTexture::GetTransform(CMatrix* matrix) const
+	{
+		*matrix = m_Matrix;
+	}
+
+	void CBrushTexture::SetTransform(const CMatrix* matrix)
+	{
+		m_Matrix = *matrix;
+	}
+
+	void CBrushTexture::SetWrapMode(WrapMode mode)
+	{
+		m_eWrapMode = mode;
+	}
+
+	WrapMode CBrushTexture::GetWrapMode() const
+	{
+		return m_eWrapMode;
+	}
+
+	void CBrushTexture::SetBounds(const CDoubleRect& rect)
+	{
+		m_bUseBounds = true;
+		m_oBounds = rect;
+	}
+
+	CDoubleRect& CBrushTexture::GetBounds()
+	{
+		return m_oBounds;
+	}
+
+	void CBrushTexture::SetReleaseImage(bool isReleaseImage)
+	{
+		m_bReleaseImage = isReleaseImage;
+	}
+
+	bool CBrushTexture::IsReleaseImage() const
+	{
+		return m_bReleaseImage;
+	}
+
+	void CBrushTexture::SetAlpha(BYTE alpha)
+	{
+		m_Alpha = alpha;
+	}
+
+	BYTE CBrushTexture::GetAlpha() const
+	{
+		return m_Alpha;
 	}
 
 	void* CBrushTexture::GetData()
 	{
 		return m_pImage->m_pImgData;
 	}
+
 	void* CBrushTexture::PatternFinalize()
-	{	
+	{
 		if (m_pImage->m_nStride < 0)
 			return m_pImage->m_pImgData - ((m_pImage->m_dwHeight - 1) * m_pImage->m_nStride);
 		return m_pImage->m_pImgData;
 	}
+
 	DWORD CBrushTexture::PatternGetWidth()
-	{	
+	{
 		return m_pImage->m_dwWidth;
 	}
+
 	DWORD CBrushTexture::PatternGetHeight()
-	{	
+	{
 		return m_pImage->m_dwHeight;
 	}
+
 	int CBrushTexture::PatternGetStride()
-	{	
+	{
 		return m_pImage->m_nStride;
 	}
+
+	CBrushTexture& CBrushTexture::operator=(const CBrushTexture& other)
+	{
+		if (this == &other)
+			return *this;
+
+		m_pImage = new CImage(*other.m_pImage);
+
+		m_Matrix = other.m_Matrix;
+
+		m_eWrapMode = other.m_eWrapMode;
+
+		return *this;
+	}
+
+	CBrushTexture& CBrushTexture::operator=(CBrushTexture&& other)
+	{
+		if (this == &other)
+			return *this;
+
+		m_pImage = std::move(other.m_pImage);
+
+		m_Matrix = std::move(other.m_Matrix);
+
+		m_eWrapMode = other.m_eWrapMode;
+
+		return *this;
+	}
 }

DesktopEditor/graphics/Brush.h

@@ -43,170 +43,256 @@
 
 namespace Aggplus
 {
-class CBrush
-{
-	friend class CGraphics;
-
-protected:
-
-	CBrush(BrushType bType);
-	 
-public:
-	virtual ~CBrush();
-
-	virtual CBrush* Clone() const = 0;
-	BrushType GetType() const;
-
-public:
-	BrushType m_bType;
-};
-
-class CBrushSolid : public CBrush
-{
-public:
-	CBrushSolid(CColor dwColor);
-	virtual ~CBrushSolid();
-	virtual CBrush *Clone() const;
-
-	void GetColor(CColor* color) const;
-	void SetColor(const CColor &color);
-	
-protected:
-	CColor m_dwColor;
-};
-
-class CBrushHatch : public CBrush
-{
-public:
-	CBrushHatch();
-	virtual ~CBrushHatch();
-	virtual CBrush *Clone() const;
-
-	inline CDoubleRect& GetBounds() { return Bounds; }
-
-		
-public:
-	std::wstring	m_name;
-	CColor			m_dwColor1;
-	CColor			m_dwColor2;
-
-	CDoubleRect		Bounds;
-};
-
-
-class CBrushLinearGradient : public CBrush
-{
-	friend class CGraphics;
-
-public:
-	CBrushLinearGradient( const PointF& p1, const PointF& p2, const CColor& c1, const CColor& c2 );
-	CBrushLinearGradient( const Point& p1, const Point& p2, const CColor& c1, const CColor& c2 );
-	CBrushLinearGradient( const RectF& rect, const CColor& c1, const CColor& c2, float angle, INT isAngleScalable );
-	CBrushLinearGradient( const Rect& rect, const CColor& c1, const CColor& c2, float angle, INT isAngleScalable );
-	CBrushLinearGradient( const RectF& rect, const CColor& c1, const CColor& c2, Aggplus::LinearGradientMode mode );
-	CBrushLinearGradient( const Rect& rect, const CColor& c1, const CColor& c2, Aggplus::LinearGradientMode mode );
-	CBrushLinearGradient( const CBrushLinearGradient& out );
-
-	Status GetLinearColors( CColor* colors ) const;
-	Status GetRectangle( Rect *rect ) const;
-	Status GetRectangle( RectF *rect ) const;
-
-	Status GetTransform( CMatrix* matrix ) const;
-	Status MultiplyTransform( const CMatrix *matrix, MatrixOrder order = MatrixOrderPrepend);
-	Status ResetTransform();
-	Status RotateTransform( REAL angle, MatrixOrder order = MatrixOrderPrepend );
-	Status ScaleTransform( REAL sx, REAL sy, MatrixOrder order = MatrixOrderPrepend );
-
-	void SetWrapMode( WrapMode mode );
-	WrapMode GetWrapMode() const;
-
-	virtual CBrush *Clone() const;
-
-	Status SetInterpolationColors( const CColor *presetColors, const REAL *blendPositions, INT count );
-	Status GetInterpolationColors( CColor *presetColors, REAL *blendPositions, INT count ) const;
-	INT GetInterpolationColorsCount() const;
-
-	// additional methods
-	void GetSubColor( int nIndex, CColor* pColor, float* pPosition ) const;
-	
-	void SetRelativeCoords( INT bRelative );
-	INT IsRelativeCoords() const;
-	INT IsAngleScalable() const;
-	INT IsRectable() const;
-	float GetAngle() const;
-	inline void SetBounds(const CDoubleRect& oRect) { Bounds = oRect; }
-	inline CDoubleRect& GetBounds() { return Bounds; }
-
-    // info about gradient
-    NSStructures::GradientInfo m_oGradientInfo; // used in 60xx grad types
-protected:
-	CColor m_colors[2];
-	PointF m_points[2];
-
-	struct TSubColor
+	/**
+	 * @abstract CBrush
+	 *
+	 * Base class for brushes (by default a solid brush
+	 * is created).
+	 */
+	class CBrush
 	{
-		CColor color;
-		float position;
+		friend class CGraphics;
+
+	protected:
+		CBrush();
+		CBrush(const BrushType& type);
+
+	public:
+		virtual ~CBrush();
+
+		BrushType GetType() const;
+
+	public:
+		BrushType m_bType = BrushTypeSolidColor;
 	};
-	
-    std::vector<TSubColor> m_subcolors;
 
-	CMatrix m_matrix;
-	float m_angle; // угол поворота в градусах базовой линии p1 -> p2
+	/**
+	 * @class CBrushSolid
+	 *
+	 * A single-color brush used to draw text, graphic paths,
+	 * and fills with a single color.
+	 */
+	class CBrushSolid : public CBrush
+	{
+	public:
+		CBrushSolid();
+		CBrushSolid(CColor color);
+		virtual ~CBrushSolid();
+		CBrushSolid(const CBrushSolid& other);
 
-	CDoubleRect Bounds;
+		void GetColor(CColor* color) const;
+		void SetColor(const CColor &color);
 
-	Aggplus::WrapMode m_wrap;
+		CBrushSolid& operator=(const CBrushSolid& other);
+	protected:
+		CColor m_dwColor{};
+	};
 
-	INT m_bAngleScalable; // масштабировать угол поворота относительно заданных точек b = arctan( width / height * tan(angle) );
-	INT m_bRectable; // в качестве направляющей используется диагональ прямоугольника
-	INT m_bRelativeCoords; // координаты точек считаются относительно рисуемого примитива
-};
+	/**
+	 * @class CBrushHatch
+	 *
+	 * A two-color brush used to fill graphic paths using
+	 * one of the hatch patterns
+	 */
+	class CBrushHatch : public CBrush
+	{
+	public:
+		CBrushHatch();
+		CBrushHatch(const CBrushHatch& other);
+		CBrushHatch(CBrushHatch&& other) noexcept;
+		virtual ~CBrushHatch();
 
-class CBrushTexture : public CBrush
-{
-	friend class CGraphics;
-	
-protected:
-	CBrushTexture();
+		void SetName(const std::wstring& name);
+		std::wstring GetName() const;
 
-public:
-	CBrushTexture(const std::wstring& strName, WrapMode wrapMode = WrapModeTile);
-	CBrushTexture(CImage *pImage, WrapMode wrapMode = WrapModeTile);
-	virtual ~CBrushTexture();
-	virtual CBrush* Clone() const;
+		void SetColor1(const CColor& color);
+		CColor GetColor1() const;
+		void SetColor2(const CColor& color);
+		CColor GetColor2() const;
 
-	void TranslateTransform(double dX, double dY, MatrixOrder order = MatrixOrderPrepend);
-	void ScaleTransform(double dX, double dY, MatrixOrder order = MatrixOrderPrepend);
-	void RotateTransform(double angle, MatrixOrder order = MatrixOrderPrepend);
-	void GetTransform(CMatrix* matrix) const;
-	void SetTransform(const CMatrix* matrix);
+		void SetBounds(const CDoubleRect& rect);
+		CDoubleRect& GetBounds();
 
-	void SetWrapMode(WrapMode wMode);
-	WrapMode GetWrapMode() const;
-	 
-public:
+		CBrushHatch& operator=(const CBrushHatch& other);
+		CBrushHatch& operator=(CBrushHatch&& other) noexcept;
+	protected:
+		/**
+		 * @brief m_wsName - hatch brush pattern name
+		 *   (as default - cross)
+		 *
+		 * See all patterns in agg_span_hatch.h, array -
+		 * c_resource_hatches_names.
+		 */
+		std::wstring	m_wsName;
+		CColor			m_dwColor1{};
+		CColor			m_dwColor2{};
 
-	void* GetData();
-	void* PatternFinalize();
-	DWORD PatternGetWidth();
-	DWORD PatternGetHeight();
-	int PatternGetStride();
-		
-public:
-	CImage* m_pImage;
-	INT m_bReleaseImage;
-	
-	WrapMode m_wrapMode;
-	CMatrix m_mtx;
+		CDoubleRect		m_oBounds{};
+	};
 
-	CColor m_colors[2];
+	/**
+	 * @class CBrushLinearGradient
+	 *
+	 * brush for drawing gradients, stores information about the gradient.
+	 * According to the pdf documentation, it stores the start and end point
+	 * and color, as well as the linear interpolation of the colors.
+	 */
+	class CBrushLinearGradient : public CBrush
+	{
+		friend class CGraphics;
 
-	bool m_bUseBounds;
-	CDoubleRect m_oBounds;
+	public:
+		CBrushLinearGradient();
+		CBrushLinearGradient(const PointF& p1, const PointF& p2, const CColor& c1, const CColor& c2);
+		CBrushLinearGradient(const Point& p1, const Point& p2, const CColor& c1, const CColor& c2);
+		CBrushLinearGradient(const RectF& rect, const CColor& c1, const CColor& c2, float angle, bool isAngleScalable);
+		CBrushLinearGradient(const Rect& rect, const CColor& c1, const CColor& c2, float angle, bool isAngleScalable);
+		CBrushLinearGradient(const RectF& rect, const CColor& c1, const CColor& c2, Aggplus::LinearGradientMode mode);
+		CBrushLinearGradient(const Rect& rect, const CColor& c1, const CColor& c2, Aggplus::LinearGradientMode mode);
+		CBrushLinearGradient(const CBrushLinearGradient& other);
+		CBrushLinearGradient(CBrushLinearGradient&& other) noexcept;
+		virtual ~CBrushLinearGradient();
 
-	BYTE Alpha;
-};
+		Status GetLinearColors(CColor* colors) const;
+		Status GetRectangle(Rect *rect) const;
+		Status GetRectangle(RectF *rect) const;
+
+		Status GetTransform(CMatrix* matrix) const;
+		Status MultiplyTransform(const CMatrix *matrix, MatrixOrder order = MatrixOrderPrepend);
+		Status ResetTransform();
+		Status RotateTransform(float angle, MatrixOrder order = MatrixOrderPrepend );
+		Status ScaleTransform(float sx, float sy, MatrixOrder order = MatrixOrderPrepend );
+
+		void SetWrapMode(WrapMode mode);
+		WrapMode GetWrapMode() const;
+
+		Status SetInterpolationColors(const CColor *presetColors, const float *blendPositions, int count);
+		Status GetInterpolationColors(CColor *presetColors, float *blendPositions, int count) const;
+		int GetInterpolationColorsCount() const;
+
+		void GetSubColor(int index, CColor* color, float* position) const;
+
+		void SetRelativeCoords(bool relative);
+		bool IsRelativeCoords() const;
+		bool IsAngleScalable() const;
+		bool IsRectable() const;
+		float GetAngle() const;
+
+		void SetBounds(const CDoubleRect& rect);
+		CDoubleRect& GetBounds();
+
+		CBrushLinearGradient& operator=(const CBrushLinearGradient& other);
+		CBrushLinearGradient& operator=(CBrushLinearGradient&& other) noexcept;
+
+		NSStructures::GradientInfo m_oGradientInfo{};
+	protected:
+		CColor m_arColors[2];
+		PointF m_arPoints[2];
+
+		struct TSubColor
+		{
+			CColor color{};
+			float position = 0;
+		};
+
+		std::vector<TSubColor> m_arSubColors;
+
+		CMatrix m_Matrix{};
+
+		/**
+		 * @brief m_angle - rotation angle of line p1 - p2 (measured in degrees)
+		 */
+		float m_fAngle = 0;
+
+		CDoubleRect m_oBounds{};
+
+		/**
+		 * @brief m_eWrapMode - Used to determine the rotation of the image tiles
+		 *   (by default, we do not change the position).
+		 */
+		WrapMode m_eWrap = Aggplus::WrapModeTile;
+
+		/**
+		 * @brief m_bAngleScalable - whether to scale the rotation angle relative
+		 *   to the given points
+		 *
+		 * calculated like this b = arctan(width / height * tan(angle));
+		 */
+		bool m_bAngleScalable = false;
+
+		/**
+		 * @brief m_bRectable - is the diagonal of a rectangle a guide
+		 */
+		bool m_bRectable = false;
+
+		/**
+		 * @brief m_bRelativeCoords - are the coordinates of the points calculated
+		 *   relative to the resulting primitive
+		 */
+		bool m_bRelativeCoords = false;
+	};
+
+	/**
+	 * @class CBrushTexture
+	 *
+	 * A texture brush that is used to draw images on the renderer.
+	 */
+	class CBrushTexture : public CBrush
+	{
+		friend class CGraphics;
+
+	public:
+		CBrushTexture();
+		CBrushTexture(const std::wstring& name, WrapMode mode = WrapModeTile);
+		CBrushTexture(CImage *image, WrapMode mode = WrapModeTile);
+		CBrushTexture(const CBrushTexture& other);
+		CBrushTexture(CBrushTexture&& other);
+		virtual ~CBrushTexture();
+
+		void TranslateTransform(double x, double y, MatrixOrder order = MatrixOrderPrepend);
+		void ScaleTransform(double x, double y, MatrixOrder order = MatrixOrderPrepend);
+		void RotateTransform(double angle, MatrixOrder order = MatrixOrderPrepend);
+		void GetTransform(CMatrix* matrix) const;
+		void SetTransform(const CMatrix* matrix);
+
+		void SetWrapMode(WrapMode mode);
+		WrapMode GetWrapMode() const;
+
+		void SetBounds(const CDoubleRect& rect);
+		CDoubleRect& GetBounds();
+
+		void SetReleaseImage(bool isReleaseImage);
+		bool IsReleaseImage() const;
+
+		void SetAlpha(BYTE alpha);
+		BYTE GetAlpha() const;
+
+		void* GetData();
+		void* PatternFinalize();
+		DWORD PatternGetWidth();
+		DWORD PatternGetHeight();
+		int PatternGetStride();
+
+		CBrushTexture& operator=(const CBrushTexture& other);
+		CBrushTexture& operator=(CBrushTexture&& other);
+
+	protected:
+		CImage* m_pImage{nullptr};
+		bool m_bReleaseImage = false;
+
+		/**
+		 * @brief m_eWrapMode - Used to determine the rotation of the image tiles
+		 *   (by default, we do not change the position).
+		 */
+		WrapMode m_eWrapMode = WrapModeTile;
+
+		CMatrix m_Matrix{};
+
+		bool m_bUseBounds = false;
+		CDoubleRect m_oBounds{};
+
+		BYTE m_Alpha = 255;
+	};
 }
 
 #endif // _BUILD_BRUSH_H_

DesktopEditor/graphics/Graphics.cpp

@@ -832,7 +832,8 @@ namespace Aggplus
 				b = ptxBrush->m_oBounds.bottom;
 			}
 
-			CMatrix brushMatrix(ptxBrush->m_mtx);
+			CMatrix brushMatrix;
+			ptxBrush->GetTransform(&brushMatrix);
 			if (ptxBrush->GetWrapMode() == Aggplus::WrapModeClamp)
 			{
 				double dScaleX = (r - x) / dwPatternWidth;
@@ -1652,11 +1653,11 @@ namespace Aggplus
 			m_rasterizer.gamma(1.0);
 		}
 #else
-		agg::rgba8 c1 = agg::rgba8(pBrush->m_dwColor1.GetR(), pBrush->m_dwColor1.GetG(), pBrush->m_dwColor1.GetB(), pBrush->m_dwColor1.GetA());
-		agg::rgba8 c2 = agg::rgba8(pBrush->m_dwColor2.GetR(), pBrush->m_dwColor2.GetG(), pBrush->m_dwColor2.GetB(), pBrush->m_dwColor2.GetA());
+		agg::rgba8 c1 = agg::rgba8(pBrush->GetColor1().GetR(), pBrush->GetColor1().GetG(), pBrush->GetColor1().GetB(), pBrush->GetColor1().GetA());
+		agg::rgba8 c2 = agg::rgba8(pBrush->GetColor2().GetR(), pBrush->GetColor2().GetG(), pBrush->GetColor2().GetB(), pBrush->GetColor2().GetA());
 
 		BYTE* pPattern = new BYTE[HATCH_TX_SIZE * HATCH_TX_SIZE * 4];
-		agg::GetHatchPattern(pBrush->m_name, (agg::rgba8*)pPattern, c1, c2);
+		agg::GetHatchPattern(pBrush->GetName(), (agg::rgba8*)pPattern, c1, c2);
 
 		agg::trans_affine mtx_Work(m_oTransform.m_internal->m_agg_mtx);
 		if (m_dDpiTile > 1)
@@ -2049,22 +2050,22 @@ namespace Aggplus
 
 				if(pImgBuff && dwImgWidth && dwImgHeight)
 				{
-					Aggplus::WrapMode wrapmode = ptxBrush->m_wrapMode;
-					Aggplus::CMatrix matrix = ptxBrush->m_mtx;
+					Aggplus::WrapMode wrapmode = ptxBrush->m_eWrapMode;
+					Aggplus::CMatrix matrix = ptxBrush->m_Matrix;
 
 					if(wrapmode == WrapModeClamp)
 					{
-						DoFillPathTextureClampSz2( matrix, pImgBuff, dwImgWidth, dwImgHeight, nImgStride, ptxBrush->Alpha);
+						DoFillPathTextureClampSz2( matrix, pImgBuff, dwImgWidth, dwImgHeight, nImgStride, ptxBrush->m_Alpha);
 					}
 					else
 					{
 						if (!m_bSwapRGB)
 						{
-							DoFillPathTextureClampSz3<agg::pixfmt_bgra32>(matrix, pImgBuff, dwImgWidth, dwImgHeight, nImgStride, wrapmode, ptxBrush->Alpha);
+							DoFillPathTextureClampSz3<agg::pixfmt_bgra32>(matrix, pImgBuff, dwImgWidth, dwImgHeight, nImgStride, wrapmode, ptxBrush->m_Alpha);
 						}
 						else
 						{
-							DoFillPathTextureClampSz3<agg::pixfmt_rgba32>(matrix, pImgBuff, dwImgWidth, dwImgHeight, nImgStride, wrapmode, ptxBrush->Alpha);
+							DoFillPathTextureClampSz3<agg::pixfmt_rgba32>(matrix, pImgBuff, dwImgWidth, dwImgHeight, nImgStride, wrapmode, ptxBrush->m_Alpha);
 						}
 					}
 				}

DesktopEditor/graphics/GraphicsPath.cpp

@@ -48,7 +48,7 @@ namespace Aggplus
 
 	CGraphicsPath::CGraphicsPath(CGraphicsPath&& other) noexcept
 	{
-		*this = other;
+		*this = std::move(other);
 	}
 
 	CGraphicsPath::CGraphicsPath(const std::vector<CGraphicsPath>& paths) noexcept : CGraphicsPath()

DesktopEditor/graphics/GraphicsRenderer.cpp

@@ -94,7 +94,7 @@ Aggplus::CBrush* CGraphicsRenderer::CreateBrush(NSStructures::CBrush* pBrush)
         Aggplus::CColor o1((BYTE)(pBrush->Alpha1 * m_dGlobalAlpha), pBrush->Color1, bIsSwappedRGB);
         Aggplus::CColor o2((BYTE)(pBrush->Alpha2 * m_dGlobalAlpha), pBrush->Color2, bIsSwappedRGB);
 
-		Aggplus::CBrushLinearGradient* pNew = new Aggplus::CBrushLinearGradient( Aggplus::RectF(0.0f, 0.0f, 1.0f, 1.0f), o1, o2, (float)pBrush->LinearAngle, TRUE );
+		Aggplus::CBrushLinearGradient* pNew = new Aggplus::CBrushLinearGradient(Aggplus::RectF(0.0f, 0.0f, 1.0f, 1.0f), o1, o2, (float)pBrush->LinearAngle, true);
 		if( pNew )
 		{
 			pNew->SetRelativeCoords( TRUE );
@@ -180,11 +180,11 @@ Aggplus::CBrush* CGraphicsRenderer::CreateBrush(NSStructures::CBrush* pBrush)
         Aggplus::CColor o2((BYTE)(pBrush->Alpha2 * m_dGlobalAlpha), pBrush->Color2, bIsSwappedRGB);
 
 		Aggplus::CBrushHatch* pNew = new Aggplus::CBrushHatch();
-		pNew->m_dwColor1	= o1;
-		pNew->m_dwColor2	= o2;
-		pNew->m_name		= pBrush->TexturePath;
+		pNew->SetColor1(o1);
+		pNew->SetColor2(o2);
+		pNew->SetName(pBrush->TexturePath);
 
-		pNew->Bounds		= pBrush->Bounds;
+		pNew->SetBounds(pBrush->Bounds);
 
 		return pNew;
 	}
@@ -996,7 +996,7 @@ HRESULT CGraphicsRenderer::DrawPath(const LONG& nType)
 						pImage->Create(oFrame.get_Data(), oFrame.get_Width(), oFrame.get_Height(), oFrame.get_Stride());
 						oFrame.ClearNoAttack();
 						pTextureBrush = new Aggplus::CBrushTexture(pImage, oMode);
-						pTextureBrush->m_bReleaseImage = TRUE;
+						pTextureBrush->SetReleaseImage(true);
 					}
 					else
 						RELEASEARRAYOBJECTS(pImageData);
@@ -1018,15 +1018,14 @@ HRESULT CGraphicsRenderer::DrawPath(const LONG& nType)
 				{
 					pTextureBrush->SetTransform(&m_oBrush.Transform);
 
-					pTextureBrush->Alpha = (BYTE)m_oBrush.TextureAlpha;
+					pTextureBrush->SetAlpha(static_cast<BYTE>(m_oBrush.TextureAlpha));
 
                     if (m_oBrush.Rectable == 1)
                     {
-                        pTextureBrush->m_bUseBounds = true;
-                        pTextureBrush->m_oBounds.left = m_oBrush.Rect.X;
-                        pTextureBrush->m_oBounds.top = m_oBrush.Rect.Y;
-                        pTextureBrush->m_oBounds.right = pTextureBrush->m_oBounds.left + m_oBrush.Rect.Width;
-                        pTextureBrush->m_oBounds.bottom = pTextureBrush->m_oBounds.top + m_oBrush.Rect.Height;
+						pTextureBrush->SetBounds({m_oBrush.Rect.X,
+												  m_oBrush.Rect.Y,
+												  m_oBrush.Rect.X + m_oBrush.Rect.Width,
+												  m_oBrush.Rect.Y + m_oBrush.Rect.Height});
                     }
 				}
 

DesktopEditor/graphics/Image.cpp

@@ -51,6 +51,16 @@ namespace Aggplus
 		Create(filename);		
 	}
 
+	CImage::CImage(const CImage& other)
+	{
+		*this = other;
+	}
+
+	CImage::CImage(CImage&& other)
+	{
+		*this = std::move(other);
+	}
+
 	CImage::~CImage()
 	{
 		Destroy();
@@ -136,6 +146,46 @@ namespace Aggplus
 		m_bExternalBuffer = false;
 	}
 
+	CImage& CImage::operator=(const CImage& other)
+	{
+		if (this == &other)
+			return *this;
+
+		m_Status = other.m_Status;
+
+		m_dwHeight = other.m_dwHeight;
+		m_dwWidth = other.m_dwWidth;
+		m_nStride = other.m_nStride;
+
+		m_bExternalBuffer = other.m_bExternalBuffer;
+
+		size_t size_of_data = m_dwHeight * m_nStride > 0 ? m_nStride : -m_nStride;
+		m_pImgData = new BYTE[size_of_data];
+
+		memcpy(m_pImgData, other.m_pImgData, size_of_data);
+
+		return *this;
+	}
+
+	CImage& CImage::operator=(CImage&& other)
+	{
+		if (this == &other)
+			return *this;
+
+		m_Status = other.m_Status;
+
+		m_dwHeight = other.m_dwHeight;
+		m_dwWidth = other.m_dwWidth;
+		m_nStride = other.m_nStride;
+
+		m_bExternalBuffer = other.m_bExternalBuffer;
+
+		m_pImgData = other.m_pImgData;
+		other.m_pImgData = nullptr;
+
+		return *this;
+	}
+
 	DWORD CImage::GetWidth() const { return(m_dwWidth); }
 	DWORD CImage::GetHeight() const { return(m_dwHeight); }
 	long CImage::GetStride() const { return(m_nStride); }
@@ -146,10 +196,10 @@ namespace Aggplus
 	////////////////////////////////////////////////////////////////////////////////////////
 	CBitmap::CBitmap(LONG width, LONG height, PixelFormat format) : CImage()
 	{
-		if(width <= 0 || height <= 0) 
-		{ 
-			m_Status=InvalidParameter; 
-			return; 
+		if(width <= 0 || height <= 0)
+		{
+			m_Status=InvalidParameter;
+			return;
 		}
 
 		LONG lSize = 4 * width * height;
@@ -168,15 +218,15 @@ namespace Aggplus
 	CBitmap::CBitmap(LONG width, LONG height, LONG stride, PixelFormat format, BYTE* scan0) : CImage()
 	{
 		//Warning! This is not Gdiplus behavior; it returns Ok!
-		if(width <= 0 || height <= 0 || stride == 0) 
-		{ 
-			m_Status = InvalidParameter; 
-			return; 
+		if(width <= 0 || height <= 0 || stride == 0)
+		{
+			m_Status = InvalidParameter;
+			return;
 		}
 
 		m_bExternalBuffer = true;
 
-		if (stride > 0) 
+		if (stride > 0)
 		{
 			m_pImgData = scan0;
 		}
@@ -184,7 +234,7 @@ namespace Aggplus
 		{
 			m_pImgData = scan0 + (height - 1) * (-stride);
 		}
-		
+
 		m_dwWidth	= width;
 		m_dwHeight	= height;
 		m_nStride	= stride;

DesktopEditor/graphics/Image.h

@@ -49,6 +49,8 @@ public:
 public:
 	CImage();
 	CImage(const std::wstring& filename);
+	CImage(const CImage& other);
+	CImage(CImage&& other);
 	virtual ~CImage();
 
 	DWORD GetWidth() const;
@@ -64,6 +66,9 @@ public:
 	bool SaveFile(const std::wstring& strFileName, UINT nFileType);
 	void Destroy();
 
+	CImage& operator=(const CImage& other);
+	CImage& operator=(CImage&& other);
+
 protected:
 	Status m_Status;
 	

DesktopEditor/graphics/Matrix.cpp

@@ -30,127 +30,133 @@
  *
  */
 #include "Matrix_private.h"
+#include <utility>
 
 namespace Aggplus
 {
-    CMatrix::CMatrix(double m11, double m12, double m21, double m22, double dx, double dy)
+	CMatrix::CMatrix(double m11, double m12, double m21, double m22, double dx, double dy)
 	{
-        m_internal = new CMatrix_private();
-        m_internal->m_agg_mtx.sx = m11;
-        m_internal->m_agg_mtx.shy = m12;
-        m_internal->m_agg_mtx.shx = m21;
-        m_internal->m_agg_mtx.sy = m22;
-        m_internal->m_agg_mtx.tx = dx;
-        m_internal->m_agg_mtx.ty = dy;
+		m_internal = new CMatrix_private();
+		m_internal->m_agg_mtx.sx = m11;
+		m_internal->m_agg_mtx.shy = m12;
+		m_internal->m_agg_mtx.shx = m21;
+		m_internal->m_agg_mtx.sy = m22;
+		m_internal->m_agg_mtx.tx = dx;
+		m_internal->m_agg_mtx.ty = dy;
 	}
 
-    CMatrix::CMatrix(const CMatrix& oSrc)
-    {
-        m_internal = new CMatrix_private();
-        m_internal->m_agg_mtx = oSrc.m_internal->m_agg_mtx;
-    }
-
-    CMatrix::CMatrix()
+	CMatrix::CMatrix()
 	{
-        m_internal = new CMatrix_private();
+		m_internal = new CMatrix_private();
 	}
-	
+
+	CMatrix::CMatrix(const CMatrix& other)
+	{
+		*this = other;
+	}
+
+	CMatrix::CMatrix(CMatrix&& other)
+	{
+		*this = std::move(other);
+	}
+
 	CMatrix::~CMatrix()
 	{
-        RELEASEOBJECT(m_internal);
+		RELEASEOBJECT(m_internal);
 	}
-	
+
 	void CMatrix::Translate(double offsetX, double offsetY, MatrixOrder order)
 	{
-		if (order == MatrixOrderPrepend) 
-		{ 
-            m_internal->m_agg_mtx.premultiply(agg::trans_affine_translation(offsetX, offsetY));
-		}
-		else                            
-		{ 
-            m_internal->m_agg_mtx.multiply(agg::trans_affine_translation(offsetX, offsetY));
-		}
+		if (order == MatrixOrderPrepend)
+			m_internal->m_agg_mtx.premultiply(agg::trans_affine_translation(offsetX, offsetY));
+		else
+			m_internal->m_agg_mtx.multiply(agg::trans_affine_translation(offsetX, offsetY));
 	}
 
 	void CMatrix::Scale(double scaleX, double scaleY, MatrixOrder order)
-	{	
-		if (order == MatrixOrderPrepend) 
-		{ 
-            m_internal->m_agg_mtx.premultiply(agg::trans_affine_scaling(scaleX, scaleY));
-		}
-		else                            
-		{ 
-            m_internal->m_agg_mtx.multiply(agg::trans_affine_scaling(scaleX, scaleY));
-		}
+	{
+		if (order == MatrixOrderPrepend)
+			m_internal->m_agg_mtx.premultiply(agg::trans_affine_scaling(scaleX, scaleY));
+		else
+			m_internal->m_agg_mtx.multiply(agg::trans_affine_scaling(scaleX, scaleY));
 	}
 
 	void CMatrix::Shear(double shearX, double shearY, MatrixOrder order)
 	{
-		if (order == MatrixOrderPrepend) 
-		{ 
-            m_internal->m_agg_mtx.premultiply(agg::trans_affine_skewing(shearX, shearY));
-		}
-		else                            
-		{ 
-            m_internal->m_agg_mtx.multiply(agg::trans_affine_skewing(shearX, shearY));
-		}
+		if (order == MatrixOrderPrepend)
+			m_internal->m_agg_mtx.premultiply(agg::trans_affine_skewing(shearX, shearY));
+		else
+			m_internal->m_agg_mtx.multiply(agg::trans_affine_skewing(shearX, shearY));
+	}
+
+	double CMatrix::Determinant() const
+	{
+		return m_internal->m_agg_mtx.determinant();
 	}
 
 	void CMatrix::TransformVectors(PointF* pts, int count) const
 	{
 		// Store matrix to an array [6] of double
-        double M[6]; m_internal->m_agg_mtx.store_to(M);
+		double M[6];
+		m_internal->m_agg_mtx.store_to(M);
 
-        for (int i = 0; i < count; ++i)
+		for (int i = 0; i < count; ++i)
 		{
-            double x = pts[i].X;
-            double y = pts[i].Y;
-            m_internal->m_agg_mtx.transform(&x, &y);
-            pts[i].X = (float)(x-M[4]);
-            pts[i].Y = (float)(y-M[5]);
+			double x = pts[i].X;
+			double y = pts[i].Y;
+			m_internal->m_agg_mtx.transform(&x, &y);
+			pts[i].X = static_cast<float>(x-M[4]);
+			pts[i].Y = static_cast<float>(y-M[5]);
 		}
 	}
 
 	void CMatrix::TransformPoints(PointF* pts, int count) const
 	{
-        for (int i = 0; i < count; ++i)
+		for (int i = 0; i < count; ++i)
 		{
 			double x = pts[i].X;
 			double y = pts[i].Y;
-            m_internal->m_agg_mtx.transform(&x, &y);
-			pts[i].X = (float)x;
-			pts[i].Y = (float)y;
+			m_internal->m_agg_mtx.transform(&x, &y);
+			pts[i].X = static_cast<float>(x);
+			pts[i].Y = static_cast<float>(y);
 		}
 	}
 
 	void CMatrix::TransformPoint(double& x, double& y) const
 	{
-        m_internal->m_agg_mtx.transform(&x, &y);
+		m_internal->m_agg_mtx.transform(&x, &y);
+	}
+
+	void CMatrix::TransformPoints(PointF* dst, const PointF* src, int count) const
+	{
+		agg::trans_affine& m = m_internal->m_agg_mtx;
+		for(int i = 0; i < count; ++i)
+		{
+			double x = src[i].X * m.sx + src[i].Y * m.shx + m.tx;
+			double y = src[i].Y * m.sy + src[i].X * m.shy + m.ty;
+
+			dst[i].X = static_cast<float>(x);
+			dst[i].Y = static_cast<float>(y);
+		}
 	}
 
 	void CMatrix::Rotate(double angle, MatrixOrder order)
 	{
-		if (order == MatrixOrderPrepend) 
-		{ 
-            m_internal->m_agg_mtx.premultiply(agg::trans_affine_rotation(agg::deg2rad(angle)));
-		}
+		if (order == MatrixOrderPrepend)
+			m_internal->m_agg_mtx.premultiply(agg::trans_affine_rotation(agg::deg2rad(angle)));
 		else
-		{ 
-            m_internal->m_agg_mtx.multiply(agg::trans_affine_rotation(agg::deg2rad(angle)));
-		}
+			m_internal->m_agg_mtx.multiply(agg::trans_affine_rotation(agg::deg2rad(angle)));
 	}
 
 	void CMatrix::RotateAt(double angle, const PointF &center, MatrixOrder order)
 	{
 		Translate(-center.X, -center.Y, order);
-		if(order == MatrixOrderPrepend) 
-		{ 
-            m_internal->m_agg_mtx.premultiply(agg::trans_affine_rotation(agg::deg2rad(angle)));
-		}
-		else                            
-		{ 
-            m_internal->m_agg_mtx.multiply(agg::trans_affine_rotation(agg::deg2rad(angle)));
-		}
+
+		if(order == MatrixOrderPrepend)
+			m_internal->m_agg_mtx.premultiply(agg::trans_affine_rotation(agg::deg2rad(angle)));
+		else
+			m_internal->m_agg_mtx.multiply(agg::trans_affine_rotation(agg::deg2rad(angle)));
+
 		Translate(center.X, center.Y, order);
 		return;
 	}
@@ -158,168 +164,169 @@ namespace Aggplus
 	void CMatrix::RotateAt(double angle, double x, double y, MatrixOrder order)
 	{
 		Translate(-x, -y, order);
-		if (order == MatrixOrderPrepend) 
-		{ 
-            m_internal->m_agg_mtx.premultiply(agg::trans_affine_rotation(agg::deg2rad(angle)));
-		}
-		else                            
-		{ 
-            m_internal->m_agg_mtx.multiply(agg::trans_affine_rotation(agg::deg2rad(angle)));
-		}
+
+		if (order == MatrixOrderPrepend)
+			m_internal->m_agg_mtx.premultiply(agg::trans_affine_rotation(agg::deg2rad(angle)));
+		else
+			m_internal->m_agg_mtx.multiply(agg::trans_affine_rotation(agg::deg2rad(angle)));
+
 		Translate(x, y, order);
 	}
 
 	void CMatrix::Multiply(const CMatrix* matrix, MatrixOrder order)
 	{
-		if (order == MatrixOrderPrepend) 
-		{ 
-            m_internal->m_agg_mtx.premultiply(matrix->m_internal->m_agg_mtx);
-		}
+		if (order == MatrixOrderPrepend)
+			m_internal->m_agg_mtx.premultiply(matrix->m_internal->m_agg_mtx);
 		else
-		{ 
-            m_internal->m_agg_mtx.multiply(matrix->m_internal->m_agg_mtx);
-		}
+			m_internal->m_agg_mtx.multiply(matrix->m_internal->m_agg_mtx);
 	}
 
 	double CMatrix::OffsetX() const
 	{
-        return m_internal->m_agg_mtx.tx;
+		return m_internal->m_agg_mtx.tx;
 	}
+
 	double CMatrix::OffsetY() const
 	{
-        return m_internal->m_agg_mtx.ty;
+		return m_internal->m_agg_mtx.ty;
 	}
 
-    double CMatrix::sx() const
-    {
-        return m_internal->m_agg_mtx.sx;
-    }
-    double CMatrix::sy() const
-    {
-        return m_internal->m_agg_mtx.sy;
-    }
-    double CMatrix::shx() const
-    {
-        return m_internal->m_agg_mtx.shx;
-    }
-    double CMatrix::shy() const
-    {
-        return m_internal->m_agg_mtx.shy;
-    }
-    double CMatrix::tx() const
-    {
-        return m_internal->m_agg_mtx.tx;
-    }
-    double CMatrix::ty() const
-    {
-        return m_internal->m_agg_mtx.ty;
-    }        
-    double CMatrix::rotation()
-    {
-        return m_internal->m_agg_mtx.rotation();
-    }
-
-
-    void CMatrix::SetElements(const double& sx, const double& shy, const double& shx, const double& sy, const double& tx, const double& ty)
-    {
-        m_internal->m_agg_mtx.sx = sx;
-        m_internal->m_agg_mtx.shy = shy;
-        m_internal->m_agg_mtx.shx = shx;
-        m_internal->m_agg_mtx.sy = sy;
-        m_internal->m_agg_mtx.tx = tx;
-        m_internal->m_agg_mtx.ty = ty;
-    }
-	
-	Status CMatrix::GetElements(REAL* m) const
+	double CMatrix::sx() const
 	{
-        double M[6]; m_internal->m_agg_mtx.store_to(M);
-		m[0]=(REAL)M[0];
-		m[1]=(REAL)M[1];
-		m[2]=(REAL)M[2];
-		m[3]=(REAL)M[3];
-		m[4]=(REAL)M[4];
-		m[5]=(REAL)M[5];
+		return m_internal->m_agg_mtx.sx;
+	}
+
+	double CMatrix::sy() const
+	{
+		return m_internal->m_agg_mtx.sy;
+	}
+
+	double CMatrix::shx() const
+	{
+		return m_internal->m_agg_mtx.shx;
+	}
+
+	double CMatrix::shy() const
+	{
+		return m_internal->m_agg_mtx.shy;
+	}
+
+	double CMatrix::tx() const
+	{
+		return m_internal->m_agg_mtx.tx;
+	}
+
+	double CMatrix::ty() const
+	{
+		return m_internal->m_agg_mtx.ty;
+	}
+
+	double CMatrix::rotation()
+	{
+		return m_internal->m_agg_mtx.rotation();
+	}
+
+	void CMatrix::SetElements(const double& sx, const double& shy, const double& shx,
+							  const double& sy, const double& tx, const double& ty)
+	{
+		m_internal->m_agg_mtx.sx = sx;
+		m_internal->m_agg_mtx.shy = shy;
+		m_internal->m_agg_mtx.shx = shx;
+		m_internal->m_agg_mtx.sy = sy;
+		m_internal->m_agg_mtx.tx = tx;
+		m_internal->m_agg_mtx.ty = ty;
+	}
+
+	Status CMatrix::GetElements(float* m) const
+	{
+		double M[6];
+		m_internal->m_agg_mtx.store_to(M);
+
+		m[0] = static_cast<float>(M[0]);
+		m[1] = static_cast<float>(M[1]);
+		m[2] = static_cast<float>(M[2]);
+		m[3] = static_cast<float>(M[3]);
+		m[4] = static_cast<float>(M[4]);
+		m[5] = static_cast<float>(M[5]);
+
 		return Ok;
 	}
 
 	Status CMatrix::GetElements(double* m) const
 	{
-        m_internal->m_agg_mtx.store_to(m);
+		m_internal->m_agg_mtx.store_to(m);
 		return Ok;
 	}
 
 	void CMatrix::Reset()
 	{
-        m_internal->m_agg_mtx.reset();
+		m_internal->m_agg_mtx.reset();
 	}
 
-	double CMatrix::Determinant() const
+	bool CMatrix::IsIdentity(const double& eps) const
 	{
-        return m_internal->m_agg_mtx.determinant();
-    }
+		return m_internal->m_agg_mtx.is_identity(eps);
+	}
 
-	const CMatrix& CMatrix::operator=(const CMatrix& Src)
+	bool CMatrix::IsIdentity2(const double& eps) const
 	{
-        m_internal->m_agg_mtx = Src.m_internal->m_agg_mtx;
-        return *this;
+		agg::trans_affine& m = m_internal->m_agg_mtx;
+		return agg::is_equal_eps(m.sx,  1.0, eps) &&
+			   agg::is_equal_eps(m.shy, 0.0, eps) &&
+			   agg::is_equal_eps(m.shx, 0.0, eps) &&
+			   agg::is_equal_eps(m.sy,  1.0, eps);
+	}
+
+	bool CMatrix::IsEqual(const CMatrix* mm1, const CMatrix* mm2, const double& eps, bool bIsOnlyMain)
+	{
+		agg::trans_affine& m1 = mm1->m_internal->m_agg_mtx;
+		agg::trans_affine& m2 = mm2->m_internal->m_agg_mtx;
+
+		bool bMain = fabs(m1.sx  - m2.sx)  < eps &&
+					 fabs(m1.sy  - m2.sy)  < eps &&
+					 fabs(m1.shx - m2.shx) < eps &&
+					 fabs(m1.shy - m2.shy) < eps;
+
+		if (!bMain || bIsOnlyMain)
+			return bMain;
+
+		return fabs(m1.tx - m2.tx) < eps && fabs(m1.ty - m2.ty) < eps;
 	}
 
 	Status CMatrix::Invert()
 	{
-        double d = m_internal->m_agg_mtx.determinant();
-        if (0.0001 >= fabs(d))
+		double d = m_internal->m_agg_mtx.determinant();
+		if (0.0001 >= fabs(d))
 			return InvalidParameter;
 
-        m_internal->m_agg_mtx.invert();
+		m_internal->m_agg_mtx.invert();
 		return Ok;
 	}
 
 	//Temp
 	//Used in X_BrushLinearGradient constructor
-	double CMatrix::z_Rotation() const 
-	{ 
-        return agg::rad2deg(m_internal->m_agg_mtx.rotation());
-	}
-
-    void CMatrix::TransformPoints( PointF* dst, const PointF* src, int count ) const
+	double CMatrix::z_Rotation() const
 	{
-        agg::trans_affine& m = m_internal->m_agg_mtx;
-		for(int i = 0; i < count; ++i)
-		{
-            double x = src[i].X * m.sx + src[i].Y * m.shx + m.tx;
-            double y = src[i].Y * m.sy + src[i].X * m.shy + m.ty;
-			
-			dst[i].X = (float)x;
-			dst[i].Y = (float)y;
-		}
+		return agg::rad2deg(m_internal->m_agg_mtx.rotation());
 	}
 
-    bool CMatrix::IsIdentity(const double& eps) const
+	const CMatrix& CMatrix::operator=(const CMatrix& other)
 	{
-        return m_internal->m_agg_mtx.is_identity(eps);
+		if (this == &other)
+			return *this;
+
+		m_internal = new CMatrix_private();
+		m_internal->m_agg_mtx = other.m_internal->m_agg_mtx;
+		return *this;
 	}
-    bool CMatrix::IsIdentity2(const double& eps) const
+
+	CMatrix& CMatrix::operator=(CMatrix&& other)
 	{
-        agg::trans_affine& m = m_internal->m_agg_mtx;
-        return agg::is_equal_eps(m.sx,  1.0, eps) &&
-               agg::is_equal_eps(m.shy, 0.0, eps) &&
-               agg::is_equal_eps(m.shx, 0.0, eps) &&
-               agg::is_equal_eps(m.sy,  1.0, eps);
+		if (this == &other)
+			return *this;
+
+		m_internal = other.m_internal;
+		other.m_internal = nullptr;
+		return *this;
 	}
-
-    bool CMatrix::IsEqual(const CMatrix* mm1, const CMatrix* mm2, const double& eps, bool bIsOnlyMain)
-    {
-        agg::trans_affine& m1 = mm1->m_internal->m_agg_mtx;
-        agg::trans_affine& m2 = mm2->m_internal->m_agg_mtx;
-
-        bool bMain = fabs(m1.sx  - m2.sx)  < eps &&
-                     fabs(m1.sy  - m2.sy)  < eps &&
-                     fabs(m1.shx - m2.shx) < eps &&
-                     fabs(m1.shy - m2.shy) < eps;
-
-        if (!bMain || bIsOnlyMain)
-            return bMain;
-
-        return fabs(m1.tx - m2.tx) < eps && fabs(m1.ty - m2.ty) < eps;
-    }
 }

DesktopEditor/graphics/Matrix.h

@@ -37,62 +37,62 @@
 
 namespace Aggplus
 {
-    class CMatrix_private;
-    class GRAPHICS_DECL CMatrix
-    {
-    public:
-        CMatrix(double m11, double m12, double m21, double m22, double dx, double dy);
-        CMatrix();
-        CMatrix(const CMatrix& oSrc);
+	class CMatrix_private;
+	class GRAPHICS_DECL CMatrix
+	{
+	public:
+		CMatrix();
+		CMatrix(double m11, double m12, double m21, double m22, double dx, double dy);
+		CMatrix(const CMatrix& other);
+		CMatrix(CMatrix&& other);
+		~CMatrix();
 
-        ~CMatrix();
+		void Translate(double offsetX, double offsetY, MatrixOrder order = MatrixOrderPrepend);
+		void Scale(double scaleX, double scaleY, MatrixOrder order = MatrixOrderPrepend);
+		void Shear(double shearX, double shearY, MatrixOrder order = MatrixOrderPrepend);
+		double Determinant() const;
 
-        void Translate(double offsetX, double offsetY, MatrixOrder order = MatrixOrderPrepend);
-        void Scale(double scaleX, double scaleY, MatrixOrder order = MatrixOrderPrepend);
-        void Shear(double shearX, double shearY, MatrixOrder order = MatrixOrderPrepend);
-        double Determinant() const;
+		void TransformVectors(PointF* pts, int count) const;
+		void TransformPoints(PointF* pts, int count) const;
+		void TransformPoint(double& x, double& y) const;
+		void TransformPoints(PointF* dst, const PointF* src, int count) const;
 
-        void TransformVectors(PointF* pts, int count) const;
-        void TransformPoints(PointF* pts, int count) const;
-        void TransformPoint(double& x, double& y) const;
-        void TransformPoints(PointF* dst, const PointF* src, int count) const;
+		void Rotate(double angle, MatrixOrder order = MatrixOrderPrepend);
+		void RotateAt(double angle, const PointF &center, MatrixOrder order = MatrixOrderPrepend);
+		void RotateAt(double angle, double x, double y, MatrixOrder order = MatrixOrderPrepend);
 
-        void Rotate(double angle, MatrixOrder order = MatrixOrderPrepend);
-        void RotateAt(double angle, const PointF &center, MatrixOrder order = MatrixOrderPrepend);
-        void RotateAt(double angle, double x, double y, MatrixOrder order = MatrixOrderPrepend);
+		void Multiply(const CMatrix* matrix, MatrixOrder order = MatrixOrderPrepend);
 
-        void Multiply(const CMatrix* matrix, MatrixOrder order = MatrixOrderPrepend);
+		double OffsetX() const;
+		double OffsetY() const;
 
-        double OffsetX() const;
-        double OffsetY() const;
+		double sx() const;
+		double sy() const;
+		double shx() const;
+		double shy() const;
+		double tx() const;
+		double ty() const;
+		double rotation();
 
-        double sx() const;
-        double sy() const;
-        double shx() const;
-        double shy() const;
-        double tx() const;
-        double ty() const;
-        double rotation();
-        void SetElements(const double& sx, const double& shy, const double& shx, const double& sy, const double& tx = 0, const double& ty = 0);
+		void SetElements(const double& sx, const double& shy, const double& shx, const double& sy, const double& tx = 0, const double& ty = 0);
+		Status GetElements(float* m) const;
+		Status GetElements(double* m) const;
 
-        Status GetElements(float* m) const;
-        Status GetElements(double* m) const;
+		void Reset();
+		bool IsIdentity(const double& eps = 0.00001) const;
+		bool IsIdentity2(const double& eps = 0.00001) const;
 
-        void Reset();
-        bool IsIdentity(const double& eps = 0.00001) const;
-        bool IsIdentity2(const double& eps = 0.00001) const;
+		static bool IsEqual(const CMatrix* m1, const CMatrix* m2, const double& eps = 0.001, bool bIsOnlyMain = false);
 
-        static bool IsEqual(const CMatrix* m1, const CMatrix* m2, const double& eps = 0.001, bool bIsOnlyMain = false);
+		Status Invert();
 
-        const CMatrix& operator=(const CMatrix& Src);
+		double z_Rotation() const;
 
-        Status Invert();
+		const CMatrix& operator=(const CMatrix& other);
+		CMatrix& operator=(CMatrix&& other);
 
-        double z_Rotation() const;
-
-    public:
-        CMatrix_private* m_internal;
-    };
+	public:
+		CMatrix_private* m_internal;
+	};
 }
-
 #endif // _BUILD_MATRIX_H_

DesktopEditor/graphics/commands/AnnotField.cpp

@@ -686,7 +686,6 @@ const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::GetDV() { return m_wsDV; }
 const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::GetT()  { return m_wsT; }
 const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::GetFontName()  { return m_wsFN; }
 const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::GetFontKey()   { return m_wsFK; }
-const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::GetOMetadata() { return m_wsOMetadata; }
 const std::vector<double>& CAnnotFieldInfo::CWidgetAnnotPr::GetTC() { return m_arrTC; }
 const std::vector<double>& CAnnotFieldInfo::CWidgetAnnotPr::GetBC() { return m_arrBC; }
 const std::vector<double>& CAnnotFieldInfo::CWidgetAnnotPr::GetBG() { return m_arrBG; }
@@ -887,8 +886,6 @@ void CAnnotFieldInfo::CWidgetAnnotPr::Read(NSOnlineOfficeBinToPdf::CBufferReader
 		m_nParentID = pReader->ReadInt();
 	if (nFlags & (1 << 18))
 		m_wsT = pReader->ReadString();
-	if (nFlags & (1 << 20))
-		m_wsOMetadata = pReader->ReadString();
 
 	// Action
 	int nAction = pReader->ReadInt();

DesktopEditor/graphics/commands/AnnotField.h

@@ -194,7 +194,6 @@ public:
 		const std::wstring& GetT();
 		const std::wstring& GetFontName();
 		const std::wstring& GetFontKey();
-		const std::wstring& GetOMetadata();
 		const std::vector<double>& GetTC();
 		const std::vector<double>& GetBC();
 		const std::vector<double>& GetBG();
@@ -224,7 +223,6 @@ public:
 		std::wstring m_wsT;
 		std::wstring m_wsFN;
 		std::wstring m_wsFK;
-		std::wstring m_wsOMetadata;
 		std::vector<double> m_arrTC;
 		std::vector<double> m_arrBC;
 		std::vector<double> m_arrBG;

DesktopEditor/graphics/pro/Fonts.h

@@ -701,6 +701,7 @@ namespace NSFonts
 		virtual void Initialize() = 0;
 		virtual void SetOwnerCache(IFontsCache* pCache) = 0;
 		virtual void CreateOwnerCache(const int& nCacheSize = -1);
+		virtual void ClearOwnerCache() = 0;
 
 		virtual void AfterLoad() = 0;
 

DesktopEditor/graphics/pro/Image.h

@@ -110,11 +110,20 @@ namespace NSImages
 #ifndef GRAPHICS_DISABLE_METAFILE
 namespace MetaFile
 {
-	const int c_lMetaWmf = 0x01;
-	const int c_lMetaEmf = 0x02;
-	const int c_lMetaSvg = 0x04;
-	const int c_lMetaSvm = 0x05;
+	/**
+	 * @brief Meta file extension constants
+	 */
+	const long c_lMetaWmf = 0x0001;
+	const long c_lMetaEmf = 0x0002;
+	const long c_lMetaSvg = 0x0004;
+	const long c_lMetaSvm = 0x0005;
 
+	/**
+	 * @interface IMetaFile
+	 *
+	 * The interface provides various options for loading a metafile and saving it
+	 * in another format.
+	 */
 	class GRAPHICS_DECL IMetaFile : public NSBase::CBaseRefCounter
 	{
 	public:
@@ -124,23 +133,20 @@ namespace MetaFile
 		virtual bool LoadFromFile(const wchar_t* wsFilePath) = 0;
 		virtual bool LoadFromBuffer(BYTE* pBuffer, unsigned int unSize) = 0;
 		virtual bool LoadFromString(const std::wstring& data) = 0;
-		virtual bool DrawOnRenderer(IRenderer* pRenderer, double dX, double dY, double dWidth, double dHeight) = 0;
+		virtual bool DrawOnRenderer(IRenderer* pRenderer, double dX, double dY,
+									double dWidth, double dHeight, const wchar_t* wsXmlFilePath = NULL) = 0;
 		virtual void Close() = 0;
 		virtual void GetBounds(double* pdX, double* pdY, double* pdW, double* pdH) = 0;
 		virtual int GetType() = 0;
-		virtual void ConvertToRaster(const wchar_t* wsOutFilePath, unsigned int unFileType, int nWidth, int nHeight = -1) = 0;
+		virtual void ConvertToRaster(const wchar_t* wsOutFilePath, unsigned int unFileType, int nWidth, int nHeight = -1, const wchar_t* wsXmlOutFile = NULL) = 0;
 		virtual NSFonts::IFontManager* get_FontManager() = 0;
 
 		virtual std::wstring ConvertToSvg(unsigned int unWidth = 0, unsigned int unHeight = 0) = 0;
 		virtual void SetTempDirectory(const std::wstring& dir) = 0;
 
-		//Для тестов
-	#ifdef METAFILE_SUPPORT_WMF_EMF
-		virtual void ConvertToXml(const wchar_t *wsFilePath) = 0;
-		virtual void ConvertToXmlAndRaster(const wchar_t *wsXmlFilePath, const wchar_t* wsOutFilePath, unsigned int unFileType, int nWidth, int nHeight = -1) = 0;
 		virtual bool LoadFromXmlFile(const wchar_t* wsFilePath) = 0;
+		virtual void ConvertToXml(const wchar_t *wsFilePath) = 0;
 		virtual void ConvertToEmf(const wchar_t *wsFilePath) = 0;
-	#endif
 	};
 
 	GRAPHICS_DECL IMetaFile* Create(NSFonts::IApplicationFonts *pAppFonts);

DesktopEditor/graphics/pro/js/wasm/js/drawingfile.js

@@ -519,9 +519,6 @@ function readAnnotAP(reader, AP)
 		// 0 - Normal, 1 - Multiply, 2 - Screen, 3 - Overlay, 4 - Darken, 5 - Lighten, 6 - ColorDodge, 7 - ColorBurn, 8 - HardLight,
 		// 9 - SoftLight, 10 - Difference, 11 - Exclusion, 12 - Hue, 13 - Saturation, 14 - Color, 15 - Luminosity
 		APi["BlendMode"] = reader.readByte();
-		let k = reader.readByte();
-		if (k != 0)
-			APi["apValue"] = reader.readString();
 	}
 }
 
@@ -654,8 +651,6 @@ CFile.prototype["getInteractiveFormsInfo"] = function()
 			rec["name"] = reader.readString();
 		if (flags & (1 << 19))
 			rec["font"]["AP"] = reader.readString();
-		if (flags & (1 << 20))
-			rec["meta"] = reader.readString();
 		// Action
 		let nAction = reader.readInt();
 		if (nAction > 0)

DesktopEditor/graphics/pro/js/wasm/src/drawingfile_test.cpp

@@ -542,13 +542,6 @@ void ReadInteractiveForms(BYTE* pWidgets, int& i)
 			std::cout << "Font button " << std::string((char*)(pWidgets + i), nPathLength) << ", ";
 			i += nPathLength;
 		}
-		if (nFlags & (1 << 20))
-		{
-			nPathLength = READ_INT(pWidgets + i);
-			i += 4;
-			std::cout << "OMetadata " << std::string((char*)(pWidgets + i), nPathLength) << ", ";
-			i += nPathLength;
-		}
 
 		//Action
 
@@ -814,16 +807,6 @@ void ReadAnnotAP(BYTE* pWidgetsAP, int& i)
 		std::string arrBlendMode[] = { "Normal", "Multiply", "Screen", "Overlay", "Darken", "Lighten", "ColorDodge", "ColorBurn", "HardLight",
 									   "SoftLight", "Difference", "Exclusion", "Hue", "Saturation", "Color", "Luminosity" };
 		std::cout << "Type " << arrBlendMode[nPathLength] << ", ";
-
-		int bText = READ_BYTE(pWidgetsAP + i);
-		i += 1;
-		if (bText != 0)
-		{
-			nPathLength = READ_INT(pWidgetsAP + i);
-			i += 4;
-			std::cout << "Text " << std::string((char*)(pWidgetsAP + i), nPathLength) << ", ";
-			i += nPathLength;
-		}
 	}
 	std::cout << std::endl;
 }
@@ -1107,7 +1090,7 @@ int main(int argc, char* argv[])
 	}
 
 	// GLYPHS
-	if (false && nPagesCount > 0)
+	if (true && nPagesCount > 0)
 	{
 		BYTE* pGlyphs = GetGlyphs(pGrFile, nTestPage);
 		nLength = READ_INT(pGlyphs);
@@ -1182,7 +1165,7 @@ int main(int argc, char* argv[])
 	}
 
 	// INTERACTIVE FORMS
-	if (true)
+	if (false)
 	{
 		ReadInteractiveFormsFonts(pGrFile, 1);
 		ReadInteractiveFormsFonts(pGrFile, 2);

DesktopEditor/graphics/tests/TestPICT/main.cpp

@@ -1,11 +0,0 @@
-#include <codecvt>
-
-#include "../../pro/Graphics.h"
-
-int main(int argc, char *argv[])
-{
-    Aggplus::CImage Cimg(std::wstring_convert<std::codecvt_utf8<wchar_t>>().from_bytes(argv[1]));
-    Cimg.SaveFile(std::wstring_convert<std::codecvt_utf8<wchar_t>>().from_bytes(argv[2]), 1);
-
-    return 0;
-}

DesktopEditor/graphics/tests/hatchBrush/main.cpp

@@ -0,0 +1,11 @@
+#include "mainwindow.h"
+
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+	QApplication a(argc, argv);
+	MainWindow w;
+	w.show();
+	return a.exec();
+}

DesktopEditor/graphics/tests/hatchBrush/mainwindow.cpp

@@ -0,0 +1,182 @@
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+#include <QImage>
+#include <QPixmap>
+#include <QSpinBox>
+#include <QComboBox>
+#include <QStringList>
+
+#include "../../pro/Graphics.h"
+
+static constexpr double rectangle[4] = {
+	10.0, 10.0, 80.0, 80.0,
+};
+
+static const QStringList patterns = {
+	"cross",
+	"dashDnDiag",
+	"dashHorz",
+	"dashUpDiag",
+	"dashVert",
+	"diagBrick",
+	"diagCross",
+	"divot",
+	"dkDnDiag",
+	"dkHorz",
+	"dkUpDiag",
+	"dkVert",
+	"dnDiag",
+	"dotDmnd",
+	"dotGrid",
+	"horz",
+	"horzBrick",
+	"lgCheck",
+	"lgConfetti",
+	"lgGrid",
+	"ltDnDiag",
+	"ltHorz",
+	"ltUpDiag",
+	"ltVert",
+	"narHorz",
+	"narVert",
+	"openDmnd",
+	"pct10",
+	"pct20",
+	"pct25",
+	"pct30",
+	"pct40",
+	"pct5",
+	"pct50",
+	"pct60",
+	"pct70",
+	"pct75",
+	"pct80",
+	"pct90",
+	"plaid",
+	"shingle",
+	"smCheck",
+	"smConfetti",
+	"smGrid",
+	"solidDmnd",
+	"sphere",
+	"trellis",
+	"upDiag",
+	"vert",
+	"wave",
+	"wdDnDiag",
+	"wdUpDiag",
+	"weave",
+	"zigZag"
+};
+
+MainWindow::MainWindow(QWidget *parent)
+	: QMainWindow(parent)
+	, ui(new Ui::MainWindow)
+{
+	ui->setupUi(this);
+	ui->pushButton->SetColor(Qt::red);
+	ui->pushButton_2->SetColor(Qt::blue);
+
+	ui->comboBox->addItems(patterns);
+
+	connect(ui->pushButton,		&CColorButton::ColorChanged,	this, &MainWindow::Draw);
+	connect(ui->pushButton_2,	&CColorButton::ColorChanged,	this, &MainWindow::Draw);
+	connect(ui->spinBox,		&QSpinBox::valueChanged,		this, &MainWindow::Draw);
+	connect(ui->spinBox_2,		&QSpinBox::valueChanged,		this, &MainWindow::Draw);
+	connect(ui->comboBox,		&QComboBox::currentTextChanged, this, &MainWindow::Draw);
+	connect(ui->radioButton,	&QRadioButton::clicked,			this, &MainWindow::Draw);
+	connect(ui->radioButton_2,	&QRadioButton::clicked,			this, &MainWindow::Draw);
+
+	m_oPathRectangle.StartFigure();
+	m_oPathRectangle.MoveTo(rectangle[0], rectangle[1]);
+	m_oPathRectangle.LineTo(rectangle[0] + rectangle[2], rectangle[1]);
+	m_oPathRectangle.LineTo(rectangle[0] + rectangle[2], rectangle[1] + rectangle[3]);
+	m_oPathRectangle.LineTo(rectangle[0], rectangle[1] + rectangle[3]);
+	m_oPathRectangle.LineTo(rectangle[0], rectangle[1]);
+	m_oPathRectangle.CloseFigure();
+
+	m_oPathEllisps.StartFigure();
+	m_oPathEllisps.AddEllipse(rectangle[0], rectangle[1], rectangle[2], rectangle[3]);
+	m_oPathEllisps.CloseFigure();
+
+	Draw();
+}
+
+MainWindow::~MainWindow()
+{
+	delete ui;
+}
+
+void MainWindow::Draw()
+{
+	NSGraphics::IGraphicsRenderer *renderer = NSGraphics::Create();
+
+	int width = ui->label->width(),
+		height = ui->label->height();
+
+	BYTE* data = new  BYTE[4 * width * height];
+
+	CBgraFrame frame;
+	frame.put_Data(data);
+	frame.put_Width(width);
+	frame.put_Height(height);
+	frame.put_Stride(4 * width);
+
+	renderer->put_Width(100);
+	renderer->put_Height(100);
+
+	renderer->CreateFromBgraFrame(&frame);
+	renderer->SetSwapRGB(false);
+
+	renderer->put_BrushType(c_BrushTypeHatch1);
+	renderer->put_BrushTexturePath(ui->comboBox->currentText().toStdWString());
+	renderer->put_BrushColor1(ui->pushButton->GetColor().rgb());
+	renderer->put_BrushAlpha1(ui->spinBox->value());
+	renderer->put_BrushColor2(ui->pushButton_2->GetColor().rgb());
+	renderer->put_BrushAlpha2(ui->spinBox->value());
+
+	std::vector<Aggplus::PointD> points;
+	unsigned length;
+	bool is_rectangle = ui->radioButton->isChecked();
+	if (is_rectangle)
+	{
+		length = m_oPathRectangle.GetPointCount();
+		points = m_oPathRectangle.GetPoints(0, length);
+	}
+	else
+	{
+		length = m_oPathEllisps.GetPointCount();
+		points = m_oPathEllisps.GetPoints(0, length);
+	}
+
+	renderer->BeginCommand(c_nPathType);
+	renderer->PathCommandStart();
+
+	for (unsigned i = 0; i < length; i++)
+	{
+		if (is_rectangle ? m_oPathRectangle.IsCurvePoint(i) : m_oPathEllisps.IsCurvePoint(i))
+		{
+			renderer->PathCommandCurveTo(points[i].X, points[i].Y,
+										 points[i + 1].X, points[i + 1].Y,
+										 points[i + 2].X, points[i + 2].Y);
+			i += 2;
+		}
+		else if (is_rectangle ? m_oPathRectangle.IsMovePoint(i) : m_oPathEllisps.IsMovePoint(i))
+			renderer->PathCommandMoveTo(points[i].X, points[i].Y);
+		else if (is_rectangle ? m_oPathRectangle.IsLinePoint(i) : m_oPathEllisps.IsLinePoint(i))
+			renderer->PathCommandLineTo(points[i].X, points[i].Y);
+	}
+
+	renderer->PathCommandClose();
+	renderer->Fill();
+	renderer->EndCommand(c_nPathType);
+	renderer->PathCommandEnd();
+
+	auto img = QImage(data, width, height, QImage::Format_RGBA8888, [](void *data){
+		delete[] (BYTE*)data;
+	});
+	ui->label->setPixmap(QPixmap::fromImage(img));
+
+	RELEASEOBJECT(renderer);
+}

DesktopEditor/graphics/tests/hatchBrush/mainwindow.h

@@ -0,0 +1,81 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QPushButton>
+#include <QColor>
+#include <QColorDialog>
+#include <QPalette>
+
+#include "../../GraphicsPath.h"
+
+class CColorButton final : public QPushButton
+{
+	Q_OBJECT
+public:
+	CColorButton(QWidget *parent = nullptr) : QPushButton(parent)
+	{
+		connect(this, &QPushButton::clicked, this, &CColorButton::onClicked);
+	}
+
+	~CColorButton() {}
+
+	QColor GetColor() const
+	{
+		return m_oColor;
+	}
+
+	void SetColor(const QColor& color)
+	{
+		if (color == m_oColor)
+			return;
+
+		m_oColor = color;
+		setStyleSheet("QPushButton { background-color : " + m_oColor.name()
+					  + "; border: 1px solid black; padding 10px;}");
+
+		emit ColorChanged();
+	}
+
+signals:
+	void ColorChanged();
+
+public slots:
+	void onClicked()
+	{
+		QColorDialog color_dialog;
+		auto color = color_dialog.getColor();
+
+		if (color.isValid())
+			SetColor(color);
+	}
+
+private:
+	QColor m_oColor;
+};
+
+
+QT_BEGIN_NAMESPACE
+namespace Ui {
+class MainWindow;
+}
+QT_END_NAMESPACE
+
+class MainWindow : public QMainWindow
+{
+	Q_OBJECT
+
+public:
+	MainWindow(QWidget *parent = nullptr);
+	~MainWindow();
+
+public slots:
+	void Draw();
+
+private:
+	Aggplus::CGraphicsPath m_oPathRectangle;
+	Aggplus::CGraphicsPath m_oPathEllisps;
+
+	Ui::MainWindow *ui;
+};
+#endif // MAINWINDOW_H

DesktopEditor/graphics/tests/hatchBrush/mainwindow.ui

@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>368</width>
+    <height>538</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <widget class="QLabel" name="label">
+    <property name="geometry">
+     <rect>
+      <x>30</x>
+      <y>190</y>
+      <width>300</width>
+      <height>300</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+   </widget>
+   <widget class="QGroupBox" name="groupBox">
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>10</y>
+      <width>321</width>
+      <height>151</height>
+     </rect>
+    </property>
+    <property name="title">
+     <string>Hatch brush parametrs</string>
+    </property>
+    <widget class="CColorButton" name="pushButton">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>40</y>
+       <width>31</width>
+       <height>24</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+    <widget class="CColorButton" name="pushButton_2">
+     <property name="geometry">
+      <rect>
+       <x>110</x>
+       <y>40</y>
+       <width>31</width>
+       <height>24</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_2">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>20</y>
+       <width>61</width>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>First color:</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_4">
+     <property name="geometry">
+      <rect>
+       <x>110</x>
+       <y>20</y>
+       <width>81</width>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Second color:</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_5">
+     <property name="geometry">
+      <rect>
+       <x>110</x>
+       <y>70</y>
+       <width>81</width>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Second alpha:</string>
+     </property>
+    </widget>
+    <widget class="QSpinBox" name="spinBox">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>90</y>
+       <width>42</width>
+       <height>25</height>
+      </rect>
+     </property>
+     <property name="maximum">
+      <number>255</number>
+     </property>
+     <property name="value">
+      <number>255</number>
+     </property>
+    </widget>
+    <widget class="QSpinBox" name="spinBox_2">
+     <property name="geometry">
+      <rect>
+       <x>110</x>
+       <y>90</y>
+       <width>42</width>
+       <height>25</height>
+      </rect>
+     </property>
+     <property name="maximum">
+      <number>255</number>
+     </property>
+     <property name="value">
+      <number>255</number>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_6">
+     <property name="geometry">
+      <rect>
+       <x>200</x>
+       <y>20</y>
+       <width>81</width>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Type:</string>
+     </property>
+    </widget>
+    <widget class="QComboBox" name="comboBox">
+     <property name="geometry">
+      <rect>
+       <x>200</x>
+       <y>40</y>
+       <width>110</width>
+       <height>24</height>
+      </rect>
+     </property>
+    </widget>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="geometry">
+      <rect>
+       <x>200</x>
+       <y>70</y>
+       <width>110</width>
+       <height>70</height>
+      </rect>
+     </property>
+     <property name="title">
+      <string>Path:</string>
+     </property>
+     <widget class="QRadioButton" name="radioButton">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>20</y>
+        <width>91</width>
+        <height>22</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Rectangle</string>
+      </property>
+      <property name="checked">
+       <bool>true</bool>
+      </property>
+     </widget>
+     <widget class="QRadioButton" name="radioButton_2">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>40</y>
+        <width>91</width>
+        <height>22</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Circle</string>
+      </property>
+     </widget>
+    </widget>
+    <widget class="QLabel" name="label_7">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>70</y>
+       <width>61</width>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>First alpha:</string>
+     </property>
+    </widget>
+   </widget>
+   <widget class="QLabel" name="label_3">
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>160</y>
+      <width>61</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Output:</string>
+    </property>
+   </widget>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>368</width>
+     <height>21</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>CColorButton</class>
+   <extends>QPushButton</extends>
+   <header>mainwindow.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

DesktopEditor/graphics/tests/hatchBrush/test.pro

@@ -0,0 +1,20 @@
+QT += core gui widgets
+
+QMAKE_CXXFLAGS += /permissive-
+
+SOURCES += \
+	main.cpp \
+	mainwindow.cpp
+
+HEADERS += \
+	mainwindow.h
+
+FORMS += \
+	mainwindow.ui
+
+PWD_ROOT_DIR = $$PWD
+CORE_ROOT_DIR = $$PWD/../../../../../core
+include($$CORE_ROOT_DIR/Common/base.pri)
+
+ADD_DEPENDENCY(kernel, graphics, UnicodeConverter)
+include($$CORE_ROOT_DIR/Common/3dParty/icu/icu.pri)

DesktopEditor/graphics/tests/images/main.cpp

@@ -0,0 +1,11 @@
+#include "mainwindow.h"
+
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+	QApplication a(argc, argv);
+	MainWindow w;
+	w.show();
+	return a.exec();
+}

DesktopEditor/graphics/tests/images/mainwindow.cpp

@@ -0,0 +1,62 @@
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+#include <QFileDialog>
+#include <QLabel>
+#include <QSizePolicy>
+#include <QDir>
+
+#include "../../../../UnicodeConverter/UnicodeConverter.h"
+#include "../../pro/Graphics.h"
+
+MainWindow::MainWindow(QWidget *parent)
+	: QMainWindow(parent)
+	, ui(new Ui::MainWindow)
+{
+	ui->setupUi(this);
+	ui->label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+	ui->label->setFixedWidth(310);
+	ui->comboBox->addItems(m_arExtensions);
+}
+
+MainWindow::~MainWindow()
+{
+	delete ui;
+}
+
+void MainWindow::on_pushButton_clicked()
+{
+	m_arFileNames = QFileDialog::getOpenFileNames(this,
+												  "Select one or more images",
+												  "",
+												  "*.bmp *.gif *.jpg *.png *.ico "
+												  "*.tif *.tga *.pcx *.wbmp *.jp2 "
+												  "*.jpc *.pgx *.pnm *.ras *.jbg "
+												  "*.mng *.ska *.raw *.psd *.pic");
+
+	if (!m_arFileNames.empty())
+		ui->label->setText("File:" + m_arFileNames[0]);
+}
+
+void MainWindow::on_pushButton_2_clicked()
+{
+	auto save_dir = QFileDialog::getExistingDirectory(this,
+													  "Open Directory",
+													  "",
+													  QFileDialog::ShowDirsOnly |
+													  QFileDialog::DontResolveSymlinks);
+
+	auto ext = ui->comboBox->currentText();
+
+	NSUnicodeConverter::CUnicodeConverter converter;
+	for (const auto& f : m_arFileNames)
+	{
+		ui->label->setText("File:" + f);
+		Aggplus::CImage img(converter.toUnicode(f.toStdString(), 1));
+		img.SaveFile(converter.toUnicode(QDir(save_dir).filePath("res." + ext).toStdString(), 1),
+					 m_mapExtensionCodes.value(ext));
+	}
+}
+
+
+

DesktopEditor/graphics/tests/images/mainwindow.h

@@ -0,0 +1,75 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QString>
+#include <QStringList>
+#include <QMap>
+
+namespace Ui {
+class MainWindow;
+}
+
+class MainWindow : public QMainWindow
+{
+	Q_OBJECT
+
+public:
+	explicit MainWindow(QWidget *parent = nullptr);
+	~MainWindow();
+
+private slots:
+	void on_pushButton_clicked();
+
+	void on_pushButton_2_clicked();
+
+private:
+	Ui::MainWindow *ui;
+
+	QStringList		m_arFileNames;
+
+	QStringList m_arExtensions = {
+		"bmp",
+		"gif",
+		"jpg",
+		"png",
+		"ico",
+		"tif",
+		"tga",
+		"pcx",
+		"wbmp",
+		"jp2",
+		"jpc",
+		"pgx",
+		"pnm",
+		"ras",
+		"mng",
+		"ska",
+		"raw",
+		"psd",
+		"pic",
+	};
+	QMap<QString, int> m_mapExtensionCodes = {
+		{"bmp", 1},
+		{"gif", 2},
+		{"jpg", 3},
+		{"png", 4},
+		{"ico", 5},
+		{"tif", 6},
+		{"tga", 7},
+		{"pcx", 8},
+		{"wbmp", 9},
+		{"jp2", 11},
+		{"jpc", 12},
+		{"pgx", 13},
+		{"pnm", 14},
+		{"ras", 15},
+		{"mng", 17},
+		{"ska", 18},
+		{"raw", 19},
+		{"psd", 20},
+		{"pic", 25},
+	};
+};
+
+#endif // MAINWINDOW_H

DesktopEditor/graphics/tests/images/mainwindow.ui

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>385</width>
+    <height>196</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <widget class="QPushButton" name="pushButton">
+    <property name="geometry">
+     <rect>
+      <x>40</x>
+      <y>20</y>
+      <width>121</width>
+      <height>24</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Choose img file</string>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label">
+    <property name="geometry">
+     <rect>
+      <x>40</x>
+      <y>50</y>
+      <width>310</width>
+      <height>91</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>File:</string>
+    </property>
+    <property name="wordWrap">
+     <bool>true</bool>
+    </property>
+   </widget>
+   <widget class="QPushButton" name="pushButton_2">
+    <property name="geometry">
+     <rect>
+      <x>270</x>
+      <y>20</y>
+      <width>80</width>
+      <height>24</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Convert</string>
+    </property>
+   </widget>
+   <widget class="QComboBox" name="comboBox">
+    <property name="geometry">
+     <rect>
+      <x>180</x>
+      <y>20</y>
+      <width>72</width>
+      <height>24</height>
+     </rect>
+    </property>
+   </widget>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>385</width>
+     <height>21</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

DesktopEditor/graphics/tests/images/test.pro

@@ -1,13 +1,8 @@
-#CONFIG += c++11 cmdline
+CONFIG += c++11
 
-#SOURCES += \
-QT       -= core
+QMAKE_CXXFLAGS += /permissive-
 
-QT       -= gui
-
-TARGET = test
-CONFIG   += console
-TEMPLATE = app
+QT += core gui widgets
 
 CORE_ROOT_DIR = $$PWD/../../../..
 PWD_ROOT_DIR = $$PWD
@@ -21,6 +16,13 @@ GRAPHICS_AGG_PATH = $$PWD/../../../agg-2.4
 INCLUDEPATH += \
     $$GRAPHICS_AGG_PATH/include
 
-SOURCES += main.cpp
+SOURCES += main.cpp \
+	mainwindow.cpp
 
 DESTDIR = $$PWD_ROOT_DIR/build/$$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX
+
+FORMS += \
+	mainwindow.ui
+
+HEADERS += \
+	mainwindow.h

DesktopEditor/graphics/tests/metaFiles/main.cpp

@@ -0,0 +1,11 @@
+#include "mainwindow.h"
+
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+	QApplication a(argc, argv);
+	MainWindow w;
+	w.show();
+	return a.exec();
+}

DesktopEditor/graphics/tests/metaFiles/mainwindow.cpp

@@ -0,0 +1,76 @@
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+#include <QFileDialog>
+#include <QLabel>
+#include <QSizePolicy>
+#include <QDir>
+
+#include "../../../../UnicodeConverter/UnicodeConverter.h"
+#include "../../pro/Graphics.h"
+
+MainWindow::MainWindow(QWidget *parent)
+	: QMainWindow(parent)
+	, ui(new Ui::MainWindow)
+{
+	ui->setupUi(this);
+	ui->label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+	ui->label->setFixedWidth(160);
+}
+
+MainWindow::~MainWindow()
+{
+	delete ui;
+}
+
+void MainWindow::on_pushButton_clicked()
+{
+	m_arFileNames = QFileDialog::getOpenFileNames(this,
+												  "Select one or more metafiles to convert",
+												  "",
+												  "*.emf *.wmf *.svm *.svg");
+	if (!m_arFileNames.empty())
+		ui->label->setText("File:" + m_arFileNames[0]);
+}
+
+
+void MainWindow::on_pushButton_2_clicked()
+{
+	auto save_dir = QFileDialog::getExistingDirectory(this,
+													  "Open Directory",
+													  "",
+													  QFileDialog::ShowDirsOnly |
+													  QFileDialog::DontResolveSymlinks);
+
+	NSUnicodeConverter::CUnicodeConverter converter;
+	for (const auto& f : m_arFileNames)
+	{
+		ui->label->setText("File:" + f);
+		NSFonts::IApplicationFonts* app_fonts = NSFonts::NSApplication::Create();
+		app_fonts->Initialize();
+		MetaFile::IMetaFile* meta_file = MetaFile::Create(app_fonts);
+		if (!meta_file->LoadFromFile(converter.toUnicode(f.toStdString(), 1).c_str()))
+			return;
+
+		double x, y, w, h;
+		meta_file->GetBounds(&x, &y, &w, &h);
+
+		if (ui->radioButton->isChecked())
+			meta_file->ConvertToRaster(converter.toUnicode(QDir(save_dir).filePath("res.bmp").toStdString(), 1).c_str(), 1,
+									   static_cast<int>(w) + 1, static_cast<int>(h) + 1);
+		else if (ui->radioButton_2->isChecked())
+			meta_file->ConvertToXml(converter.toUnicode(QDir(save_dir).filePath("res.xml").toStdString(), 1).c_str());
+		else if (ui->radioButton_3->isChecked())
+			meta_file->ConvertToRaster(converter.toUnicode(QDir(save_dir).filePath("res.bmp").toStdString(), 1).c_str(), 1,
+									   static_cast<int>(w) + 1, static_cast<int>(h) + 1,
+									   converter.toUnicode(QDir(save_dir).filePath("res.xml").toStdString(), 1).c_str());
+		else if (ui->radioButton_4->isChecked())
+			meta_file->ConvertToSvg(static_cast<int>(w) + 1, static_cast<int>(h) + 1);
+		else if (ui->radioButton_5->isChecked())
+			meta_file->ConvertToEmf(converter.toUnicode(QDir(save_dir).filePath("res.emf").toStdString(), 1).c_str());
+
+		RELEASEOBJECT(app_fonts);
+		RELEASEOBJECT(meta_file);
+	}
+}
+

DesktopEditor/graphics/tests/metaFiles/mainwindow.h

@@ -0,0 +1,32 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QString>
+#include <QStringList>
+
+
+namespace Ui {
+class MainWindow;
+}
+
+class MainWindow : public QMainWindow
+{
+	Q_OBJECT
+
+public:
+	explicit MainWindow(QWidget *parent = nullptr);
+	~MainWindow();
+
+private slots:
+	void on_pushButton_clicked();
+
+	void on_pushButton_2_clicked();
+
+private:
+	Ui::MainWindow *ui;
+
+	QStringList		m_arFileNames;
+};
+
+#endif // MAINWINDOW_H

DesktopEditor/graphics/tests/metaFiles/mainwindow.ui

@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>540</width>
+    <height>211</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <widget class="QPushButton" name="pushButton">
+    <property name="geometry">
+     <rect>
+      <x>50</x>
+      <y>60</y>
+      <width>161</width>
+      <height>24</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Choose Metafile</string>
+    </property>
+   </widget>
+   <widget class="QGroupBox" name="groupBox">
+    <property name="geometry">
+     <rect>
+      <x>250</x>
+      <y>0</y>
+      <width>151</width>
+      <height>131</height>
+     </rect>
+    </property>
+    <property name="title">
+     <string>Choose to convert</string>
+    </property>
+    <widget class="QRadioButton" name="radioButton">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>30</y>
+       <width>91</width>
+       <height>22</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Raster(.bmp)</string>
+     </property>
+    </widget>
+    <widget class="QRadioButton" name="radioButton_2">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>50</y>
+       <width>91</width>
+       <height>22</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Xml</string>
+     </property>
+    </widget>
+    <widget class="QRadioButton" name="radioButton_3">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>70</y>
+       <width>131</width>
+       <height>22</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Raster(.bmp) + Xml</string>
+     </property>
+    </widget>
+    <widget class="QRadioButton" name="radioButton_4">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>90</y>
+       <width>91</width>
+       <height>22</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Svg</string>
+     </property>
+    </widget>
+    <widget class="QRadioButton" name="radioButton_5">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>110</y>
+       <width>91</width>
+       <height>22</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Emf</string>
+     </property>
+    </widget>
+   </widget>
+   <widget class="QPushButton" name="pushButton_2">
+    <property name="geometry">
+     <rect>
+      <x>450</x>
+      <y>60</y>
+      <width>80</width>
+      <height>24</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Convert</string>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label">
+    <property name="geometry">
+     <rect>
+      <x>60</x>
+      <y>90</y>
+      <width>151</width>
+      <height>71</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>File: </string>
+    </property>
+    <property name="scaledContents">
+     <bool>false</bool>
+    </property>
+    <property name="wordWrap">
+     <bool>true</bool>
+    </property>
+    <property name="margin">
+     <number>0</number>
+    </property>
+    <property name="openExternalLinks">
+     <bool>false</bool>
+    </property>
+   </widget>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>540</width>
+     <height>21</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

DesktopEditor/graphics/tests/metaFiles/test.pro

@@ -0,0 +1,23 @@
+CONFIG += c++11
+
+QMAKE_CXXFLAGS += /permissive-
+
+QT       += core gui widgets
+
+SOURCES += \
+	main.cpp\
+	mainwindow.cpp
+
+FORMS += \
+	mainwindow.ui
+
+HEADERS += \
+	mainwindow.h
+
+PWD_ROOT_DIR = $$PWD
+CORE_ROOT_DIR = $$PWD/../../../../../core
+include($$CORE_ROOT_DIR/Common/base.pri)
+
+ADD_DEPENDENCY(kernel, graphics, UnicodeConverter)
+include($$CORE_ROOT_DIR/Common/3dParty/icu/icu.pri)
+

DesktopEditor/graphics/tests/text/main.cpp

@@ -0,0 +1,11 @@
+#include "mainwindow.h"
+
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+	QApplication a(argc, argv);
+	MainWindow w;
+	w.show();
+	return a.exec();
+}

DesktopEditor/graphics/tests/text/mainwindow.cpp

@@ -0,0 +1,97 @@
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+#include <iterator>
+
+#include <QImage>
+#include <QPixmap>
+#include <QString>
+
+MainWindow::MainWindow(QWidget *parent)
+	: QMainWindow(parent)
+	, ui(new Ui::MainWindow)
+{
+	ui->setupUi(this);
+	ui->pushButton->SetColor(Qt::black);
+
+	m_oAppFonts = NSFonts::NSApplication::Create();
+	m_oAppFonts->Initialize();
+
+	m_oFontManager = m_oAppFonts->GenerateFontManager();
+	NSFonts::IFontsCache* fonts_cache = NSFonts::NSFontCache::Create();
+	fonts_cache->SetStreams(m_oAppFonts->GetStreams());
+	m_oFontManager->SetOwnerCache(fonts_cache);
+
+	for (auto it = m_oAppFonts->GetList()->GetFonts()->cbegin(); it != m_oAppFonts->GetList()->GetFonts()->cend(); it++)
+		ui->comboBox->addItem(QString::fromWCharArray((*it)->m_wsFontName.c_str()));
+
+	connect(ui->textEdit,	&QTextEdit::textChanged,		this, &MainWindow::Draw);
+	connect(ui->spinBox,	&QSpinBox::valueChanged,		this, &MainWindow::Draw);
+	connect(ui->comboBox,	&QComboBox::currentTextChanged, this, &MainWindow::Draw);
+	connect(ui->checkBox,	&QCheckBox::stateChanged,		this, &MainWindow::Draw);
+	connect(ui->checkBox_2, &QCheckBox::stateChanged,		this, &MainWindow::Draw);
+	connect(ui->pushButton, &CColorButton::ColorChanged,	this, &MainWindow::Draw);
+}
+
+MainWindow::~MainWindow()
+{
+	RELEASEOBJECT(m_oAppFonts);
+	RELEASEOBJECT(m_oFontManager);
+	delete ui;
+}
+
+
+void MainWindow::Draw()
+{
+	NSGraphics::IGraphicsRenderer* renderer = NSGraphics::Create();
+	renderer->SetFontManager(m_oFontManager);
+
+	int width = ui->label->width(),
+		height = ui->label->height();
+
+	BYTE* data = new BYTE[4 * width * height];
+
+	CBgraFrame frame;
+	frame.put_Data(data);
+	frame.put_Width(width);
+	frame.put_Height(height);
+	frame.put_Stride(4 * width);
+
+	renderer->put_Width(100);
+	renderer->put_Height(100);
+
+	renderer->CreateFromBgraFrame(&frame);
+	renderer->SetSwapRGB(false);
+
+	renderer->put_FontName(ui->comboBox->currentText().toStdWString());
+	renderer->put_FontSize(ui->spinBox->value());
+
+	long font_style = 0;
+	if (ui->checkBox->isChecked())
+		font_style |= 0x01;
+	if (ui->checkBox_2->isChecked())
+		font_style |= 0x02;
+	renderer->put_FontStyle(font_style);
+
+	renderer->put_BrushColor1(ui->pushButton->GetColor().rgb());
+
+	auto lines = ui->textEdit->toPlainText().split('\n');
+	double x = 1.0;
+	double y =  (ui->spinBox->value() * 25.4 / 96.0) + 3.0;
+	double scale_y = y;
+
+	renderer->BeginCommand(c_nTextGraphicType);
+	for (auto it = lines.cbegin(); it != lines.cend(); it++)
+	{
+		renderer->CommandDrawText((*it).toStdWString(), x, y, 0.0, 0.0);
+		y += scale_y;
+	}
+	renderer->EndCommand(c_nTextGraphicType);
+
+	QImage img = QImage(data, width, height, QImage::Format_RGBA8888, [](void *data){
+		delete[] (BYTE*)data;
+	});
+	ui->label->setPixmap(QPixmap::fromImage(img));
+
+	RELEASEOBJECT(renderer);
+}

DesktopEditor/graphics/tests/text/mainwindow.h

@@ -0,0 +1,80 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include "../../pro/Graphics.h"
+
+#include <QMainWindow>
+#include <QPushButton>
+#include <QColor>
+#include <QColorDialog>
+#include <QPalette>
+
+class CColorButton final : public QPushButton
+{
+	Q_OBJECT
+public:
+	CColorButton(QWidget *parent = nullptr) : QPushButton(parent)
+	{
+		connect(this, &QPushButton::clicked, this, &CColorButton::onClicked);
+	}
+
+	~CColorButton() {}
+
+	QColor GetColor() const
+	{
+		return m_oColor;
+	}
+
+	void SetColor(const QColor& color)
+	{
+		if (color == m_oColor)
+			return;
+
+		m_oColor = color;
+		setStyleSheet("QPushButton { background-color : " + m_oColor.name()
+					  + "; border: 1px solid black; padding 10px;}");
+
+		emit ColorChanged();
+	}
+
+signals:
+	void ColorChanged();
+
+public slots:
+	void onClicked()
+	{
+		QColorDialog color_dialog;
+		auto color = color_dialog.getColor();
+
+		if (color.isValid())
+			SetColor(color);
+	}
+
+private:
+	QColor m_oColor;
+};
+
+QT_BEGIN_NAMESPACE
+namespace Ui {
+class MainWindow;
+}
+QT_END_NAMESPACE
+
+class MainWindow : public QMainWindow
+{
+	Q_OBJECT
+
+public:
+	MainWindow(QWidget *parent = nullptr);
+	~MainWindow();
+
+public slots:
+	void Draw();
+
+private:
+	Ui::MainWindow *ui;
+
+	NSFonts::IApplicationFonts* m_oAppFonts;
+	NSFonts::IFontManager*		m_oFontManager;
+};
+#endif // MAINWINDOW_H

DesktopEditor/graphics/tests/text/mainwindow.ui

@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>471</width>
+    <height>390</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <widget class="QLabel" name="label">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>130</y>
+      <width>450</width>
+      <height>200</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+   </widget>
+   <widget class="QTextEdit" name="textEdit">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>20</y>
+      <width>180</width>
+      <height>70</height>
+     </rect>
+    </property>
+    <property name="placeholderText">
+     <string>Hello</string>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label_2">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>0</y>
+      <width>61</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Text input:</string>
+    </property>
+   </widget>
+   <widget class="QGroupBox" name="groupBox">
+    <property name="geometry">
+     <rect>
+      <x>200</x>
+      <y>0</y>
+      <width>261</width>
+      <height>91</height>
+     </rect>
+    </property>
+    <property name="title">
+     <string>Brush</string>
+    </property>
+    <widget class="QSpinBox" name="spinBox">
+     <property name="geometry">
+      <rect>
+       <x>140</x>
+       <y>40</y>
+       <width>42</width>
+       <height>25</height>
+      </rect>
+     </property>
+     <property name="value">
+      <number>30</number>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_3">
+     <property name="geometry">
+      <rect>
+       <x>140</x>
+       <y>20</y>
+       <width>49</width>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Font size:</string>
+     </property>
+    </widget>
+    <widget class="QCheckBox" name="checkBox">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>70</y>
+       <width>51</width>
+       <height>22</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Bold</string>
+     </property>
+    </widget>
+    <widget class="QCheckBox" name="checkBox_2">
+     <property name="geometry">
+      <rect>
+       <x>60</x>
+       <y>70</y>
+       <width>51</width>
+       <height>22</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Italic</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_5">
+     <property name="geometry">
+      <rect>
+       <x>200</x>
+       <y>20</y>
+       <width>41</width>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Color:</string>
+     </property>
+    </widget>
+    <widget class="CColorButton" name="pushButton">
+     <property name="geometry">
+      <rect>
+       <x>200</x>
+       <y>40</y>
+       <width>31</width>
+       <height>24</height>
+      </rect>
+     </property>
+     <property name="autoFillBackground">
+      <bool>false</bool>
+     </property>
+     <property name="styleSheet">
+      <string notr="true"/>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_6">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>20</y>
+       <width>31</width>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Font:</string>
+     </property>
+    </widget>
+    <widget class="QComboBox" name="comboBox">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>40</y>
+       <width>121</width>
+       <height>24</height>
+      </rect>
+     </property>
+     <property name="duplicatesEnabled">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </widget>
+   <widget class="QLabel" name="label_4">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>100</y>
+      <width>71</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Text output:</string>
+    </property>
+   </widget>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>471</width>
+     <height>21</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>CColorButton</class>
+   <extends>QPushButton</extends>
+   <header>mainwindow.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

DesktopEditor/graphics/tests/text/test.pro

@@ -0,0 +1,20 @@
+QT += core gui widgets
+
+QMAKE_CXXFLAGS += /permissive-
+
+SOURCES += \
+	main.cpp \
+	mainwindow.cpp
+
+HEADERS += \
+	mainwindow.h
+
+FORMS += \
+	mainwindow.ui
+
+PWD_ROOT_DIR = $$PWD
+CORE_ROOT_DIR = $$PWD/../../../../../core
+include($$CORE_ROOT_DIR/Common/base.pri)
+
+ADD_DEPENDENCY(kernel, graphics, UnicodeConverter)
+include($$CORE_ROOT_DIR/Common/3dParty/icu/icu.pri)

DesktopEditor/raster/Metafile/MetaFile.cpp

@@ -47,11 +47,18 @@ namespace MetaFile
 		return new CMetaFile(pAppFonts);
 	}
 
+	/**
+	 * @brief CMetaFile Constructor
+	 * @param pAppFonts
+	 *
+	 * Create a font manager accordingly Applications Fonts for the
+	 * appropriate metafile.
+	 */
 	CMetaFile::CMetaFile(NSFonts::IApplicationFonts *pAppFonts) : MetaFile::IMetaFile(pAppFonts)
 	{
 		m_pFontManager = NULL;
 		m_pAppFonts = pAppFonts;
-		// Создаем менеджер шрифтов с собственным кэшем
+
 		if (pAppFonts)
 		{
 			m_pFontManager = pAppFonts->GenerateFontManager();
@@ -60,28 +67,35 @@ namespace MetaFile
 			m_pFontManager->SetOwnerCache(pMeasurerCache);
 		}
 
-	#ifdef METAFILE_SUPPORT_WMF_EMF
-		m_oWmfFile.SetFontManager(m_pFontManager);
-		m_oEmfFile.SetFontManager(m_pFontManager);
-	#endif
-
-	#ifdef METAFILE_SUPPORT_SVM
-		m_oSvmFile.SetFontManager(m_pFontManager);
-	#endif
 		m_lType  = 0;
 	}
 
+	/**
+	 * @brief CMetaFile::get_FontManager
+	 * @return Pointer of current Font Manager
+	 */
 	NSFonts::IFontManager* CMetaFile::get_FontManager()
 	{
 		return m_pFontManager;
 	}
 
+	/**
+	 * @brief CMetaFile Destructor
+	 *
+	 * Close metafile and release memory, allocated for Font Manager
+	 */
 	CMetaFile::~CMetaFile()
 	{
 		Close();
 		RELEASEINTERFACE(m_pFontManager);
 	}
 
+	/**
+	 * @brief CMetaFile::ConvertToSvg
+	 * @param unWidth - width of picture from metafile (0 - default)
+	 * @param unHeight - height of picture from metafile (0 - default)
+	 * @return string containing svg content
+	 */
 	std::wstring CMetaFile::ConvertToSvg(unsigned int unWidth, unsigned int unHeight)
 	{
 
@@ -102,7 +116,16 @@ namespace MetaFile
 		return L"";
 	}
 
+	/**
+	 * @brief Methods for conversation in test examples
+	 */
 #ifdef METAFILE_SUPPORT_WMF_EMF
+	/**
+	 * @brief CMetaFile::ConvertToXml
+	 * @param wsFilePath - path to the file being saving (must be .xml)
+	 *
+	 * Convert and save metafile data to .xml
+	 */
 	void CMetaFile::ConvertToXml(const wchar_t *wsFilePath)
 	{
 		if (NULL == wsFilePath)
@@ -112,129 +135,17 @@ namespace MetaFile
 		m_oEmfFile.PlayMetaFile();
 	}
 
-	void CMetaFile::ConvertToXmlAndRaster(const wchar_t *wsXmlFilePath, const wchar_t *wsOutFilePath, unsigned int unFileType, int nWidth, int nHeight)
-	{
-		if (NULL == wsXmlFilePath || NULL == wsOutFilePath)
-			return;
-
-		m_oEmfFile.SetOutputDevice(NULL, wsXmlFilePath);
-
-		NSGraphics::IGraphicsRenderer* pGrRenderer = NSGraphics::Create();
-
-		NSFonts::IFontManager* pFontManager = m_pAppFonts->GenerateFontManager();
-		NSFonts::IFontsCache* pFontCache = NSFonts::NSFontCache::Create();
-		pFontCache->SetStreams(m_pAppFonts->GetStreams());
-		pFontManager->SetOwnerCache(pFontCache);
-
-		pGrRenderer->SetFontManager(pFontManager);
-
-		if (-1 == nHeight)
-		{
-			double dX, dY, dW, dH;
-			GetBounds(&dX, &dY, &dW, &dH);
-
-			if (dW < 0)
-				dW = -dW;
-			if (dH < 0)
-				dH = -dH;
-
-			if (nWidth < 0) nWidth = (int)(dW * 96 / 25.4);
-			nHeight = (int)((double)nWidth * dH / dW);
-		}
-
-		double dWidth  = 25.4 * nWidth / 96;
-		double dHeight = 25.4 * nHeight / 96;
-
-		BYTE* pBgraData = new(std::nothrow) BYTE[nWidth * nHeight * 4];
-		if (!pBgraData)
-			return;
-
-		unsigned int alfa = 0xffffff;
-		//дефолтный тон должен быть прозрачным, а не белым
-		//memset(pBgraData, 0xff, nWidth * nHeight * 4);
-		for (int i = 0; i < nWidth * nHeight; i++)
-		{
-			((unsigned int*)pBgraData)[i] = alfa;
-		}
-		CBgraFrame oFrame;
-		oFrame.put_Data(pBgraData);
-		oFrame.put_Width(nWidth);
-		oFrame.put_Height(nHeight);
-		oFrame.put_Stride(-4 * nWidth);
-
-		pGrRenderer->CreateFromBgraFrame(&oFrame);
-		pGrRenderer->SetSwapRGB(false);
-		pGrRenderer->put_Width(dWidth);
-		pGrRenderer->put_Height(dHeight);
-
-		DrawOnRenderer(wsXmlFilePath, pGrRenderer, 0, 0, dWidth, dHeight);
-
-		oFrame.SaveFile(wsOutFilePath, unFileType);
-
-		RELEASEINTERFACE(pFontManager);
-		RELEASEINTERFACE(pGrRenderer);
-	}
-
-	bool CMetaFile::DrawOnRenderer(const wchar_t *wsXmlFilePath, IRenderer *pRenderer, double dX, double dY, double dWidth, double dHeight)
-	{
-		if (NULL == wsXmlFilePath || NULL == pRenderer)
-			return false;
-
-		pRenderer->BeginCommand(c_nImageType);
-
-		switch (m_lType)
-		{
-		#ifdef METAFILE_SUPPORT_WMF_EMF
-			case c_lMetaWmf:
-			{
-				CMetaFileRenderer oWmfOut(m_oWmfFile.GetWmfParser(), pRenderer, dX, dY, dWidth, dHeight);
-				m_oWmfFile.SetOutputDevice((IOutputDevice*)&oWmfOut);
-				m_oWmfFile.PlayMetaFile();
-				break;
-			}
-			case c_lMetaEmf:
-			{
-				CMetaFileRenderer oEmfOut(m_oEmfFile.GetEmfParser(), pRenderer, dX, dY, dWidth, dHeight);
-				m_oEmfFile.SetOutputDevice((IOutputDevice*)&oEmfOut, wsXmlFilePath);
-				m_oEmfFile.PlayMetaFile();
-				break;
-			}
-		#endif
-		#ifdef METAFILE_SUPPORT_SVM
-			case c_lMetaSvm:
-			{
-				CMetaFileRenderer oSvmOut(&m_oSvmFile, pRenderer, dX, dY, dWidth, dHeight);
-				m_oSvmFile.SetOutputDevice((IOutputDevice*)&oSvmOut);
-				m_oSvmFile.PlayMetaFile();
-				break;
-			}
-		#endif
-		#ifdef METAFILE_SUPPORT_SVG
-			case c_lMetaSvg:
-			{
-				m_oSvgFile.Draw(pRenderer, dX, dY, dWidth, dHeight);
-				break;
-			}
-		#endif
-			default:
-				break;
-		}
-
-		pRenderer->EndCommand(c_nImageType);
-		return true;
-	}
-
+	/**
+	 * @brief CMetaFile::LoadFromXmlFile
+	 * @param wsFilePath - path to the source file (must be .xml)
+	 * @return if correct reading - return true, elde - false
+	 *
+	 * Load meta file content from source .xml file.
+	 * Remake Font Manager for metafile
+	 */
 	bool CMetaFile::LoadFromXmlFile(const wchar_t *wsFilePath)
 	{
-		RELEASEINTERFACE(m_pFontManager);
-
-		if (m_pAppFonts)
-		{
-			m_pFontManager = m_pAppFonts->GenerateFontManager();
-			NSFonts::IFontsCache* pMeasurerCache = NSFonts::NSFontCache::Create();
-			pMeasurerCache->SetStreams(m_pAppFonts->GetStreams());
-			m_pFontManager->SetOwnerCache(pMeasurerCache);
-		}
+		m_pFontManager->ClearOwnerCache();
 
 		m_oWmfFile.SetFontManager(m_pFontManager);
 		m_oEmfFile.SetFontManager(m_pFontManager);
@@ -264,6 +175,10 @@ namespace MetaFile
 		return false;
 	}
 
+	/**
+	 * @brief CMetaFile::ConvertToEmf
+	 * @param wsFilePath - path to the file being saving (must be .emf)
+	 */
 	void CMetaFile::ConvertToEmf(const wchar_t *wsFilePath)
 	{
 		if (m_lType != c_lMetaEmf || m_oEmfFile.GetEmfParser()->GetType() != EmfParserType::EmfxParser)
@@ -276,21 +191,18 @@ namespace MetaFile
 	}
 #endif
 
+	/**
+	 * @brief CMetaFile::LoadFromFile
+	 * @param wsFilePath - path to source file
+	 * @return if correct reading - return true, elde - false
+	 *
+	 * Load from source file
+	 * Remake Font Manager for metafile, for each picture
+	 * Check file extansion (wmf, emf, svm, svg)
+	 */
 	bool CMetaFile::LoadFromFile(const wchar_t *wsFilePath)
 	{
-		// TODO: Сейчас при загрузке каждой новой картинки мы пересоздаем
-		//       FontManager, потому что сейчас в нем кэш без ограничения.
-		//------------------------------------------------------
-
-		RELEASEINTERFACE(m_pFontManager);
-
-		if (m_pAppFonts)
-		{
-			m_pFontManager = m_pAppFonts->GenerateFontManager();
-			NSFonts::IFontsCache* pMeasurerCache = NSFonts::NSFontCache::Create();
-			pMeasurerCache->SetStreams(m_pAppFonts->GetStreams());
-			m_pFontManager->SetOwnerCache(pMeasurerCache);
-		}
+		m_pFontManager->ClearOwnerCache();
 
 	#ifdef METAFILE_SUPPORT_WMF_EMF
 		m_oWmfFile.SetFontManager(m_pFontManager);
@@ -305,10 +217,7 @@ namespace MetaFile
 		m_oSvgFile.SetFontManager(m_pFontManager);
 	#endif
 
-		//------------------------------------------------------
-
 	#ifdef METAFILE_SUPPORT_WMF_EMF
-		// Сначала пытаемся открыть файл как Wmf
 		if (m_oWmfFile.OpenFromWmfFile(wsFilePath) == true)
 		{
 			m_oWmfFile.Scan();
@@ -320,7 +229,7 @@ namespace MetaFile
 			}
 			m_oWmfFile.Close();
 		}
-		// Это не Wmf
+
 		if (m_oEmfFile.OpenFromEmfFile(wsFilePath) == true)
 		{
 			m_oEmfFile.Scan();
@@ -333,7 +242,7 @@ namespace MetaFile
 			m_oEmfFile.Close();
 		}
 	#endif
-		// Это не Emf
+
 	#ifdef METAFILE_SUPPORT_SVM
 		if (m_oSvmFile.OpenFromFile(wsFilePath) == true)
 		{
@@ -348,37 +257,47 @@ namespace MetaFile
 			m_oSvmFile.Close();
 		}
 	#endif
-		// Это не svm
+
 	#ifdef METAFILE_SUPPORT_SVG
 		if (m_oSvgFile.OpenFromFile(wsFilePath) == true)
 		{
 			m_lType = c_lMetaSvg;
 			return true;
 		}
-
 	#endif
 
 		return false;
 	}
 
+	/**
+	 * @brief CMetaFile::LoadFromBuffer
+	 * @param pBuffer - pointer of buffer whith metacontent
+	 *  for example, the buffer obtained after reading the file
+	 *   @code
+	 *   	NSFile::CFileBinary file;
+	 *  	file.OpenFile(L"file_name");
+	 *  	DWORD file_size = file.GetFileSize();
+	 *  	BYTE* data = new BYTE[file_size];
+	 *  	file.ReadFile(data, file_size);
+	 *   @endcode
+	 * @param unSize - buffer size (size of file or readed size)
+	 *   @code
+	 *   	DWORD readed_size;
+	 *   	file.ReadFile(data, file_size, readed_size);
+	 *   @endcode
+	 * @return if correct format load for extansion - return true,
+	 *   else - false
+	 *
+	 * Load metafile content from buffer
+	 * Remake Font Manager for metafile, for each picture
+	 * Check type of content in buffer, appropriate extension (wmf, emf, svm, svg)
+	 */
 	bool CMetaFile::LoadFromBuffer(BYTE *pBuffer, unsigned int unSize)
 	{
 		if (NULL == pBuffer || 0 == unSize)
 			return false;
 
-		// TODO: Сейчас при загрузке каждой новой картинки мы пересоздаем
-		//       FontManager, потому что сейчас в нем кэш без ограничения.
-		//------------------------------------------------------
-
-		RELEASEINTERFACE(m_pFontManager);
-
-		if (m_pAppFonts)
-		{
-			m_pFontManager = m_pAppFonts->GenerateFontManager();
-			NSFonts::IFontsCache* pMeasurerCache = NSFonts::NSFontCache::Create();
-			pMeasurerCache->SetStreams(m_pAppFonts->GetStreams());
-			m_pFontManager->SetOwnerCache(pMeasurerCache);
-		}
+		m_pFontManager->ClearOwnerCache();
 
 	#ifdef METAFILE_SUPPORT_WMF_EMF
 		m_oWmfFile.SetFontManager(m_pFontManager);
@@ -393,10 +312,7 @@ namespace MetaFile
 		m_oSvgFile.SetFontManager(m_pFontManager);
 	#endif
 
-		//------------------------------------------------------
-
 	#ifdef METAFILE_SUPPORT_WMF_EMF
-		// Сначала пытаемся открыть файл как Wmf
 		if (m_oWmfFile.ReadFromBuffer(pBuffer, unSize) == true)
 		{
 			m_oWmfFile.Scan();
@@ -408,7 +324,7 @@ namespace MetaFile
 			}
 			m_oWmfFile.Close();
 		}
-		// Это не Wmf
+
 		if (m_oEmfFile.ReadFromBuffer(pBuffer, unSize) == true)
 		{
 			m_oEmfFile.Scan();
@@ -421,7 +337,7 @@ namespace MetaFile
 			m_oEmfFile.Close();
 		}
 	#endif
-		// Это не Emf
+
 	#ifdef METAFILE_SUPPORT_SVM
 		if (m_oSvmFile.ReadFromBuffer(pBuffer, unSize) == true)
 		{
@@ -436,7 +352,7 @@ namespace MetaFile
 			m_oSvmFile.Close();
 		}
 	#endif
-		// Это не svm
+
 	#ifdef METAFILE_SUPPORT_SVG
 		if (m_oSvgFile.ReadFromBuffer(pBuffer, unSize) == true)
 		{
@@ -448,19 +364,18 @@ namespace MetaFile
 		return false;
 	}
 
+	/**
+	 * @brief CMetaFile::LoadFromString
+	 * @param data - source string, containing svg metadata (.svg extension type)
+	 * @return if correct read svg content - return true, else - false
+	 *
+	 * Load .svg content from wide string
+	 * Remake Font Manager for metafile, for each picture
+	 */
 	bool CMetaFile::LoadFromString(const std::wstring& data)
 	{
+		m_pFontManager->ClearOwnerCache();
 #ifdef METAFILE_SUPPORT_SVG
-		RELEASEINTERFACE(m_pFontManager);
-
-		if (m_pAppFonts)
-		{
-			m_pFontManager = m_pAppFonts->GenerateFontManager();
-			NSFonts::IFontsCache* pMeasurerCache = NSFonts::NSFontCache::Create();
-			pMeasurerCache->SetStreams(m_pAppFonts->GetStreams());
-			m_pFontManager->SetOwnerCache(pMeasurerCache);
-		}
-
 		m_oSvgFile.SetFontManager(m_pFontManager);
 
 		if (m_oSvgFile.ReadFromWString(data) == true)
@@ -472,6 +387,10 @@ namespace MetaFile
 		return false;
 	}
 
+	/**
+	 * @brief CMetaFile::SetTempDirectory
+	 * @param dir - path to working directory
+	 */
 	void CMetaFile::SetTempDirectory(const std::wstring& dir)
 	{
 #ifdef METAFILE_SUPPORT_SVG
@@ -479,7 +398,23 @@ namespace MetaFile
 #endif
 	}
 
-	bool CMetaFile::DrawOnRenderer(IRenderer* pRenderer, double dX, double dY, double dWidth, double dHeight)
+	/**
+	 * @brief CMetaFile::DrawOnRenderer
+	 * @param pRenderer - class instance of CGraphicsRenderer, which will render
+	 *  meta content
+	 * @param dX - start coordinate for X axis
+	 * @param dY - start coordinate for Y axis
+	 * @param dWidth - width of picture from metafile
+	 * @param dHeight - height of picture from metafile
+	 * @param wsXmlFilePath - path to the file being saveing as xml commands from
+	 * 	metafile (default - nullptr)
+	 * @return if none render - return false, else - true
+	 *
+	 * Check type of metacontent
+	 * Draw the meta file picture on renderer
+	 */
+	bool CMetaFile::DrawOnRenderer(IRenderer* pRenderer, double dX, double dY,
+								   double dWidth, double dHeight, const wchar_t* wsXmlFilePath)
 	{
 		if (NULL == pRenderer)
 			return false;
@@ -499,7 +434,10 @@ namespace MetaFile
 			case c_lMetaEmf:
 			{
 				CMetaFileRenderer oEmfOut(m_oEmfFile.GetEmfParser(), pRenderer, dX, dY, dWidth, dHeight);
-				m_oEmfFile.SetOutputDevice((IOutputDevice*)&oEmfOut);
+				if (wsXmlFilePath)
+					m_oEmfFile.SetOutputDevice((IOutputDevice*)&oEmfOut, wsXmlFilePath);
+				else
+					m_oEmfFile.SetOutputDevice((IOutputDevice*)&oEmfOut);
 				m_oEmfFile.PlayMetaFile();
 				break;
 			}
@@ -528,6 +466,11 @@ namespace MetaFile
 		return true;
 	}
 
+	/**
+	 * @brief CMetaFile::Close
+	 *
+	 * Close each type file (type = 0)
+	 */
 	void CMetaFile::Close()
 	{
 	#ifdef METAFILE_SUPPORT_WMF_EMF
@@ -542,11 +485,27 @@ namespace MetaFile
 		m_lType  = 0;
 	}
 
+	/**
+	 * @brief CMetaFile::GetType
+	 * @return type of metafile
+	 * @enum
+	 *	c_lMetaWmf = 0x01;
+	 *  c_lMetaEmf = 0x02;
+	 *  c_lMetaSvg = 0x04;
+	 *  c_lMetaSvm = 0x05;
+	 */
 	int  CMetaFile::GetType()
 	{
 		return m_lType;
 	}
 
+	/**
+	 * @brief CMetaFile::GetBounds
+	 * @param pdX - pointer to saving X coordinate of bounds
+	 * @param pdY - pointer to saving Y coordinate of bounds
+	 * @param pdW - pointer to saving Width of bounds
+	 * @param pdH - pointer to saving height of bounds
+	 */
 	void CMetaFile::GetBounds(double* pdX, double* pdY, double* pdW, double* pdH)
 	{
 		switch (m_lType)
@@ -609,11 +568,31 @@ namespace MetaFile
 		if (*pdH < 0) *pdH = -*pdH;
 	}
 
-	void CMetaFile::ConvertToRaster(const wchar_t* wsOutFilePath, unsigned int unFileType, int nWidth, int nHeight)
+	/**
+	 * @brief CMetaFile::ConvertToRaster
+	 * @param wsOutFilePath - path to the file being saving (must be raster graphics
+	 *  like .bmp, .png, etc.)
+	 * @param unFileType - type of raster file, see ENUM_CXIMAGE_FORMATS
+	 * 	for example .bmp = 1, .png = 4
+	 * @param unWidth - width of picture from metafile
+	 * @param unHeight - height of picture from metafile (default -1)
+	 * @param wsXmlOutFile(optional) - path to the file being saving metafile
+	 *	commands to .xml (default nullptr)
+	 *
+	 * Create Graphics Renderer and Font Manager
+	 * Draw metafile content on created renderer and save in raster graphics file
+	 */
+	void CMetaFile::ConvertToRaster(const wchar_t* wsOutFilePath, unsigned int unFileType, int nWidth, int nHeight, const wchar_t* wsXmlOutFile)
 	{
 		if (nWidth == 0 || nHeight == 0)
 			return;
 
+		if (NULL == wsOutFilePath)
+			return;
+
+		if (wsXmlOutFile != NULL)
+			m_oEmfFile.SetOutputDevice(NULL, wsXmlOutFile);
+
 		NSGraphics::IGraphicsRenderer* pGrRenderer = NSGraphics::Create();
 
 		NSFonts::IFontManager* pFontManager = m_pAppFonts->GenerateFontManager();
@@ -637,8 +616,8 @@ namespace MetaFile
 			nHeight = (int)((double)nWidth * dH / dW);
 		}
 
-		double dWidth  = 25.4 * nWidth / 96;
-		double dHeight = 25.4 * nHeight / 96;
+		double dWidth  = 25.4 * nWidth / 96;				// Get the width and height from pixels to mm
+		double dHeight = 25.4 * nHeight / 96;				// 96 - standart DPI for inch
 
 		BYTE* pBgraData = (BYTE*)malloc(nWidth * nHeight * 4);
 		if (!pBgraData)
@@ -658,12 +637,11 @@ namespace MetaFile
 			return;
 
 		unsigned int alfa = 0xffffff;
-		//дефолтный тон должен быть прозрачным, а не белым
-		//memset(pBgraData, 0xff, nWidth * nHeight * 4);
 		for (int i = 0; i < nWidth * nHeight; i++)
 		{
-			((unsigned int*)pBgraData)[i] = alfa;
+			((unsigned int*)pBgraData)[i] = alfa;			// Set default tone (must be transparent and not white)
 		}
+
 		CBgraFrame oFrame;
 		oFrame.put_Data(pBgraData);
 		oFrame.put_Width(nWidth);
@@ -675,10 +653,11 @@ namespace MetaFile
 		pGrRenderer->put_Width(dWidth);
 		pGrRenderer->put_Height(dHeight);
 
-		DrawOnRenderer(pGrRenderer, 0, 0, dWidth, dHeight);
+		DrawOnRenderer(pGrRenderer, 0, 0, dWidth, dHeight, wsXmlOutFile);
 
 		oFrame.SaveFile(wsOutFilePath, unFileType);
 		oFrame.put_Data(NULL);
+
 		RELEASEINTERFACE(pFontManager);
 		RELEASEINTERFACE(pGrRenderer);
 

DesktopEditor/raster/Metafile/MetaFile.h

@@ -56,36 +56,39 @@ typedef CSVGTransformer CSvgFile;
 
 namespace MetaFile
 {
+	/**
+	 * @class CMetaFile
+	 *
+	 * The interface provides various options for loading a metafile and saving it
+	 * in another format.
+	 */
 	class CMetaFile : public IMetaFile
 	{
 	public:
 		CMetaFile(NSFonts::IApplicationFonts *pAppFonts);
 		virtual ~CMetaFile();
+		void Close();
+
+		void SetTempDirectory(const std::wstring& dir);
 
 		bool LoadFromFile(const wchar_t* wsFilePath);
 		bool LoadFromBuffer(BYTE* pBuffer, unsigned int unSize);
 		bool LoadFromString(const std::wstring& data);
-		bool DrawOnRenderer(IRenderer* pRenderer, double dX, double dY, double dWidth, double dHeight);
-		void Close();
-		void GetBounds(double* pdX, double* pdY, double* pdW, double* pdH);
-		int GetType();
-		void ConvertToRaster(const wchar_t* wsOutFilePath, unsigned int unFileType, int nWidth, int nHeight = -1);
 
+		void ConvertToRaster(const wchar_t* wsOutFilePath, unsigned int unFileType,
+							 int nWidth, int nHeight = -1, const wchar_t* wsXmlOutFile = NULL);
+		std::wstring ConvertToSvg(unsigned int unWidth = 0, unsigned int unHeight = 0);
+		bool DrawOnRenderer(IRenderer* pRenderer, double dX, double dY,
+							double dWidth, double dHeight, const wchar_t* wsXmlFilePath = NULL);
+
+		int GetType();
+		void GetBounds(double* pdX, double* pdY, double* pdW, double* pdH);
 		NSFonts::IFontManager* get_FontManager();
 
-		//конвертация в Svg
-		std::wstring ConvertToSvg(unsigned int unWidth = 0, unsigned int unHeight = 0);
-
-		void SetTempDirectory(const std::wstring& dir);
-
-		//Для тестов
-	#ifdef METAFILE_SUPPORT_WMF_EMF
+		// For tests
 		void ConvertToXml(const wchar_t *wsFilePath);
-		void ConvertToXmlAndRaster(const wchar_t *wsXmlFilePath, const wchar_t* wsOutFilePath, unsigned int unFileType, int nWidth, int nHeight = -1);
 		bool LoadFromXmlFile(const wchar_t* wsFilePath);
-		bool DrawOnRenderer(const wchar_t *wsXmlFilePath, IRenderer* pRenderer, double dX, double dY, double dWidth, double dHeight);
 		void ConvertToEmf(const wchar_t* wsFilePath);
-	#endif
 
 
 	private:

MsBinaryFile/XlsFile/Format/Logic/Biff_structures/StringPtgParser.cpp

@@ -317,6 +317,9 @@ const bool StringPtgParser::parseToPtgs(const std::wstring& assembled_formula, R
                             [&](XLS::GlobalWorkbookInfo::_xti i) {
                         return i.iSup == ixti;
                     });
+                    if(pos->itabFirst == pos->itabLast)
+                        rgce.addPtg(found_operand = OperandPtgPtr(new PtgRef3d(ixti, operand_str, OperandPtg::ptg_VALUE, rgce.getLocation())));
+                    else
                         rgce.addPtg(found_operand = OperandPtgPtr(new PtgRef3d(ixti, operand_str, OperandPtg::ptg_REFERENCE, rgce.getLocation())));
                 }
                 else if(SyntaxPtg::extract_PtgRefErr(it, itEnd))

OOXML/Binary/Sheets/Reader/BinaryWriter.cpp

@@ -2663,9 +2663,6 @@ void BinaryWorkbookTableWriter::WritePivotCache(OOX::Spreadsheet::CWorkbook& wor
             {
                 nCurPos = m_oBcw.WriteItemStart(c_oSer_PivotTypes::cache);
                 NSStringUtils::CStringBuilder writer;
-                writer.WriteString(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>");
-                if(pivotCacheFile->m_oPivotCashDefinition->m_oRid.IsInit())
-                    pivotCacheFile->m_oPivotCashDefinition->m_oRid.reset();
                 pivotCacheFile->m_oPivotCashDefinition->toXML(writer);
                 auto wstringData = writer.GetData();
                 m_oBcw.m_oStream.WriteStringUtf8(wstringData);

OOXML/Binary/Sheets/Writer/BinaryReader.cpp

@@ -3493,7 +3493,7 @@ int BinaryWorkbookTableReader::ReadPivotCaches(BYTE type, long length, void* poR
 				NSCommon::smart_ptr<OOX::File> pFileRecords(oPivotCachesTemp.pRecords);
 				srIdRecords = pDefinitionFile->Add(pFileRecords).ToString();
 			}
-            pDefinitionFile->setData(oPivotCachesTemp.pDefinitionData, oPivotCachesTemp.nDefinitionLength, srIdRecords);
+			pDefinitionFile->setData(oPivotCachesTemp.pDefinitionData, oPivotCachesTemp.nDefinitionLength, L"");
 			
 			NSCommon::smart_ptr<OOX::File> pFile(pDefinitionFile);
 			OOX::RId rIdDefinition = m_oWorkbook.Add(pFile);

OOXML/PPTXFormat/DrawingConverter/ASCOfficeDrawingConverter.cpp

@@ -2592,8 +2592,6 @@ void CDrawingConverter::ConvertShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::CX
 		
 		if (bPicture && false == pPPTShape->m_oSignatureLine.IsInit())
 		{
-			bStroked = false;
-
 			pPicture = new PPTX::Logic::Pic();
 			elem->InitElem(pPicture);
 

OOXML/XlsbFormat/Biff12_records/BeginSXPI.h

@@ -51,11 +51,11 @@ namespace XLSB
 			void readFields(XLS::CFRecord& record) override;
 			void writeFields(XLS::CFRecord& record) override;
 
-            _INT32              isxvd = 0;
-            _UINT32             isxvi = 0x001000FE;
-            _INT32              isxth = -1;
-            bool                fUnique = false;
-            bool                fDisplay = false;
+            _INT32              isxvd;
+            _UINT32             isxvi;
+            _INT32              isxth;
+            bool                fUnique;
+            bool                fDisplay;
             XLWideString        irstUnique;
             XLWideString        irstDisplay;
     };

OOXML/XlsxFormat/Pivot/Pivots.cpp

@@ -1885,15 +1885,13 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
 		if(m_oHier.IsInit())
 			ptr->isxth = m_oHier.get();
 		if(m_oName.IsInit())
-        {
 			ptr->irstUnique = m_oName.get();
-            ptr->fUnique = true;
-        }
+		else
+		 	ptr->irstUnique = 0xFFFFFFFF;
 		if(m_oCap.IsInit())
-        {
 			ptr->irstDisplay = m_oCap.get();
-            ptr->fDisplay = true;
-        }
+		else
+			ptr->irstDisplay = 0xFFFFFFFF;
 		return objectPtr;
 	}
     void CPageField::fromBin(XLS::BaseObjectPtr& obj)
@@ -4174,6 +4172,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
 		writer.WriteString(L"<cacheField");
 			WritingStringNullableAttrEncodeXmlString2(L"name",	m_oName);
 			WritingStringNullableAttrEncodeXmlString2(L"caption",m_oCaption);
+			WritingStringNullableAttrBool2(L"databaseField",	m_oDatabaseField);
 			WritingStringNullableAttrBool2(L"serverField",	m_oServerField);
 			WritingStringNullableAttrEncodeXmlString2(L"pPropertyName",m_oPropertyName);
 			WritingStringNullableAttrEncodeXmlString2(L"formula",m_oFormula);
@@ -4184,7 +4183,6 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
 			WritingStringNullableAttrInt(L"level", m_oLevel, m_oLevel->GetValue());
 			WritingStringNullableAttrInt(L"mappingCount", m_oMappingCount, m_oMappingCount->GetValue());
 			WritingStringNullableAttrInt(L"numFmtId", m_oNumFmtId, m_oNumFmtId->GetValue());
-            WritingStringNullableAttrBool2(L"databaseField",	m_oDatabaseField);
         if(!m_oSharedItems.IsInit() && !m_oFieldGroup.IsInit())
         {
             writer.WriteString(L"/>");
@@ -4408,29 +4406,22 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
 	void CSharedItems::toXML(NSStringUtils::CStringBuilder& writer) const
 	{
 		writer.WriteString(L"<sharedItems");
-            WritingStringNullableAttrBool2(L"containsSemiMixedTypes",	m_oContainsSemiMixedTypes);
-            WritingStringNullableAttrBool2(L"containsNonDate",	m_oContainsNonDate);
-            WritingStringNullableAttrBool2(L"containsDate",	m_oContainsDate);
-            WritingStringNullableAttrBool2(L"containsString",	m_oContainsString);
+			WritingStringAttrInt(L"count", (int)m_arrItems.size());
 			WritingStringNullableAttrBool2(L"containsBlank",	m_oContainsBlank);
-            WritingStringNullableAttrBool2(L"containsMixedTypes",	m_oContainsMixedTypes);
-            WritingStringNullableAttrBool2(L"containsNumber",	m_oContainsNumber);
+			WritingStringNullableAttrBool2(L"containsDate",	m_oContainsDate);
 			WritingStringNullableAttrBool2(L"containsInteger",	m_oContainsInteger);
+			WritingStringNullableAttrBool2(L"containsMixedTypes",	m_oContainsMixedTypes);
+			WritingStringNullableAttrBool2(L"containsNonDate",	m_oContainsNonDate);
+			WritingStringNullableAttrBool2(L"containsNumber",	m_oContainsNumber);
+			WritingStringNullableAttrBool2(L"containsSemiMixedTypes",	m_oContainsSemiMixedTypes);
+			WritingStringNullableAttrBool2(L"containsString",	m_oContainsString);
+			WritingStringNullableAttrBool2(L"longText",	m_oLongText);
 			WritingStringNullableAttrDouble2(L"minValue",	m_oMinValue);
 			WritingStringNullableAttrDouble2(L"maxValue",	m_oMaxValue);
 			WritingStringNullableAttrString(L"minDate", m_oMinDate, m_oMinDate->ToString());
 			WritingStringNullableAttrString(L"maxDate", m_oMaxDate, m_oMaxDate->ToString());
-            if(!m_arrItems.empty())
-            {
-                WritingStringAttrInt(L"count", (int)m_arrItems.size());
-            }
-            WritingStringNullableAttrBool2(L"longText",	m_oLongText);
-        if(m_arrItems.empty())
-        {
-            writer.WriteString(L"/>");
-            return;
-        }
-        writer.WriteString(L">");
+		writer.WriteString(L">");
+
 		for ( size_t i = 0; i < m_arrItems.size(); ++i)
         {
             if (  m_arrItems[i] )
@@ -5136,7 +5127,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
 //------------------------------------
 	void CRangeGroupingProperties::toXML(NSStringUtils::CStringBuilder& writer) const
 	{
-        writer.WriteString(L"<rangePr");
+		writer.WriteString(L"<reference");
 			WritingStringNullableAttrString(L"groupBy",		m_oGroupBy, m_oGroupBy->ToString());
 			WritingStringNullableAttrBool2(L"autoStart",	m_oAutoStart);
 			WritingStringNullableAttrBool2(L"autoEnd",		m_oAutoEnd);
@@ -5844,11 +5835,6 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
 			}
 			WritingStringNullableAttrBool2(L"f",	m_oCalculated);
 			WritingStringNullableAttrBool2(L"u",	m_oUnused);
-        if(m_arrItems.empty())
-        {
-            writer.WriteString(L"/>");
-            return;
-        }
 		writer.WriteString(L">");
 
 		for ( size_t i = 0; i < m_arrItems.size(); ++i)
@@ -5981,11 +5967,6 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
 			}
 			WritingStringNullableAttrBool2(L"f",	m_oCalculated);
 			WritingStringNullableAttrBool2(L"u",	m_oUnused);
-        if(m_arrItems.empty())
-        {
-            writer.WriteString(L"/>");
-            return;
-        }
 		writer.WriteString(L">");
 
 		for ( size_t i = 0; i < m_arrItems.size(); ++i)
@@ -6883,8 +6864,8 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
 	void CFieldGroupProperties::toXML(NSStringUtils::CStringBuilder& writer) const
 	{
 		writer.WriteString(L"<fieldGroup");
+			WritingStringNullableAttrInt(L"base", m_oBase, m_oBase->GetValue());
 			WritingStringNullableAttrInt(L"par", m_oPar, m_oPar->GetValue());
-            WritingStringNullableAttrInt(L"base", m_oBase, m_oBase->GetValue());
 		writer.WriteString(L">");
 
 		if(m_oDiscretePr.IsInit())

PdfFile/PdfWriter.cpp

@@ -2176,8 +2176,6 @@ HRESULT CPdfWriter::AddAnnotField(NSFonts::IApplicationFonts* pAppFonts, CAnnotF
 			pWidgetAnnot->SetDV(pPr->GetDV());
 		if (nFlags & (1 << 18))
 			pWidgetAnnot->SetT(pPr->GetT());
-		if (nFlags & (1 << 20))
-			pWidgetAnnot->SetOMetadata(pPr->GetOMetadata());
 
 		const std::vector<CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget*> arrActions = pPr->GetActions();
 		for (CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget* pAction : arrActions)

PdfFile/SrcReader/Adaptors.cpp

@@ -185,14 +185,6 @@ bool GlobalParamsAdaptor::GetCMap(const char* sName, char*& pData, unsigned int&
 
     return false;
 }
-void GlobalParamsAdaptor::AddTextFormField(const std::wstring& sText)
-{
-	m_sTextFormField += sText;
-}
-std::string GlobalParamsAdaptor::GetTextFormField()
-{
-	return U_TO_UTF8(m_sTextFormField);
-}
 
 bool operator==(const Ref &a, const Ref &b)
 {

PdfFile/SrcReader/Adaptors.h

@@ -59,7 +59,6 @@ class GlobalParamsAdaptor : public GlobalParams
     BYTE* m_bCMapData;
     DWORD m_nCMapDataLength;
 
-	std::wstring m_sTextFormField;
     bool m_bDrawFormField;
 
 public:
@@ -91,8 +90,6 @@ public:
     void SetCMapMemory(BYTE* pData, DWORD nSizeData);
     bool GetCMap(const char* sName, char*& pData, unsigned int& nSize);
 
-	void AddTextFormField(const std::wstring& sText);
-	std::string GetTextFormField();
     void setDrawFormField(bool bDrawFormField) { m_bDrawFormField = bDrawFormField; }
     bool getDrawFormField() { return m_bDrawFormField; }
 private:

PdfFile/SrcReader/PdfAnnot.cpp

@@ -1274,7 +1274,7 @@ CAnnotWidgetCh::CAnnotWidgetCh(PDFDoc* pdfDoc, AcroFormField* pField) : CAnnotWi
 
 	Object oOpt;
 	// 10 - Список значений
-	if (oField.dictLookup("Opt", &oOpt)->isArray())
+	if (pField->fieldLookup("Opt", &oOpt)->isArray())
 	{
 		m_unFlags |= (1 << 10);
 		int nOptLength = oOpt.arrayGetLength();
@@ -1502,9 +1502,6 @@ CAnnotWidget::CAnnotWidget(PDFDoc* pdfDoc, AcroFormField* pField) : CAnnot(pdfDo
 	// 18 - Частичное имя поля - T
 	m_sT = DictLookupString(&oField, "T", 18);
 
-	// 20 - OO метаданные форм - OMetadata
-	m_sOMetadata = DictLookupString(&oField, "OMetadata", 20);
-
 	// Action - A
 	Object oAction;
 	if (pField->fieldLookup("A", &oAction)->isDict())
@@ -3548,7 +3545,6 @@ void CAnnotAP::WriteAppearance(unsigned int nColor, CAnnotAPView* pView)
 	}
 
 	pView->pAP = pSubMatrix;
-	pView->sText = ((GlobalParamsAdaptor*)globalParams)->GetTextFormField();
 }
 BYTE CAnnotAP::GetBlendMode()
 {
@@ -3581,14 +3577,6 @@ void CAnnotAP::ToWASM(NSWasm::CData& oRes)
 		oRes.AddInt(npSubMatrix >> 32);
 
 		oRes.WriteBYTE(m_arrAP[i]->nBlendMode);
-
-		if (m_arrAP[i]->sText.empty())
-			oRes.WriteBYTE(0);
-		else
-		{
-			oRes.WriteBYTE(1);
-			oRes.WriteString(m_arrAP[i]->sText);
-		}
 	}
 }
 void CAnnots::ToWASM(NSWasm::CData& oRes)
@@ -3732,8 +3720,6 @@ void CAnnotWidget::ToWASM(NSWasm::CData& oRes)
 		oRes.WriteString(m_sT);
 	if (m_unFlags & (1 << 19))
 		oRes.WriteString(m_sButtonFontName);
-	if (m_unFlags & (1 << 20))
-		oRes.WriteString(m_sOMetadata);
 	oRes.AddInt(m_arrAction.size());
 	for (int i = 0; i < m_arrAction.size(); ++i)
 	{

PdfFile/SrcReader/PdfAnnot.h

@@ -129,7 +129,6 @@ private:
 		BYTE nBlendMode;
 		std::string sAPName;
 		std::string sASName;
-		std::string sText;
 		BYTE* pAP;
 	};
 
@@ -247,7 +246,6 @@ private:
 	std::string m_sT; // Частичное имя поля - T
 	std::string m_sFontKey; // Уникальный идентификатор шрифта
 	std::string m_sFontName; // Имя шрифта - из DA
-	std::string m_sOMetadata; // OO метаданные формы
 	std::string m_sActualFontName; // Имя замененного шрифта
 	std::string m_sButtonFontName; // Имя шрифта кнопки
 };

PdfFile/SrcReader/RendererOutputDev.cpp

@@ -2518,8 +2518,6 @@ namespace PdfReader
 					}
 				}
 			}
-			if (((GlobalParamsAdaptor*)globalParams)->getDrawFormField())
-				((GlobalParamsAdaptor*)globalParams)->AddTextFormField(wsUnicodeText);
 #endif
 			m_pRenderer->CommandDrawTextEx(wsUnicodeText, &unGid, unGidsCount, PDFCoordsToMM(dShiftX), PDFCoordsToMM(dShiftY), PDFCoordsToMM(dDx), PDFCoordsToMM(dDy));
 			if (bReplace)

PdfFile/SrcWriter/Annotation.cpp

@@ -1628,16 +1628,6 @@ namespace PdfWriter
 			pOwner->Add("T", new CStringObject(sValue.c_str(), true));
 		}
 	}
-	void CWidgetAnnotation::SetOMetadata(const std::wstring& wsOMetadata)
-	{
-		std::string sValue = U_TO_UTF8(wsOMetadata);
-		CDictObject* pOwner = GetObjOwnValue("OMetadata");
-		if (!pOwner)
-		{
-			pOwner = this;
-			pOwner->Add("OMetadata", new CStringObject(sValue.c_str(), true));
-		}
-	}
 	void CWidgetAnnotation::SetBC(const std::vector<double>& arrBC)
 	{
 		CheckMK();

PdfFile/SrcWriter/Annotation.h

@@ -447,7 +447,6 @@ namespace PdfWriter
 		void SetDS(const std::wstring& wsDS);
 		void SetDV(const std::wstring& wsDV);
 		void SetT (const std::wstring& wsT);
-		void SetOMetadata(const std::wstring& wsOMetadata);
 		void SetBC(const std::vector<double>& arrBC);
 		void SetBG(const std::vector<double>& arrBG);
 		void AddAction(CAction* pAction);