2.5.6: fix #1: ignores subsampling option

Author: zvezdochiot

CHANGELOG

@@ -1,6 +1,10 @@
 JPEG Recompress
 https://github.com/ImageProcessing-ElectronicPublications/jpeg-recompress
 
+2.5.6 "subsample"
+
+    Fix IPEP/#1: ignores subsampling option
+
 2.5.5 "sigma"
 
     Move `sigma`-function from `libsmallfry` to `jmetrics.a`

src/jmetrics.c

@@ -427,6 +427,9 @@ unsigned long encodeJpeg(unsigned char **jpeg, unsigned char *buf, int width, in
         jpeg_simple_progression(&cinfo);
     }
 
+    jpeg_set_quality(&cinfo, quality, TRUE);
+    jpeg_set_colorspace (&cinfo, jpegcs);
+
     if (subsample == SUBSAMPLE_444)
     {
         cinfo.comp_info[0].h_samp_factor = 1;
@@ -437,9 +440,6 @@ unsigned long encodeJpeg(unsigned char **jpeg, unsigned char *buf, int width, in
         cinfo.comp_info[2].v_samp_factor = 1;
     }
 
-    jpeg_set_quality(&cinfo, quality, TRUE);
-    jpeg_set_colorspace (&cinfo, jpegcs);
-
     // Start the compression
     jpeg_start_compress(&cinfo, TRUE);
 

src/jmetrics.h

@@ -21,7 +21,7 @@
 #define JMETRICS_H
 
 #ifndef JMVERSION
-#define JMVERSION "2.5.0"
+#define JMVERSION "2.5.6"
 #endif
 
 #define MIN(a, b) ((a) < (b) ? (a) : (b))

src/webp-compress.c

@@ -27,7 +27,6 @@ void usage(char *progname)
     printf("  -n, --min [arg]              minimum quality [1]\n");
     printf("  -q, --quality [arg]          set a quality preset: low, medium, subhigh, high, veryhigh [medium]\n");
     printf("  -r, --ppm                    parse input as PPM\n");
-    printf("  -s, --strip                  strip metadata\n");
     printf("  -t, --target [arg]           set target quality [0.75]\n");
     printf("  -x, --max [arg]              maximum quality [99]\n");
     printf("  -z, --zoom [arg]             set defish zoom [1.0]\n");