3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use nowide fopen in Zipper instead of patching miniz.

Browse source
This commit is contained in:
tamasmeszaros 2019-06-02 19:10:13 +02:00
parent f275cdafa9
commit 916016f2d4
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libslic3r/Zipper.cpp
View file

@ -1,11 +1,9 @@
#include <exception>
#include <sstream>
#include <iostream>
#include "Zipper.hpp"
#include <miniz.h>
#include <boost/log/trivial.hpp>
#include <boost/nowide/cstdio.hpp>
#include "I18N.hpp"
//! macro used to mark string used at localization,
@ -126,8 +124,15 @@ Zipper::Zipper(const std::string &zipfname, e_compression compression)
memset(&m_impl->arch, 0, sizeof(m_impl->arch));
FILE *f = boost::nowide::fopen(zipfname.c_str(), "wb");
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_file(&m_impl->arch, zipfname.c_str(), 0))
if(!mz_zip_writer_init_cfile(&m_impl->arch, f, 0))
m_impl->blow_up();
}