Update libjpeg from 6b to 8b.

[reactos.git] / reactos / include / reactos / libs / libjpeg / transupp.h

diff --git a/reactos/include/reactos/libs/libjpeg/transupp.h b/reactos/include/reactos/libs/libjpeg/transupp.h
index 00b6a84..7c16c19 100644 (file)
--- a/reactos/include/reactos/libs/libjpeg/transupp.h
+++ b/reactos/include/reactos/libs/libjpeg/transupp.h
@@ -1,7 +1,7 @@
 /*
  * transupp.h
  *
- * Copyright (C) 1997-2001, Thomas G. Lane.
+ * Copyright (C) 1997-2009, Thomas G. Lane, Guido Vollbeding.
  * This file is part of the Independent JPEG Group's software.
  * For conditions of distribution and use, see the accompanying README file.
  *
@@ -58,9 +58,14 @@
  * dimensions to keep the lower right crop corner unchanged.  (Thus, the
  * output image covers at least the requested region, but may cover more.)
  *
- * If both crop and a rotate/flip transform are requested, the crop is applied
- * last --- that is, the crop region is specified in terms of the destination
- * image.
+ * We also provide a lossless-resize option, which is kind of a lossless-crop
+ * operation in the DCT coefficient block domain - it discards higher-order
+ * coefficients and losslessly preserves lower-order coefficients of a
+ * sub-block.
+ *
+ * Rotate/flip transform, resize, and crop can be requested together in a
+ * single invocation.  The crop is applied last --- that is, the crop region
+ * is specified in terms of the destination image after transform/resize.
  *
  * We also offer a "force to grayscale" option, which simply discards the
  * chrominance channels of a YCbCr image.  This is lossless in the sense that
@@ -96,8 +101,7 @@ typedef enum {
        JXFORM_TRANSVERSE,      /* transpose across UR-to-LL axis */
        JXFORM_ROT_90,          /* 90-degree clockwise rotation */
        JXFORM_ROT_180,         /* 180-degree rotation */
-       JXFORM_ROT_270,         /* 270-degree clockwise (or 90 ccw) */
-        JXFORM_DROP             /* drop */
+       JXFORM_ROT_270          /* 270-degree clockwise (or 90 ccw) */
 } JXFORM_CODE;
 
 /*
@@ -137,10 +141,6 @@ typedef struct {
   JDIMENSION crop_yoffset;     /* Y offset of selected region */
   JCROP_CODE crop_yoffset_set; /* (negative measures from bottom edge) */
 
-  /* Drop parameters: set by caller for drop request */
-  j_decompress_ptr drop_ptr;
-  jvirt_barray_ptr * drop_coef_arrays;
-
   /* Internal workspace: caller should not touch these */
   int num_components;          /* # of components in workspace */
   jvirt_barray_ptr * workspace_coef_arrays; /* workspace for transformations */
@@ -148,45 +148,43 @@ typedef struct {
   JDIMENSION output_height;
   JDIMENSION x_crop_offset;    /* destination crop offsets measured in iMCUs */
   JDIMENSION y_crop_offset;
-  JDIMENSION drop_width;       /* drop dimensions measured in iMCUs */
-  JDIMENSION drop_height;
-  int max_h_samp_factor;       /* destination iMCU size */
-  int max_v_samp_factor;
+  int iMCU_sample_width;       /* destination iMCU size */
+  int iMCU_sample_height;
 } jpeg_transform_info;
 
 
 #if TRANSFORMS_SUPPORTED
 
 /* Parse a crop specification (written in X11 geometry style) */
-EXTERN_1(boolean) jtransform_parse_crop_spec
+EXTERN(boolean) jtransform_parse_crop_spec
        JPP((jpeg_transform_info *info, const char *spec));
 /* Request any required workspace */
-EXTERN_1(void) jtransform_request_workspace
+EXTERN(boolean) jtransform_request_workspace
        JPP((j_decompress_ptr srcinfo, jpeg_transform_info *info));
 /* Adjust output image parameters */
-EXTERN_1(jvirt_barray_ptr *) jtransform_adjust_parameters
+EXTERN(jvirt_barray_ptr *) jtransform_adjust_parameters
        JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
             jvirt_barray_ptr *src_coef_arrays,
             jpeg_transform_info *info));
 /* Execute the actual transformation, if any */
-EXTERN_1(void) jtransform_execute_transform
+EXTERN(void) jtransform_execute_transform
        JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
             jvirt_barray_ptr *src_coef_arrays,
             jpeg_transform_info *info));
 /* Determine whether lossless transformation is perfectly
  * possible for a specified image and transformation.
  */
-EXTERN_1(boolean) jtransform_perfect_transform
- JPP((JDIMENSION image_width, JDIMENSION image_height,
-      int MCU_width, int MCU_height,
-      JXFORM_CODE transform));
+EXTERN(boolean) jtransform_perfect_transform
+       JPP((JDIMENSION image_width, JDIMENSION image_height,
+            int MCU_width, int MCU_height,
+            JXFORM_CODE transform));
 
 /* jtransform_execute_transform used to be called
  * jtransform_execute_transformation, but some compilers complain about
  * routine names that long.  This macro is here to avoid breaking any
  * old source code that uses the original name...
  */
-#define jtransform_execute_transformation jtransform_execute_transform
+#define jtransform_execute_transformation      jtransform_execute_transform
 
 #endif /* TRANSFORMS_SUPPORTED */
 
@@ -198,16 +196,15 @@ EXTERN_1(boolean) jtransform_perfect_transform
 typedef enum {
        JCOPYOPT_NONE,          /* copy no optional markers */
        JCOPYOPT_COMMENTS,      /* copy only comment (COM) markers */
-       JCOPYOPT_ALL,           /* copy all optional markers */
-       JCOPYOPT_EXIF           /* copy Exif APP1 marker */
+       JCOPYOPT_ALL            /* copy all optional markers */
 } JCOPY_OPTION;
 
 #define JCOPYOPT_DEFAULT  JCOPYOPT_COMMENTS    /* recommended default */
 
 /* Setup decompression object to save desired markers in memory */
-EXTERN_1(void) jcopy_markers_setup
+EXTERN(void) jcopy_markers_setup
        JPP((j_decompress_ptr srcinfo, JCOPY_OPTION option));
 /* Copy markers saved in the given source object to the destination object */
-EXTERN_1(void) jcopy_markers_execute
+EXTERN(void) jcopy_markers_execute
        JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
             JCOPY_OPTION option));