diff --git a/contrib/liblzma/compress_easy_mt.cpp b/contrib/liblzma/compress_easy_mt.cpp index a7ebb21..dc0b3d1 100644 --- a/contrib/liblzma/compress_easy_mt.cpp +++ b/contrib/liblzma/compress_easy_mt.cpp @@ -38,39 +38,6 @@ bool check(lzma_ret ret) { return false; } -#ifdef BIT64 -const uint32_t dict = 4; -#else -const uint32_t dict = 2; -#endif - -bool init_lzma1(lzma_stream *strm) -{ - lzma_options_lzma opt_lzma; - if (lzma_lzma_preset(&opt_lzma, UINT32_C(9))) { // LZMA_PRESET_DEFAULT - fprintf(stderr, "Unsupported preset, possibly a bug\n"); - return false; - } - opt_lzma.dict_size *= dict; - //opt_lzma.mf = LZMA_MF_HC4; - //opt_lzma.mode = LZMA_MODE_FAST; - return check(lzma_alone_encoder(strm, &opt_lzma)); -} - -bool init_lzma2(lzma_stream *strm) { - lzma_options_lzma opt_lzma; - if (lzma_lzma_preset(&opt_lzma, UINT32_C(9))) { // LZMA_PRESET_DEFAULT - fprintf(stderr, "Unsupported preset, possibly a bug\n"); - return false; - } - opt_lzma.dict_size *= dict; - lzma_filter filters[] = { - { LZMA_FILTER_LZMA2, &opt_lzma }, - { LZMA_VLI_UNKNOWN, NULL }, - }; - return check(lzma_stream_encoder(strm, filters, LZMA_CHECK_CRC32)); -} - bool init_decoder(lzma_stream *strm) { lzma_ret ret = lzma_auto_decoder( diff --git a/contrib/liblzma/precomp_xz.h b/contrib/liblzma/precomp_xz.h index 201d5e3..e7a3e62 100644 --- a/contrib/liblzma/precomp_xz.h +++ b/contrib/liblzma/precomp_xz.h @@ -3,8 +3,6 @@ #include "api/lzma.h" -bool init_lzma1(lzma_stream *strm); -bool init_lzma2(lzma_stream *strm); bool init_encoder_mt(lzma_stream *strm, int threads, uint64_t max_memory, uint64_t &memory_usage); bool init_decoder(lzma_stream *strm); diff --git a/precomp.cpp b/precomp.cpp index fb57311..b2e4b3a 100644 --- a/precomp.cpp +++ b/precomp.cpp @@ -786,13 +786,7 @@ int init(int argc, char* argv[]) { case 'B': // bZip2 compression_otf_method = OTF_BZIP2; break; - case 'L': // lzma - compression_otf_method = OTF_LZMA; - break; - case 'X': // xz (lzma2) - compression_otf_method = OTF_XZ; - break; - case 'M': // xz multithreaded + case 'L': // lzma2 multithreaded compression_otf_method = OTF_XZ_MT; break; default: @@ -811,13 +805,7 @@ int init(int argc, char* argv[]) { case 'B': // bZip2 conversion_to_method = OTF_BZIP2; break; - case 'L': // lzma - conversion_to_method = OTF_LZMA; - break; - case 'X': // xz (lzma2) - conversion_to_method = OTF_XZ; - break; - case 'M': // xz multithreaded + case 'L': // lzma2 multithreaded conversion_to_method = OTF_XZ_MT; break; default: @@ -992,8 +980,8 @@ int init(int argc, char* argv[]) { } printf(" r \"Recompress\" PCF file (restore original file)\n"); printf(" o[filename] Write output to [filename] <[input_file].pcf or file in header>\n"); - printf(" c[bn] Compression method to use, b = bZip2, n = none \n"); - printf(" n[bn] Convert a PCF file to use this compression, b = bZip2, n = none\n"); + printf(" c[lbn] Compression method to use, l = lzma2, b = bZip2, n = none \n"); + printf(" n[lbn] Convert a PCF file to this compression (same as above)\n"); printf(" v Verbose (debug) mode \n"); printf(" d[depth] Set maximal recursion depth <10>\n"); printf(" zl[1..9][1..9] zLib levels to try for compression (comma separated) \n"); @@ -1193,7 +1181,7 @@ int init_comfort(int argc, char* argv[]) { fprintf(fnewini,";; Precomp Comfort v%i.%i.%i %s %s - %s version - INI file\n",V_MAJOR,V_MINOR,V_MINOR2,V_OS,V_BIT,V_STATE); fprintf(fnewini,";; Use a semicolon (;) for comments\n\n"); fprintf(fnewini,";; Compression method to use\n"); - fprintf(fnewini,";; 0 = none, 1 = bZip2, 2 = lzma, 3 = xz(lzma2), 4 = xz Multi-Threaded\n"); + fprintf(fnewini,";; 0 = none, 1 = bZip2, 2 = lzma2 multi-threaded\n"); fprintf(fnewini,"Compression_Method=4\n\n"); fprintf(fnewini,";; Fast mode (on/off)\n"); fprintf(fnewini,"Fast_Mode=off\n\n"); @@ -1358,19 +1346,7 @@ int init_comfort(int argc, char* argv[]) { } if (strcmp(value, "2") == 0) { - printf("INI: Using lzma compression method\n"); - compression_otf_method = OTF_LZMA; - valid_param = true; - } - - if (strcmp(value, "3") == 0) { - printf("INI: Using xz (lzma2) compression method\n"); - compression_otf_method = OTF_XZ; - valid_param = true; - } - - if (strcmp(value, "4") == 0) { - printf("INI: Using xz multithreaded compression method\n"); + printf("INI: Using lzma2 multithreaded compression method\n"); compression_otf_method = OTF_XZ_MT; valid_param = true; } @@ -6042,8 +6018,6 @@ size_t own_fwrite(const void *ptr, size_t size, size_t count, FILE* stream, int result = size * count; break; } - case OTF_LZMA: - case OTF_XZ: case OTF_XZ_MT: { lzma_action action = (final_byte == 1) ? LZMA_FINISH : LZMA_RUN; lzma_ret ret; @@ -6077,7 +6051,7 @@ size_t own_fwrite(const void *ptr, size_t size, size_t count, FILE* stream, int break; } - fprintf(stderr, "\nERROR: liblzma error: %s (error code %u)\n", msg, ret); + printf("ERROR: liblzma error: %s (error code %u)\n", msg, ret); #ifdef COMFORT wait_for_key(); #endif // COMFORT @@ -6143,8 +6117,6 @@ size_t own_fread(void *ptr, size_t size, size_t count, FILE* stream) { return bytes_read; } - case OTF_LZMA: - case OTF_XZ: case OTF_XZ_MT: { lzma_action action = LZMA_RUN; lzma_ret ret; @@ -6159,7 +6131,7 @@ size_t own_fread(void *ptr, size_t size, size_t count, FILE* stream) { otf_xz_stream_d.avail_in = fread(otf_in, 1, CHUNK, fin); if (ferror(fin)) { - fprintf(stderr, "\nERROR: Could not read input file\n"); + printf("ERROR: Could not read input file\n"); exit(1); } } @@ -6192,7 +6164,7 @@ size_t own_fread(void *ptr, size_t size, size_t count, FILE* stream) { break; } - fprintf(stderr, "\nERROR: liblzma error: %s (error code %u)\n", msg, ret); + printf("ERROR: liblzma error: %s (error code %u)\n", msg, ret); #ifdef COMFORT wait_for_key(); #endif // COMFORT @@ -9174,20 +9146,6 @@ void init_compress_otf() { } break; } - case OTF_LZMA: { - if (!init_lzma1(&otf_xz_stream_c)) { - printf("ERROR: liblzma1 init failed\n"); - exit(1); - } - break; - } - case OTF_XZ: { - if (!init_lzma2(&otf_xz_stream_c)) { - printf("ERROR: liblzma2 init failed\n"); - exit(1); - } - break; - } case OTF_XZ_MT: { uint64_t memory_usage = 0; // As default, use 2 GB memory for LZMA, only 1 GB in the 32-bit windows variant @@ -9230,8 +9188,6 @@ void denit_compress_otf() { (void)BZ2_bzCompressEnd(&otf_bz2_stream_c); break; } - case OTF_LZMA: - case OTF_XZ: case OTF_XZ_MT: { (void)lzma_end(&otf_xz_stream_c); break; @@ -9255,8 +9211,6 @@ void init_decompress_otf() { } break; } - case OTF_LZMA: - case OTF_XZ: case OTF_XZ_MT: { if (!init_decoder(&otf_xz_stream_d)) { printf("ERROR: liblzma init failed\n"); @@ -9276,9 +9230,7 @@ void denit_decompress_otf() { (void)BZ2_bzDecompressEnd(&otf_bz2_stream_d); break; } - case OTF_LZMA: // lzma - case OTF_XZ: // xz - case OTF_XZ_MT: { // xz multithreaded + case OTF_XZ_MT: { // lzma2 multithreaded (void)lzma_end(&otf_xz_stream_d); break; } diff --git a/precomp.h b/precomp.h index 4987d01..fbf1b3f 100644 --- a/precomp.h +++ b/precomp.h @@ -98,7 +98,7 @@ recursion_result recursion_compress(int compressed_bytes, int decompressed_bytes recursion_result recursion_decompress(long long recursion_data_length); // compression-on-the-fly -enum {OTF_NONE = 0, OTF_BZIP2 = 1, OTF_LZMA = 2, OTF_XZ = 3, OTF_XZ_MT = 4}; // uncompressed, bzip2, lzma, xz (lzma2), xz multithreaded +enum {OTF_NONE = 0, OTF_BZIP2 = 1, OTF_XZ_MT = 2}; // uncompressed, bzip2, lzma2 multithreaded void own_fputc(char c, FILE* f); unsigned char fin_fgetc(); void fout_fputc(char c);