Move JPEG saving into libqscale. Hooray, we have a usable lib!

[qscale] / libqscale.h

diff --git a/libqscale.h b/libqscale.h
index fed58966837880f45469584ee640ea2d0f34656a..bd5cbe30ef08d5b74496035c4204248162254c54 100644 (file)
--- a/libqscale.h
+++ b/libqscale.h
@@ -13,6 +13,11 @@ typedef struct {
        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;
 } qscale_img;
@@ -23,14 +28,14 @@ enum qscale_scaling_filter {
 
 enum qscale_jpeg_mode {
        SEQUENTIAL = 0,
-       PROGRESSIVE = 1
 };
 
 qscale_img *qscale_load_jpeg(const char *filename);
 qscale_img *qscale_load_jpeg_from_stdio(FILE *file);
-int qscale_save_jpeg(const qscale_img *image, const char *filename, unsigned jpeg_quality, enum qscale_jpeg_mode jpeg_mode);
+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, 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 *image);
+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) */