Compare commits

...

3 Commits

Author SHA1 Message Date
2fc5a4f37a . 2019-07-05 12:15:34 +03:00
25af6b2ecf x2t - fix bug #41757 2019-07-05 12:02:41 +03:00
5d5e7bce72 Speed up cloning openssl (#169)
Before:
```
real    3m6,793s
user    0m28,249s
sys     0m5,641s
```

After:
```
real    0m13,834s
user    0m2,169s
sys     0m0,838s
```
2019-07-04 11:42:54 +03:00
7 changed files with 23 additions and 6 deletions

View File

@ -139,7 +139,7 @@ public:
while(pos < size)
{
if (pos + 5 > size)
if (pos + 5 >= size)
{
result += expr[pos++];
continue;

View File

@ -70,7 +70,8 @@ namespace ODRAW
class CBaseShape
{
public:
std::vector<long> m_arAdjustments;
std::vector<long> m_arAbsMaxAdjustments;
std::vector<long> m_arAdjustments;
std::vector<double> m_arGuides;
LONG m_eJoin;
bool m_bConcentricFill;
@ -139,6 +140,10 @@ namespace ODRAW
m_strPath = Shape->m_strPath;
m_strRect = Shape->m_strRect;
m_arAbsMaxAdjustments.clear();
for(size_t i = 0; i < Shape->m_arAbsMaxAdjustments.size(); i++)
m_arAbsMaxAdjustments.push_back(Shape->m_arAbsMaxAdjustments[i]);
m_arAdjustments.clear();
for(size_t i = 0; i < Shape->m_arAdjustments.size(); i++)
m_arAdjustments.push_back(Shape->m_arAdjustments[i]);
@ -181,6 +186,10 @@ namespace ODRAW
Shape->m_strPath = m_strPath;
Shape->m_strRect = m_strRect;
Shape->m_arAbsMaxAdjustments.clear();
for(size_t i = 0; i < m_arAbsMaxAdjustments.size(); i++)
Shape->m_arAbsMaxAdjustments.push_back(m_arAbsMaxAdjustments[i]);
Shape->m_arAdjustments.clear();
for(size_t i = 0; i < m_arAdjustments.size(); i++)
Shape->m_arAdjustments.push_back(m_arAdjustments[i]);

View File

@ -49,6 +49,8 @@ public:
AddGuide(_T("val #0"));
m_arAdjustments.push_back(10800);
m_arAbsMaxAdjustments.push_back(82000);
LoadConnectorsList(_T("0,0;21600,21600"));
}
};

View File

@ -192,7 +192,13 @@ public:
}
else
{
m_arAdjustments.push_back((LONG)XmlUtils::GetInteger(arAdj[nIndex]));
long val = (long)XmlUtils::GetInteger(arAdj[nIndex]);
if (nIndex < m_arAbsMaxAdjustments.size())
{
if (abs(val) > m_arAbsMaxAdjustments[nIndex])
val = 0;
}
m_arAdjustments.push_back(val);
}
}

View File

@ -236,7 +236,7 @@ namespace PPTX
}
case 2:
{
pReader->SkipRecord();
EffectList.fromPPTY(pReader);
break;
}
case 3:

View File

@ -240,7 +240,7 @@ namespace PPTX
}
case 4:
{
pReader->SkipRecord();
EffectList.fromPPTY(pReader);
break;
}
case 5:

View File

@ -4,5 +4,5 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
cd "$SCRIPTPATH"
if [ ! -d openssl ]; then
git clone https://github.com/openssl/openssl.git
git clone --depth=1 https://github.com/openssl/openssl.git
fi