Add speed and dithering settings to the wrapper

Author: Mathias-Boulay

pngquant-android/src/main/java/com/nicdahlquist/pngquant/LibPngQuant.java

@@ -4,26 +4,42 @@
 
 public class LibPngQuant {
 
+    public boolean pngQuantFile(File inputFile, File outputFile) {
+        //Use default quality in the windows batch file bundled with pngQuant
+        return pngQuantFile(inputFile, outputFile,50,100);
+    }
+
     public boolean pngQuantFile(File inputFile, File outputFile, int minQuality, int maxQuality) {
+        //Use lowest speed to get the best quality
+        return pngQuantFile(inputFile, outputFile, minQuality, maxQuality, 1);
+    }
+
+    public boolean pngQuantFile(File inputFile, File outputFile, int minQuality, int maxQuality, int speed) {
+        //Use the default dither value.
+        return pngQuantFile(inputFile, outputFile, minQuality, maxQuality, speed, 1f);
+    }
+
+    public boolean pngQuantFile(File inputFile, File outputFile, int minQuality, int maxQuality, int speed, float floydDitherAmount) {
         if (inputFile == null) throw new NullPointerException();
         if (!inputFile.exists()) throw new IllegalArgumentException();
         if (outputFile == null) throw new NullPointerException();
         if (outputFile.length() != 0) throw new IllegalArgumentException();
-	if(minQuality >= maxQuality) throw new IllegalArgumentException();
-	if( (minQuality < 0) || (minQuality > 100) ) throw new IllegalArgumentException();
-	if( (maxQuality < 0) || (maxQuality > 100) ) throw new IllegalArgumentException();
-
+        if (maxQuality < 0 || maxQuality > 100) throw new IllegalArgumentException();
+        if (minQuality < 0 || minQuality > 100) throw new IllegalArgumentException();
+        if (maxQuality < minQuality) throw new IllegalArgumentException();
+        if (speed < 1 || speed > 11) throw new IllegalArgumentException();
+        if (floydDitherAmount < 0f || floydDitherAmount > 1f) throw new IllegalArgumentException();
 
         String inputFilename = inputFile.getAbsolutePath();
         String outputFilename = outputFile.getAbsolutePath();
 
-        return nativePngQuantFile(inputFilename, outputFilename, minQuality, maxQuality);
+        return nativePngQuantFile(inputFilename, outputFilename, minQuality, maxQuality, speed, floydDitherAmount);
     }
 
     static {
         System.loadLibrary("pngquantandroid");
     }
 
-    private static native boolean nativePngQuantFile(String inputFilename, String outputFilename,int minQuality, int maxQuality);
+    private static native boolean nativePngQuantFile(String inputFilename, String outputFilename, int minQuality, int maxQuality, int speed, float floydDitherAmount);
 
 }

pngquant-android/src/main/jni/native_glue.c

@@ -21,20 +21,20 @@ static void log_callback(const liq_attr * attr, const char * msg, void * user_in
     LOGI("%s" ,msg);
 }
 
-JNIEXPORT jboolean JNICALL Java_com_nicdahlquist_pngquant_LibPngQuant_nativePngQuantFile(JNIEnv * env, jobject obj, jstring jInFilename, jstring jOutFilename,jint jminQuality, jint jmaxQuality) {
+JNIEXPORT jboolean JNICALL Java_com_nicdahlquist_pngquant_LibPngQuant_nativePngQuantFile(JNIEnv * env, jobject obj, jstring jInFilename, jstring jOutFilename, int jMinQuality, int jMaxQuality, int jSpeed, float jFloyd){
     const char * inFilename = (*env)->GetStringUTFChars(env, jInFilename, 0);
     const char * outFilename = (*env)->GetStringUTFChars(env, jOutFilename, 0);
 
     struct pngquant_options options = {
-        .floyd = 1.f, // floyd-steinberg dithering
+        .floyd = jFloyd, // floyd-steinberg dithering
     };
     options.liq = liq_attr_create();
 
     options.verbose = true;
+    liq_set_quality(options.liq, jMinQuality, jMaxQuality);
+    liq_set_speed(options.liq, jSpeed);
     liq_set_log_callback(options.liq, log_callback, NULL);
     options.log_callback = log_callback;
-    liq_set_quality(options.liq, jminQuality, jmaxQuality);
-
 
     pngquant_file(inFilename, outFilename, &options);