Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies, Fall 2023 edition #78

Merged
merged 6 commits into from
Sep 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/cimb_translator/Config.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ namespace cimbar

static constexpr unsigned compression_level()
{
return 6;
return 16;
}
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/compression/zstd_compressor.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class zstd_compressor : public STREAM

protected:
static const size_t CHUNK_SIZE = 0x4000;
int _compressionLevel = 6;
int _compressionLevel = 16;
ZSTD_CCtx* _cctx = ZSTD_createCCtx();
std::vector<char> _compBuff = std::vector<char>(ZSTD_compressBound(CHUNK_SIZE));
};
Expand Down
2 changes: 1 addition & 1 deletion src/lib/encoder/test/EncoderRoundTripTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ TEST_CASE( "EncoderRoundTripTest/testStreaming", "[unit]" )

// done
assertEquals( 1, fds.num_done() );
std::string decodedContents = File(tempdir.path() / "0.5387").read_all();
std::string decodedContents = File(tempdir.path() / "0.5256").read_all();
assertEquals( 16727, decodedContents.size() );
assertStringContains( "Mozilla Public License Version 2.0", decodedContents );
}
6 changes: 3 additions & 3 deletions src/lib/encoder/test/EncoderTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ TEST_CASE( "EncoderTest/testFountain.Compress", "[unit]" )
Encoder enc(30, 4, 2);
assertEquals( 1, enc.encode_fountain(inputFile, outPrefix) );

uint64_t hash = 0x4fd34f01ee80a28d;
uint64_t hash = 0x664598a460acad14;
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course, various regression tests broke. 🙃

std::string path = fmt::format("{}_0.png", outPrefix);
cv::Mat img = cv::imread(path);
assertEquals( hash, image_hash::average_hash(img) );
Expand All @@ -96,7 +96,7 @@ TEST_CASE( "EncoderTest/testPiecemealFountainEncoder", "[unit]" )
std::optional<cv::Mat> frame = enc.encode_next(*fes);
assertTrue( frame );

uint64_t hash = 0xf8cde200e90582e4;
uint64_t hash = 0x423de068e4894a7f;
assertEquals( hash, image_hash::average_hash(*frame) );
}

Expand All @@ -110,7 +110,7 @@ TEST_CASE( "EncoderTest/testFountain.Size", "[unit]" )
Encoder enc(30, 4, 2);
assertEquals( 1, enc.encode_fountain(inputFile, outPrefix, 10, 2.0, 1080) );

uint64_t hash = 0x8985b70d93675786;
uint64_t hash = 0xeb28da8af88de8d0;
std::string path = fmt::format("{}_0.png", outPrefix);
cv::Mat img = cv::imread(path);
assertEquals( 1080, img.rows );
Expand Down
151 changes: 78 additions & 73 deletions src/third_party_lib/concurrentqueue/concurrentqueue.h

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/third_party_lib/fmt/LICENSE.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2012 - present, Victor Zverovich
Copyright (c) 2012 - present, Victor Zverovich and {fmt} contributors

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
Loading