3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

7
src/libslic3r/Format/PRUS.cpp
View file

@ -3,6 +3,7 @@
#include <boost/algorithm/string.hpp>
#include <boost/nowide/convert.hpp>
#include <boost/nowide/cstdio.hpp>
#include <miniz.h>
@ -298,7 +299,9 @@ bool load_prus(const char *path, Model *model)
{
mz_zip_archive archive;
mz_zip_zero_struct(&archive);
mz_bool res = mz_zip_reader_init_file(&archive, path, 0);
FILE *f = boost::nowide::fopen(path, "rb");
auto res = mz_bool(f != nullptr && mz_zip_reader_init_cfile(&archive, f, -1, 0));
size_t n_models_initial = model->objects.size();
try {
if (res == MZ_FALSE)
@ -327,10 +330,12 @@ bool load_prus(const char *path, Model *model)
}
} catch (std::exception &ex) {
mz_zip_reader_end(&archive);
if(f) fclose(f);
throw ex;
}
mz_zip_reader_end(&archive);
if(f) fclose(f);
return model->objects.size() > n_models_initial;
}