Egalware/lib3mf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib3mf :

Browse Source 
- ricompilate versioni a 32bit con v141_xp (VisualStudio 2017 C++ per XP)
- eliminate le correzioni introdotte per compilare con VS2013.
This commit is contained in:
SaraP
2022-05-02 09:54:14 +02:00
parent 29ef15276e
commit 522c48f27e
18 changed files with 40 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Common/Platform/NMR_EncryptionHeader.cpp
+3 -3
View File
@@ -22,12 +22,12 @@ namespace NMR {
if (isBigEndian()) {
header.Header.Length.length = swapBytes(header.Header.Length.length);
}
size_t sigSize = sizeof(header.Header.Signature.bytes);
constexpr size_t sigSize = sizeof(header.Header.Signature.bytes);
if (strncmp((char *)header.Header.Signature.bytes, "%3McF", sigSize) != 0)
throw CNMRException(NMR_ERROR_COULDNOTREADENCRYPTEDSTREAM);
if (header.Header.majorVersion != 0 || header.Header.minorVersion != 0)
throw CNMRException(NMR_ERROR_ENCRYPTEDCONTENTVERSIONUNSUPPORTED);
size_t headerSize = sizeof(header);
constexpr size_t headerSize = sizeof(header);
nfUint32 remainingBytes = header.Header.Length.length - headerSize;
if (remainingBytes > 0) {
m_rgAdditionalData.resize(remainingBytes, 0);
@@ -38,7 +38,7 @@ namespace NMR {
}
size_t CEncryptionHeader::writeTo(PExportStream to) {
uEncryptedFileHeader header = { { '%', '3', 'M', 'c', 'F', 0, 0, 0, 0, 0, 0, 0 } };
size_t headerSize = sizeof(header);
constexpr size_t headerSize = sizeof(header);
m_nfHeaderSize = (nfUint32)(headerSize + m_rgAdditionalData.size());
header.Header.Length.length = (nfUint32)m_nfHeaderSize;
if (isBigEndian()) {