3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-17 03:37:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Adjust miniz usage to use nowide FILE streams everywhere.

Browse source
This commit is contained in:
tamasmeszaros 2019-06-02 22:27:35 +02:00
parent 15620a2fc2
commit 460887cdde
4 changed files with 83 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libslic3r/Zipper.cpp
View file

@ -22,7 +22,6 @@ class Zipper::Impl {
public:
mz_zip_archive arch;
std::string m_zipname;
FILE *cfile = nullptr;
static std::string get_errorstr(mz_zip_error mz_err)
{
@ -125,15 +124,15 @@ Zipper::Zipper(const std::string &zipfname, e_compression compression)
memset(&m_impl->arch, 0, sizeof(m_impl->arch));
m_impl->cfile = boost::nowide::fopen(zipfname.c_str(), "wb");
FILE *f = boost::nowide::fopen(zipfname.c_str(), "wb");
if (m_impl->cfile == nullptr) {
if (f == nullptr) {
m_impl->arch.m_last_error = MZ_ZIP_FILE_OPEN_FAILED;
m_impl->blow_up();
}
// Initialize the archive data
if(!mz_zip_writer_init_cfile(&m_impl->arch, m_impl->cfile, 0))
if(!mz_zip_writer_init_cfile(&m_impl->arch, f, 0))
m_impl->blow_up();
}
@ -149,11 +148,13 @@ Zipper::~Zipper()
BOOST_LOG_TRIVIAL(error) << m_impl->formatted_errorstr();
}
FILE *f = mz_zip_get_cfile(&m_impl->arch);
// The file should be closed no matter what...
if(!mz_zip_writer_end(&m_impl->arch))
BOOST_LOG_TRIVIAL(error) << m_impl->formatted_errorstr();
if(m_impl->cfile) fclose(m_impl->cfile);
if(f != nullptr) fclose(f);
}
Zipper::Zipper(Zipper &&m):