no base 64 data

a70087e1 · Oleg Korshul · c3da9a66 · a70087e1 · a70087e1
Commit a70087e1 authored Aug 09, 2017 by Oleg Korshul
Showing with 1178 additions and 1163 deletions

DesktopEditor/doctrenderer/doctrenderer.cpp DesktopEditor/doctrenderer/doctrenderer.cpp +1165 -1158

DesktopEditor/doctrenderer/nativecontrol.h DesktopEditor/doctrenderer/nativecontrol.h +13 -5

No files found.
--- a/DesktopEditor/doctrenderer/doctrenderer.cpp
+++ b/DesktopEditor/doctrenderer/doctrenderer.cpp
--- a/DesktopEditor/doctrenderer/nativecontrol.h
+++ b/DesktopEditor/doctrenderer/nativecontrol.h
@@ -674,12 +674,20 @@ public:

        m_nLen = read_int2(pData, nCur, nLen);

-        m_pData = new BYTE[m_nLen];
-        m_pDataCur = m_pData;
-
-        read_base64_2(pData, nCur, nLen);
+        if (nVersion < 10)
+        {
+            m_pData = new BYTE[m_nLen];
+            m_pDataCur = m_pData;
+            read_base64_2(pData, nCur, nLen);

-        delete[]pData;
+            delete[]pData;
+        }
+        else
+        {
+            m_nLen = nLen;
+            m_pData = (BYTE*)pData;
+            m_pDataCur = m_pData + m_nLen;
+        }

        return nVersion;
    }