Compression.hs: -m2/-m3/-m4 now use 96mb dictionary by default!

git-svn-id: https://freearc.svn.sourceforge.net/svnroot/freearc@115 3a4f7f31-9599-433d-91b1-573e8b61252c

Compression.hs

@@ -411,8 +411,8 @@ builtinMethodSubsts = [
     , "1t  = 1b"
     , "2t  = grzip:m4:8m:32:h15"
     , "3trr= grzip:m1:8m:32:h15"
-    , "3t  = dict:p: 32m:85% + lzp: 32m: 24:h20        :92% + grzip:m3:8m:l"
-    , "3tr = dict:p: 32m:80% + lzp: 32m: 55:d1m:s16:h18:87% + ppmd:7:48m"    -- âàðèàíò -m3t ñ èñïîëüçîâàíèåì ppmd âìåñòå grzip(bwt)
+    , "3t  = dict:p: 64m:85% + lzp: 64m: 24:h20        :92% + grzip:m3:8m:l"
+    , "3tr = dict:p: 64m:80% + lzp: 64m: 55:d1m:s16:h18:87% + ppmd:7:48m"    -- âàðèàíò -m3t ñ èñïîëüçîâàíèåì ppmd âìåñòå grzip(bwt)
     , "4t  = dict:p: 64m:80% + lzp: 64m: 65:d1m:s16:h20:90% + ppmd:8:96m"
     , "5t  = dict:p: 64m:80% + lzp: 80m:105:d1m:s32:h22:92% + ppmd:12:192m"
     , "6t  = dict:p:128m:80% + lzp:160m:145:d1m:s32:h23:92% + ppmd:16:384m"
@@ -442,8 +442,8 @@ builtinMethodSubsts = [
     , ";Text files compression with fast decompression"
     , "1xt = 1xb"
     , "2xt = 2xb"
-    , "3xt = dict:  32m:80% + tor:7:16m:h32m"
-    , "4xt = dict:  64m:75% + lzma: 64m:normal:mc16"
+    , "3xt = dict:  64m:80% + tor:7:96m:h64m"
+    , "4xt = dict:  64m:75% + lzma: 96m:h64m:normal:mc16"
     , "5xt = dict: 128m:75% + lzma: 16m:max"
     , "6xt = dict: 128m:75% + lzma: 32m:max"
     , "7xt = dict: 128m:75% + lzma: 64m:max"
@@ -452,9 +452,9 @@ builtinMethodSubsts = [
     , ""
     , ";Binary files compression with fast decompression"
     , "1xb = tor:3"
-    , "2xb = tor"
-    , "3xb = delta + lzma: 32m:fast:mc8"
-    , "4xb = delta + lzma: 64m:normal:mc16"
+    , "2xb = tor:96m:h64m"
+    , "3xb = delta + lzma: 96m:h64m:fast:mc8"
+    , "4xb = delta + lzma: 96m:h64m:normal:mc16"
     , "5xb = delta + lzma: 16m:max"
     , "6xb = delta + lzma: 32m:max"
     , "7xb = delta + lzma: 64m:max"
@@ -502,7 +502,7 @@ builtinMethodSubsts = [
     , ";Bitmap graphic files are best compressed with GRZip algorithm"
     , "bmp        = mm    + grzip:m1:l:a  ;best compression"
     , "bmpfast    = mm    + grzip:m4:l:a  ;faster compression"
-    , "bmpfastest = mm:d1 + tor:2         ;fastest one"
+    , "bmpfastest = mm:d1 + tor:3         ;fastest one"
     , "1$bmp  = bmpfastest"
     , "2$bmp  = bmpfastest"
     , "3$bmp  = bmpfast"
@@ -514,9 +514,9 @@ builtinMethodSubsts = [
     , "#r$bmp = #$bmp"
     , ""
     , ";Quick & dirty compression for data already compressed"
-    , "4$compressed   = rep:64m + tor:c3"
-    , "3$compressed   = rep:32m + tor:3"
-    , "2$compressed   = rep:16m + tor:3"
+    , "4$compressed   = rep:96m + tor:c3"
+    , "3$compressed   = rep:96m + tor:3"
+    , "2$compressed   = rep:96m + tor:3"
     , "4x$compressed  = tor:8m:c3"
     , "3x$compressed  = rep:8m  + tor:3"
     , "2x$compressed  = rep:8m  + tor:3"

Compression/Common.h

@@ -489,7 +489,7 @@ static inline MemSize rounddown_to_power_of (MemSize n, MemSize base)
 static inline MemSize round_to_nearest_power_of (MemSize n, MemSize base)
 {
     MemSize result;
-    uint64 nn = uint64(n)*n/base;
+    uint64 nn = ((uint64)n)*n/base;
     if (nn==0)  return 1;
     for (result=base; (nn/=base*base) != 0; result *= base);
     return result;