#include "wimlib/security.h"
#include "wimlib/wim.h"
#include "wimlib/xml.h"
+#include "wimlib/compressor_ops.h"
+#include "wimlib/decompressor_ops.h"
#ifdef __WIN32__
# include "wimlib/win32.h" /* for realpath() replacement */
static u32
wim_default_chunk_size(int ctype)
{
- return 32768;
+ switch (ctype) {
+ case WIMLIB_COMPRESSION_TYPE_LZMS:
+ return 131072;
+ default:
+ return 32768;
+ }
}
/*
"32768, 65536, 131072, ..., 2097152.");
break;
case WIMLIB_COMPRESSION_TYPE_LZMS:
- ERROR("Valid chunk sizes for LZMS are 131072.");
+ ERROR("Valid chunk sizes for LZMS are "
+ "32768, 65536, 131072, ..., 67108864.");
break;
}
return WIMLIB_ERR_INVALID_CHUNK_SIZE;
}
- if (chunk_size != 32768) {
+ if (chunk_size != 32768 &&
+ wim->out_compression_type != WIMLIB_COMPRESSION_TYPE_LZMS)
+ {
WARNING ("Changing the compression chunk size to any value other than\n"
" the default of 32768 bytes eliminates compatibility with\n"
" Microsoft's software!");
if (filedes_valid(&wim->out_fd))
filedes_close(&wim->out_fd);
- wimlib_lzx_free_context(wim->lzx_context);
-
free_lookup_table(wim->lookup_table);
+ wimlib_free_decompressor(wim->decompressor);
+
FREE(wim->filename);
free_wim_info(wim->wim_info);
if (wim->image_metadata) {
#ifdef __WIN32__
win32_global_cleanup();
#endif
+ cleanup_decompressor_params();
+ cleanup_compressor_params();
}