Commit graph

172 commits

Author SHA1 Message Date
Christian Schneider
9ddc049521 Fix for incorrectly restored multi PNGs
- Using a signed int instead of an unsigned solves the issue
- Fixes #50
2017-01-02 11:32:08 +01:00
Christian Schneider
67091fcbbd Fix for slowdown on some files
- identical_bytes and compressed_stream_size don't have to be the same
anymore, as for some files they differ although decompressed bytes match
- tolerance for penalty bytes (5*32 bytes)
2017-01-02 11:22:01 +01:00
Christian Schneider
d64c1c55e4 Use -DBIT64 in Makefile, too 2017-01-02 10:03:13 +01:00
Christian Schneider
64a50242d7 Compile 64 bit versions by default 2017-01-02 10:00:47 +01:00
Christian Schneider
b0e9d813b6 Some Makefile changes
- make.bat: Use other GCC64/GPP64 defaults
- make.bat and Makefiles: No -fsched-spec-load, older compilers don't
support it
- make.bat and Makefiles: Use -std=c99 and -std=c++11 to make sure
everything compiles correct on different compilers
2017-01-02 09:50:57 +01:00
Christian Schneider
6abf077c27 Merge pull request #47 from jasarsoft/patch-1
fix error code C2061
2016-12-29 18:47:29 +01:00
Christian Schneider
db61f2c8e4 Merge branch 'master' into patch-1 2016-12-29 18:47:21 +01:00
Christian Schneider
c06b250ee7 Merge pull request #48 from jasarsoft/jasarsoft-fix-dll
fix use_mp3 param
2016-12-29 18:46:01 +01:00
Christian Schneider
b5b971c69f Merge branch 'master' into jasarsoft-fix-dll 2016-12-29 18:45:31 +01:00
Christian Schneider
942e417a2e Merge with lzma2 branch
Support multi-threaded lzma2 as compression method
2016-12-29 18:38:49 +01:00
Christian Schneider
a7a2b78feb Show lzma memory usage in MiB 2016-12-29 18:34:34 +01:00
Christian Schneider
28f3a72899 Use multithreaded lzma2 only 2016-12-29 18:31:47 +01:00
Christian Schneider
75c64cc1cb Disable misleading indendation warnings for packJPG and packMP3 2016-12-29 18:22:42 +01:00
Christian Schneider
fba3d150aa Remove old LZMA preset code 2016-12-29 18:08:57 +01:00
Christian Schneider
5568734be5 Use the LZMA preset that satisfies memory limits 2016-12-29 18:07:51 +01:00
Christian Schneider
52be43eaa4 Show OS and 32-/64-bit information 2016-12-28 16:52:45 +01:00
Christian Schneider
769bdc3a74 Autodetect number of threads for LZMA
- Print memory usage
- Minor changes in compress_easy_mt.cpp (indentation, comments, removing
some unnecessary code)
2016-12-28 11:14:41 +01:00
Christian Schneider
89d6bf423f Add header files for std::thread support in MinGW
- MinGW lacks C++11 threading features out of the box, e.g. see
http://stackoverflow.com/questions/21211980/mingw-error-thread-is-not-a-member-of-std
- Source: https://github.com/meganz/mingw-std-threads
2016-12-25 11:14:05 +01:00
Christian Schneider
2cadccc2ac "No debug" flag for liblzma 2016-12-21 15:14:58 +01:00
Christian
e85494d8e5 Using CRC implementation in C in Linux, too 2016-11-13 10:09:39 +01:00
Christian Schneider
c9d13408d2 Using the CRC32 implementation in C in make.bat, too
- 64-bit version ("make 64") doesn't work with the assembler ones
2016-11-10 13:58:04 +01:00
Christian Schneider
b581197c2b Renaming bz2_in/out -> otf_in/out 2016-11-09 16:39:33 +01:00
Christian
b2c6919f6e Tab instead of space 2016-10-24 06:09:53 +02:00
Christian
bb8c8598d8 Now compiles on Linux, too 2016-10-24 06:08:14 +02:00
Christian
df88fd9944 Now compiles on Linux, too 2016-10-24 06:04:32 +02:00
Christian Schneider
206b724858 Finally, a working Visual Studio 2015 solution
- Due to C99 used in liblzma, Visual Studio 2013 or higher is needed
(2013 untested, 2015 works)
- Using the CRC32 implementations in C instead of the assembler ones
that won't work
- msinttypes not needed anymore
- .gitignore adjusted
2016-10-19 11:30:54 +02:00
Edin Jašarević
ba4ae833d0 fix use_mp3 param 2016-10-08 20:11:32 +02:00
Edin Jašarević
b62070c4f4 fix error code C2061
fix error code C2061 to build dll
2016-10-08 19:43:13 +02:00
Christian Schneider
865a7c85e8 Fixed enum typo
Led to a compilation error in comfort version
2016-08-27 12:28:26 +02:00
Christian Schneider
acff85e316 Removing old commented code 2016-07-05 14:37:39 +02:00
Christian Schneider
a75dc543cb Trying to get the MSVC solution running
- inttypes.h is used by liblzma, had to use msinttypes from
code.google.com/p/msinttypes
- There seem to be massive problems with the "inline" keyword
2016-07-02 19:52:42 +02:00
Christian Schneider
5e54296240 Removing VS 2008/2010 solution, Precomf solution
- I won't be able to maintain multiple Visual Studio solutions, sorry
- Precomf should be added as build config (using -DCOMFORT) instead of
seperate project
2016-07-02 18:48:46 +02:00
Christian Schneider
fab8c2b488 Enum for on-the-fly compression methods 2016-07-02 18:37:31 +02:00
Christian Schneider
940061423f Debug output removed 2016-07-02 18:24:37 +02:00
Christian Schneider
294fc3f128 Converting from/to liblzma
- conversions using -nl, -nx, -nm
- case cleanup (2,3,4 instead of 4,2,3)
- two switch statements replaced by if
2016-07-02 18:24:23 +02:00
Christian Schneider
8fc79d94b3 Always use liblzma
- #ifdefs removed
- Removed lzma_end call from Ctrl+C handler, cleaning up stream state
isn't necessary there.
2016-07-02 18:06:22 +02:00
Christian Schneider
b3d6c5c823 Removed debug output 2016-07-02 17:56:54 +02:00
Christian Schneider
a512eb30de On-the-fly liblzma compression and decompression works
- LZMA_CONCATENATED flag removed (not needed because of a single stream)
- Code adapted from liblzma decompress.cpp example
- Sleep in own_fwrite removed
2016-07-02 04:45:05 +02:00
Christian Schneider
7eb8931b1c Add #defines to make liblzma work
- Compression using -cl, -cx, -cm now works
2016-06-30 14:55:40 +02:00
Christian Schneider
6631a9acf8 Parantheses for clarity and against compiler warning 2016-06-26 10:41:53 +02:00
Christian Schneider
f04cd20672 Added "nocontrib" parameter to make.bat
- Can be used for a faster build if nothing in the contrib folder has
changed
- Times on my machine: "make" 68 s, "make nocontrib" 5 s
2016-06-26 10:35:06 +02:00
Christian Schneider
ccb748cf32 liblzma version number 2016-06-26 10:24:40 +02:00
Christian Schneider
2b7ac5532a Adjusted make.bat
- JPG/MP3 renamed to JPG_O/MP3_O to make .o usage clear
- Building giflib and bzip seperately
2016-06-25 18:30:52 +02:00
Christian Schneider
ee3d7967e8 Added liblzma notice 2016-06-25 17:54:50 +02:00
Christian Schneider
b7fc1001f8 First try - can be compiled using make.bat
- liblzma source code added (we don't want to use a DLL)
- Moved lzma.h and lzma subfolder to api subfolder
- Removed some unnecessary files (liblzma.def, lzma_dll.txt)
- Adjusted make.bat, added some "echo" statements to show build state.
- Can be compiled, but using "-cl" or  "-cx" give errors (specified
filter chain is not supported), "-cm" gives a crash
2016-06-25 17:46:29 +02:00
sftt
733ca5d05b Update compress_easy_mt.cpp
trim unused code
2016-06-20 16:08:43 +08:00
sftt
331613d68a Delete PAQ7ASM.obj 2016-06-20 15:44:17 +08:00
sftt
803576e491 Delete PAQ7ASM.asm 2016-06-20 15:44:10 +08:00
sftt
73d0c0fa1d Delete paq8o8pre.cpp 2016-06-20 15:43:10 +08:00
sftt
76e08b81e8 Delete xz-file-format.txt 2016-06-20 15:01:35 +08:00