Changeset 29542 for trunk/psLib/src/jpeg/psImageJpeg.h

Timestamp:

Oct 25, 2010, 12:54:22 PM (16 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20100823

File:

• trunk/psLib/src/jpeg/psImageJpeg.h (modified) (1 diff)

trunk/psLib/src/jpeg/psImageJpeg.h

@@ -15 +15 @@
 #include "psImage.h"
 
-typedef struct
-{
-    psVector *red;                      // Red colormap
-    psVector *green;                    // Green colormap
-    psVector *blue;                     // Blue colormap
-}
-psImageJpegColormap;
+typedef enum {
+  PS_JPEG_SHOWSCALE_NONE,
+  PS_JPEG_SHOWSCALE_TOP,
+  PS_JPEG_SHOWSCALE_BOTTOM
+} psImageJpegShowScaleOption;  
+
+typedef struct {
+  psVector *red;                      // Red colormap
+  psVector *green;                    // Green colormap
+  psVector *blue;                     // Blue colormap
+  psU8 white;                         // colormap-independent values
+  psU8 black;
+  float min;
+  float max;
+  bool xFlip;
+  bool yFlip;
+  psImageJpegShowScaleOption showScale; 
+  // XXX include bDrawBuffer in here?
+} psImageJpegOptions;
 
 #define PS_JPEG_RANGELIM(A)(PS_MAX(0,PS_MIN(255,(A))))
-
 #define PS_JPEG_SCALEVALUE(VALUE,ZERO,SCALE)(PS_MAX(0,PS_MIN(255,(SCALE*(VALUE-ZERO)))))
 
+#define PS_JPEG_COLORPAD 10
+#define PS_JPEG_LABELPAD 12
+
 // allocate a colormap (does not define the map values)
-psImageJpegColormap *psImageJpegColormapAlloc(void) PS_ATTR_MALLOC;
+psImageJpegOptions *psImageJpegOptionsAlloc(void) PS_ATTR_MALLOC;
 
 // set the colormap values using the supplied name
-psImageJpegColormap *psImageJpegColormapSet(psImageJpegColormap *map, // Colormap to set
-        const char *name // Name of colormap
-                                           );
+bool psImageJpegColormapSet(psImageJpegOptions *options, // Colormap to set
+                            const char *name // Name of colormap
+                            );
 
 // write out a JPEG file using the supplied image and colormap
 // output goes to the specified filename
-bool psImageJpeg(const psImageJpegColormap *map, // Color map
+bool psImageJpeg(const psImageJpegOptions *options, // Color map
                  const psImage *image,  // Image to write
-                 const char *filename,  // Filename of JPEG
-                 float min, float max   // Minimum and maximum values
-                );
+                 bDrawBuffer *bdbuf, 
+                 const char *filename  // Filename of JPEG
+                 );
+
+bDrawBuffer *psImageJpegOverlayInit (const psImage *image);
 
 /// @}