Fix cryptopp win_xp build

Common/3dParty/cryptopp/project/cryptopp.pro

@@ -20,6 +20,9 @@ DEFINES += CRYPTOPP_DISABLE_ASM
 DEFINES += DISABLE_TYPE_MISMATCH\
 #DEFINES += USE_PRECOMPILED_HEADERS
 
+# use old CryptoAPI for xp build
+build_xp:DEFINES += USE_MS_CRYPTOAPI
+
 core_android {
     INCLUDEPATH += $$(ANDROID_NDK_ROOT)/sources/android/cpufeatures
 }

DesktopEditor/doctrenderer/embed/GraphicsEmbed.cpp

@@ -1,6 +1,4 @@
 #include "../graphics.h"
-#include <map>
-#include "../../../Common/Network/FileTransporter/include/FileTransporter.h"
 
 // APPLICATION INFO
 class CGraphicsAppImage_private
@@ -12,8 +10,6 @@ public:
 	std::wstring m_sThemesDirectory;
 	bool m_bIsRgba;
 
-	std::map<std::wstring, std::wstring> m_mapDownloads;
-
 	CGraphicsAppImage_private()
 	{
 		m_pFonts = NULL;
@@ -25,52 +21,6 @@ public:
 	~CGraphicsAppImage_private()
 	{
 		RELEASEINTERFACE(m_pFonts);
-
-		for (std::map<std::wstring, std::wstring>::iterator i = m_mapDownloads.begin(); i != m_mapDownloads.end(); i++)
-		{
-			std::wstring sTmp = i->second;
-			if (NSFile::CFileBinary::Exists(sTmp))
-				NSFile::CFileBinary::Remove(sTmp);
-		}
-	}
-
-	bool IsNeedDownload(const std::wstring& sUrl)
-	{
-		if ((0 == sUrl.find(L"www.")) ||
-			(0 == sUrl.find(L"http://")) ||
-			(0 == sUrl.find(L"https://")))
-			return true;
-		return false;
-	}
-
-	std::wstring GetImagePath(const std::wstring& sUrl)
-	{
-		std::map<std::wstring, std::wstring>::iterator find = m_mapDownloads.find(sUrl);
-		if (find != m_mapDownloads.end())
-			return find->second;
-
-		NSNetwork::NSFileTransport::CFileDownloader oDownloader(sUrl, false);
-
-		std::wstring sTmpFile = NSFile::CFileBinary::CreateTempFileWithUniqueName(NSFile::CFileBinary::GetTempPath(), L"IMG");
-		if (NSFile::CFileBinary::Exists(sTmpFile))
-			NSFile::CFileBinary::Remove(sTmpFile);
-		sTmpFile = sTmpFile + L".png";
-
-		oDownloader.SetFilePath(sTmpFile);
-		oDownloader.Start(0);
-		while ( oDownloader.IsRunned() )
-		{
-			NSThreads::Sleep( 10 );
-		}
-		bool bIsDownloaded = oDownloader.IsFileDownloaded();
-
-		if (bIsDownloaded)
-		{
-			m_mapDownloads.insert(std::pair<std::wstring, std::wstring>(sUrl, sTmpFile));
-			return sTmpFile;
-		}
-
-		return sUrl;
 	}
 };
 
@@ -320,19 +270,11 @@ JSSmart<CJSValue> CGraphicsEmbed::ClearLastFont()
 }
 JSSmart<CJSValue> CGraphicsEmbed::drawImage2(JSSmart<CJSValue> img, JSSmart<CJSValue> x, JSSmart<CJSValue> y, JSSmart<CJSValue> w, JSSmart<CJSValue> h, JSSmart<CJSValue> alpha, JSSmart<CJSValue> srcRect)
 {
-	std::wstring sUrl = img->toStringW();
-	if (m_pInternal->m_pAppImage && m_pInternal->m_pAppImage->m_internal->IsNeedDownload(sUrl))
-		sUrl = m_pInternal->m_pAppImage->m_internal->GetImagePath(sUrl);
-
-	m_pInternal->drawImage(sUrl, x->toDouble(), y->toDouble(), w->toDouble(), h->toDouble(), alpha->toInt32());
+	m_pInternal->drawImage(img->toStringW(), x->toDouble(), y->toDouble(), w->toDouble(), h->toDouble(), alpha->toInt32());
 	return NULL;
 }
 JSSmart<CJSValue> CGraphicsEmbed::drawImage (JSSmart<CJSValue> img, JSSmart<CJSValue> x, JSSmart<CJSValue> y, JSSmart<CJSValue> w, JSSmart<CJSValue> h, JSSmart<CJSValue> alpha, JSSmart<CJSValue> srcRect, JSSmart<CJSValue> nativeImage)
 {
-	std::wstring sUrl = img->toStringW();
-	if (m_pInternal->m_pAppImage && m_pInternal->m_pAppImage->m_internal->IsNeedDownload(sUrl))
-		sUrl = m_pInternal->m_pAppImage->m_internal->GetImagePath(sUrl);
-
 	m_pInternal->drawImage(img->toStringW(), x->toDouble(), y->toDouble(), w->toDouble(), h->toDouble(), alpha->toInt32());
 	return NULL;
 }
