X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libqscale.h;h=409a9bb7488366ddee5770bd38489eaddae48a2a;hb=285b119e49d181da10e41c0127ca3c324c786503;hp=14cc2d0433347fb69af60e8a50fb40fbbf0e992a;hpb=5d571e1553d42b28f69d860c1877f237e1a39195;p=qscale

diff --git a/libqscale.h b/libqscale.h
index 14cc2d0..409a9bb 100644
--- a/libqscale.h
+++ b/libqscale.h
@@ -1,16 +1,25 @@
 #ifndef _LIBQSCALE_H
 #define _LIBQSCALE_H
 
+#include <stdio.h>
 #include "jpeglib.h"
 
 typedef struct {
 	/* True image size */
-	int width, height;
+	unsigned width, height;
+
+	/* 1 = B/W, 3 = YCbCr */	
+	unsigned num_components;
 
 	/* Component image sizes (possibly subsampled) */
-	int w0, h0;
-	int w1, h1;
-	int w2, h2;
+	unsigned w0, h0;
+	unsigned w1, h1;
+	unsigned w2, h2;
+
+	/* Sampling factors */
+	unsigned samp_h0, samp_v0;
+	unsigned samp_h1, samp_v1;
+	unsigned samp_h2, samp_v2;
 
 	/* The data itself */
 	JSAMPLE *data_y, *data_cb, *data_cr;
@@ -18,12 +27,21 @@ typedef struct {
 
 enum qscale_scaling_filter {
 	LANCZOS = 0,
+	MITCHELL = 1,
+};
+
+enum qscale_jpeg_mode {
+	SEQUENTIAL = 0,
+	PROGRESSIVE = 1,
 };
 
 qscale_img *qscale_load_jpeg(const char *filename);
-int qscale_save_jpeg(const qscale_img *image, const char *filename);
+qscale_img *qscale_load_jpeg_from_stdio(FILE *file);
+int qscale_save_jpeg(const qscale_img *img, const char *filename, unsigned jpeg_quality, enum qscale_jpeg_mode jpeg_mode);
+int qscale_save_jpeg_to_stdio(const qscale_img *img, FILE *file, unsigned jpeg_quality, enum qscale_jpeg_mode jpeg_mode);
 
-qscale_img *qscale_scale(qscale_img *source, int width, int height, int samp_h0, int samp_v0, int samp_h1, int samp_v1, int samp_h2, int samp_v2);
-void qscale_destroy(qscale_img *image);
+qscale_img *qscale_clone(const qscale_img *img);
+qscale_img *qscale_scale(qscale_img *src, unsigned width, unsigned height, unsigned samp_h0, unsigned samp_v0, unsigned samp_h1, unsigned samp_v1, unsigned samp_h2, unsigned samp_v2, enum qscale_scaling_filter scaling_filter);
+void qscale_destroy(qscale_img *img);
 
 #endif /* !defined(_LIBQSCALE_H) */