Store the sampling factors explicitly in the struct, to make saving simpler.

[qscale] / libqscale.h

diff --git a/libqscale.h b/libqscale.h
index d56320a8734616ecc0b823239ff5c8a7ccf5423f..2f40099cd469ad378fa8fabe8f243d9ed097838e 100644 (file)
--- a/libqscale.h
+++ b/libqscale.h
@@ -6,12 +6,17 @@
 
 typedef struct {
        /* True image size */
-       int width, height;
+       unsigned width, height;
 
        /* 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;
@@ -28,9 +33,9 @@ enum qscale_jpeg_mode {
 
 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, int jpeg_quality, 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);
 
-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, 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) */