Changeset 29442

Timestamp:

Oct 16, 2010, 10:46:52 AM (16 years ago)

Author:

eugene

Message:

add bDrawBuffer to psImageJpeg options, allowing for future overlays (requires kapa.h to deal with BYTE_SWAP issues)

Location:

branches/eam_branches/ipp-20100823/psLib/src

Files:

• jpeg/psImageJpeg.c (modified) (2 diffs)
• jpeg/psImageJpeg.h (modified) (1 diff)
• pslib.h (modified) (1 diff)

branches/eam_branches/ipp-20100823/psLib/src/jpeg/psImageJpeg.c

@@ -208 +208 @@
 
 // XXX need to update bDraw APIs to pass in/out structure and avoid the local static 
-bool psImageJpeg(const psImageJpegOptions *options, const psImage *image, void *bdbuf, const char *filename)
+bool psImageJpeg(const psImageJpegOptions *options, const psImage *image, bDrawBuffer *bdbuf, const char *filename)
 {
   PS_ASSERT_PTR_NON_NULL(options, false);
@@ -351 +351 @@
   if (bdbuf) {
     offset = (options->showScale == PS_JPEG_SHOWSCALE_TOP) ? PS_JPEG_COLORPAD + PS_JPEG_LABELPAD : 0;
-    psImageJpegOverlayDraw(jpegImage, (bDrawBuffer *) bdbuf, 0, offset);
+    psImageJpegOverlayDraw(jpegImage, bdbuf, 0, offset);
   }
 

branches/eam_branches/ipp-20100823/psLib/src/jpeg/psImageJpeg.h

@@ -53 +53 @@
 bool psImageJpeg(const psImageJpegOptions *options, // Color map
                  const psImage *image,  // Image to write
-                 void *bdbuf, 
+                 bDrawBuffer *bdbuf, 
                  const char *filename  // Filename of JPEG
                  );
 
-// bDrawBuffer *psImageJpegOverlayInit (const psImage *image);
+bDrawBuffer *psImageJpegOverlayInit (const psImage *image);
 
 /// @}

branches/eam_branches/ipp-20100823/psLib/src/pslib.h

@@ -17 +17 @@
 #define PS_LIB_H
 
+#include <kapa.h>
 #include "pslib_strict.h"