--- a/cuneiform_src/Kern/rout/src/codetables.cpp 2018-05-08 08:00:15.521897703 +0300 +++ b/cuneiform_src/Kern/rout/src/codetables.cpp 2018-05-08 08:01:18.895096283 +0300 @@ -939,11 +939,11 @@ const char * getUTF8Str(const unsigned char in, const int codepage) { switch(codepage) { - case 1250 : return win1250_to_utf8[in]; - case 1251 : return win1251_to_utf8[in]; - case 1252 : return win1252_to_utf8[in]; - case 1254 : return win1254_to_utf8[in]; - case 1257 : return win1257_to_utf8[in]; + case 1250 : return (const char*)win1250_to_utf8[in]; + case 1251 : return (const char*)win1251_to_utf8[in]; + case 1252 : return (const char*)win1252_to_utf8[in]; + case 1254 : return (const char*)win1254_to_utf8[in]; + case 1257 : return (const char*)win1257_to_utf8[in]; default : return "?"; } } --- a/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp 2018-05-08 07:56:01.705770739 +0300 +++ b/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp 2018-05-08 07:57:14.052283572 +0300 @@ -594,8 +594,8 @@ return FALSE; } - wNewHeight = (mbMarginsFlag ? abs(mrMargins.rmBottomMarg - mrMargins.rmTopMarg) : mpSourceDIB->GetLinesNumber()); - wNewWidth = (mbMarginsFlag ? abs(mrMargins.rmLeftMarg - mrMargins.rmRightMarg) : mpSourceDIB->GetLineWidth()); + wNewHeight = (mbMarginsFlag ? abs((int32_t)mrMargins.rmBottomMarg - (int32_t)mrMargins.rmTopMarg) : mpSourceDIB->GetLinesNumber()); + wNewWidth = (mbMarginsFlag ? abs((int32_t)mrMargins.rmLeftMarg - (int32_t)mrMargins.rmRightMarg) : mpSourceDIB->GetLineWidth()); mpSourceDIB->GetResolutionDPM( &wXResolution, &wYResolution); if ( !mpDestinationDIB->CreateDIBBegin( wNewWidth, wNewHeight, BitCount) ) --- a/cuneiform_src/Kern/rfrmt/sources/main/stdafx.h 2018-05-08 08:04:21.664707650 +0300 +++ b/cuneiform_src/Kern/rfrmt/sources/main/stdafx.h 2018-05-08 08:07:22.074324037 +0300 @@ -66,6 +66,8 @@ #pragma once #endif // _MSC_VER >= 1000 +#include + #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers /*#include */ #include @@ -74,7 +76,6 @@ //отключаем warning о слишком длинных stl'ных именах #pragma warning(disable:4786) -#include typedef std::vector vectorWord; #include --- a/cuneiform_src/Kern/rfrmt/sources/main/frmt.cpp 2018-05-08 08:02:37.968261479 +0300 +++ b/cuneiform_src/Kern/rfrmt/sources/main/frmt.cpp 2018-05-08 08:03:37.801467587 +0300 @@ -72,6 +72,8 @@ #endif #include #include +#undef min +#undef max #include "stdafx.h" #include "resource.h" #include "rfrmt.h" --- a/cuneiform_src/Kern/include/utf8-tables.h 2018-05-08 07:58:04.155510368 +0300 +++ b/cuneiform_src/Kern/include/utf8-tables.h 2018-05-08 07:59:13.862028814 +0300 @@ -68,7 +68,7 @@ #endif -const char win1250_to_utf8[][4] = { +const unsigned char win1250_to_utf8[][4] = { {0, 0, 0, 0}, {1, 0, 0, 0}, {2, 0, 0, 0}, @@ -328,7 +328,7 @@ }; -const char win1251_to_utf8[][4] = { +const unsigned char win1251_to_utf8[][4] = { {0, 0, 0, 0}, {1, 0, 0, 0}, {2, 0, 0, 0}, @@ -587,7 +587,7 @@ {209, 143, 0, 0}, }; -const char win1252_to_utf8[][4] = { +const unsigned char win1252_to_utf8[][4] = { {0, 0, 0, 0}, {1, 0, 0, 0}, {2, 0, 0, 0}, @@ -847,7 +847,7 @@ }; -const char win1254_to_utf8[][4] = { +const unsigned char win1254_to_utf8[][4] = { {0, 0, 0, 0}, {1, 0, 0, 0}, {2, 0, 0, 0}, @@ -1107,7 +1107,7 @@ }; -const char win1257_to_utf8[][4] = { +const unsigned char win1257_to_utf8[][4] = { {0, 0, 0, 0}, {1, 0, 0, 0}, {2, 0, 0, 0},