(no commit message)

diff --git a/coders/jpeg.c b/coders/jpeg.c
index e280713644b5af3d14c49355571f5d385e86ac5a..7307248694ceffc68a0eed2e2e89c2a1c1b5238e 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1795,17 +1795,6 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
 
   static const unsigned int
     CbQTable[DCTSIZE2] =
-    {
-      17,   19,   24,   37,   68,   148,   384,   1186,
-      19,   20,   26,   40,   74,   162,   419,   1293,
-      24,   26,   34,   52,   96,   210,   544,   1676,
-      37,   40,   52,   81,   148,  323,   838,   2585,
-      68,   74,   96,   148,  272,  593,   1537,  4741,
-      148,  162,  210,  323,  593,  1293,  3353,  10338,
-      384,  419,  544,  838,  1537, 3353,  8694,  12725,
-      1186, 1293, 1676, 2585, 4741, 10338, 12725, 12725
-    },
-    CrQTable[DCTSIZE2] =
     {
       17,   18,   22,   31,   50,   92,    193,   465,
       18,   19,   24,   33,   54,   98,    207,   498,
@@ -1816,16 +1805,27 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
       193,  207,  253,  355,  570,  1046,  2198,  5289,
       465,  498,  609,  854,  1370, 2516,  5289,  12725
     },
+    CrQTable[DCTSIZE2] =
+    {
+      17, 18, 21, 28, 42, 69, 129, 269,
+      18, 19, 23, 30, 44, 74, 137, 284,
+      21, 23, 27, 35, 52, 87, 162, 336,
+      28, 30, 35, 47, 69, 115, 214, 446,
+      42, 44, 52, 69, 103, 171, 318, 661,
+      69, 74, 87, 115, 171, 284, 528, 1098,
+      129, 137, 162, 214, 318, 528, 981, 2040,
+      269, 284, 336, 446, 661, 1098, 2040, 4242
+    },
     LuminanceQTable[DCTSIZE2] =
     {
-      17, 12, 14, 17, 22, 30, 45, 72,
-      12, 13, 14, 17, 22, 31, 46, 74,
-      14, 14, 16, 19, 25, 35, 52, 83,
-      17, 17, 19, 23, 30, 41, 62, 100,
-      22, 22, 25, 30, 39, 54, 80, 129,
-      30, 31, 35, 41, 54, 74, 111, 178,
-      45, 46, 52, 62, 80, 111, 166, 267,
-      72, 74, 83, 100, 129, 178, 267, 428
+      16, 11, 13, 16, 20, 29, 44, 73,
+      11, 12, 13, 16, 21, 30, 46, 76,
+      13, 13, 15, 18, 24, 34, 52, 85,
+      16, 16, 18, 22, 29, 41, 63, 103,
+      20, 21, 24, 29, 38, 54, 82, 135,
+      29, 30, 34, 41, 54, 76, 116, 192,
+      44, 46, 52, 63, 82, 116, 177, 293,
+      73, 76, 85, 103, 135, 192, 293, 484
     };
 
   /*