@@ -637,11 +579,7 @@ JSSmart<CJSValue> CGraphicsEmbed::GetBrushColor()
 }
 JSSmart<CJSValue> CGraphicsEmbed::put_brushTexture(JSSmart<CJSValue> src, JSSmart<CJSValue> type)
 {
-	std::wstring sUrl = src->toStringW();
-	if (m_pInternal->m_pAppImage && m_pInternal->m_pAppImage->m_internal->IsNeedDownload(sUrl))
-		sUrl = m_pInternal->m_pAppImage->m_internal->GetImagePath(sUrl);
-
-	m_pInternal->put_brushTexture(sUrl, type->toInt32());
+	m_pInternal->put_brushTexture(src->toStringW(), type->toInt32());
 	return NULL;
 }
 JSSmart<CJSValue> CGraphicsEmbed::put_brushTextureMode(JSSmart<CJSValue> mode)

DesktopEditor/doctrenderer/embed/GraphicsEmbed.h

@@ -31,8 +31,6 @@ public:
 
 private:
 	CGraphicsAppImage_private* m_internal;
-
-	friend class CGraphicsEmbed;
 };
 
 namespace NSGraphics { class CGraphics; }

DesktopEditor/doctrenderer/graphics.cpp

@@ -313,10 +313,7 @@ namespace NSGraphics
 	}
 	void CGraphics::drawImage(const std::wstring& img, double x, double y, double w, double h, BYTE alpha)
 	{
-		std::wstring strImage = img;
-		if (!NSFile::CFileBinary::Exists(img))
-			strImage = (0 == img.find(L"theme") ? m_pAppImage->GetThemesDirectory() : m_pAppImage->GetImagesDirectory()) + L'/' + img;
-
+		std::wstring strImage = (0 == img.find(L"theme") ? m_pAppImage->GetThemesDirectory() : m_pAppImage->GetImagesDirectory()) + L'/' + img;
 #ifdef ENABLE_GR_LOGS
 		std::wcout << L"drawImage " << strImage << L"  " << x << "  " << y << L"  " << w << L"  " << h << L"  " << alpha << std::endl;
 #endif
@@ -1253,10 +1250,7 @@ namespace NSGraphics
 		}
 		else
 		{
-			std::wstring strImage = src;
-			if (!NSFile::CFileBinary::Exists(src))
-				strImage = (0 == src.find(L"theme") ? m_pAppImage->GetThemesDirectory() : m_pAppImage->GetImagesDirectory()) + L'/' + src;
-
+			std::wstring strImage = (0 == src.find(L"theme") ? m_pAppImage->GetThemesDirectory() : m_pAppImage->GetImagesDirectory()) + L'/' + src;
 			std::wstring sName = strImage.substr(0, strImage.rfind(L'.') + 1);
 			std::wstring sExt = src.substr(src.rfind(L'.') + 1);
 			if (sExt == L"svg")

DesktopEditor/doctrenderer/js_internal/v8/v8_base.h

@@ -54,9 +54,9 @@ v8::Local<v8::String> CreateV8String(v8::Isolate* i, const std::string& str);
 
 #ifdef __ANDROID__
 
-//#ifdef _DEBUG
+#ifdef _DEBUG
 #define ANDROID_LOGS
-//#endif
+#endif
 
 #ifdef ANDROID_LOGS
 #include <android/log.h>

DesktopEditor/graphics/BooleanOperations.cpp

@@ -232,7 +232,6 @@ double Curve::GetTimeOf(const PointD& point) const noexcept
 				if (getDistance(point, GetPoint(u)) <= GEOMETRIC_EPSILON)
 					return u;
 			}
-			roots.clear();
 		}
 	}
 	bool firstDist = d0 <= GEOMETRIC_EPSILON,
@@ -996,7 +995,7 @@ void CBooleanOperations::TracePaths()
 			start = true;
 		while (valid)
 		{
-			if (!start || (Op == Intersection && s.Inters && !GetNextSegment(s).Inters))
+			if (!start || (Op == Intersection && s.Inters))
 				SetVisited(s);
 
 			if (start)