Răsfoiți Sursa

Replace deprecated LZ4 functions in Urho3D.

cosmy 8 ani în urmă
părinte
comite
7902fba3b9

+ 1 - 1
Source/Tools/PackageTool/PackageTool.cpp

@@ -286,7 +286,7 @@ void WritePackageFile(const String& fileName, const String& rootDir)
                 if (pos + unpackedSize > dataSize)
                 if (pos + unpackedSize > dataSize)
                     unpackedSize = dataSize - pos;
                     unpackedSize = dataSize - pos;
 
 
-                unsigned packedSize = (unsigned)LZ4_compressHC((const char*)&buffer[pos], (char*)compressBuffer.Get(), unpackedSize);
+                unsigned packedSize = (unsigned)LZ4_compress_HC((const char*)&buffer[pos], (char*)compressBuffer.Get(), unpackedSize, LZ4_compressBound(unpackedSize), 0);
                 if (!packedSize)
                 if (!packedSize)
                     ErrorExit("LZ4 compression failed for file " + entries_[i].name_ + " at offset " + String(pos));
                     ErrorExit("LZ4 compression failed for file " + entries_[i].name_ + " at offset " + String(pos));
 
 

+ 2 - 2
Source/Urho3D/IO/Compression.cpp

@@ -44,7 +44,7 @@ unsigned CompressData(void* dest, const void* src, unsigned srcSize)
     if (!dest || !src || !srcSize)
     if (!dest || !src || !srcSize)
         return 0;
         return 0;
     else
     else
-        return (unsigned)LZ4_compressHC((const char*)src, (char*)dest, srcSize);
+        return (unsigned)LZ4_compress_HC((const char*)src, (char*)dest, srcSize, LZ4_compressBound(srcSize), 0);
 }
 }
 
 
 unsigned DecompressData(void* dest, const void* src, unsigned destSize)
 unsigned DecompressData(void* dest, const void* src, unsigned destSize)
@@ -73,7 +73,7 @@ bool CompressStream(Serializer& dest, Deserializer& src)
     if (src.Read(srcBuffer, srcSize) != srcSize)
     if (src.Read(srcBuffer, srcSize) != srcSize)
         return false;
         return false;
 
 
-    unsigned destSize = (unsigned)LZ4_compressHC((const char*)srcBuffer.Get(), (char*)destBuffer.Get(), srcSize);
+    unsigned destSize = (unsigned)LZ4_compress_HC((const char*)srcBuffer.Get(), (char*)destBuffer.Get(), srcSize, LZ4_compressBound(srcSize), 0);
     bool success = true;
     bool success = true;
     success &= dest.WriteUInt(srcSize);
     success &= dest.WriteUInt(srcSize);
     success &= dest.WriteUInt(destSize);
     success &= dest.WriteUInt(destSize);

+ 1 - 1
Source/Urho3D/Navigation/DynamicNavigationMesh.cpp

@@ -75,7 +75,7 @@ struct TileCompressor : public dtTileCacheCompressor
     virtual dtStatus compress(const unsigned char* buffer, const int bufferSize,
     virtual dtStatus compress(const unsigned char* buffer, const int bufferSize,
         unsigned char* compressed, const int /*maxCompressedSize*/, int* compressedSize)
         unsigned char* compressed, const int /*maxCompressedSize*/, int* compressedSize)
     {
     {
-        *compressedSize = LZ4_compress((const char*)buffer, (char*)compressed, bufferSize);
+        *compressedSize = LZ4_compress_default((const char*)buffer, (char*)compressed, bufferSize, LZ4_compressBound(bufferSize));
         return DT_SUCCESS;
         return DT_SUCCESS;
     }
     }