Merge upstream version 2.0.1 from upstream into tizen

[platform/upstream/libjpeg-turbo.git] / jpeglib.h

diff --git a/jpeglib.h b/jpeglib.h
index 33f8ad2..302b8c6 100644 (file)
--- a/jpeglib.h
+++ b/jpeglib.h
@@ -291,6 +291,18 @@ typedef struct jpeg_common_struct *j_common_ptr;
 typedef struct jpeg_compress_struct *j_compress_ptr;
 typedef struct jpeg_decompress_struct *j_decompress_ptr;
 
+typedef struct _Pick_Color_
+{
+    unsigned int sumR;
+    unsigned int sumG;
+    unsigned int sumB;
+    int enablePickColor;
+    int perc;
+    int x1;
+    int y1;
+    int x2;
+    int y2;
+}PickColor;
 
 /* Master record for a compression instance */
 
@@ -492,6 +504,10 @@ struct jpeg_decompress_struct {
 
   unsigned int scale_num, scale_denom; /* fraction by which to scale image */
 
+#ifdef COLOR_PICKER_ENABLE
+  unsigned int region_x, region_y, region_w, region_h; /* if region_w && region_h > 0, then use this region to decode. scale above is done prior to region select */
+#endif
+
   double output_gamma;          /* image gamma wanted in output */
 
   boolean buffered_image;       /* TRUE=multiple output passes */
@@ -704,6 +720,10 @@ struct jpeg_decompress_struct {
   struct jpeg_upsampler *upsample;
   struct jpeg_color_deconverter *cconvert;
   struct jpeg_color_quantizer *cquantize;
+
+#ifdef COLOR_PICKER_ENABLE
+  struct _Pick_Color_ *pick_color_data;
+#endif
 };