Changeset 29858

Timestamp:

Nov 26, 2010, 11:47:42 AM (15 years ago)

Author:

eugene

Message:

bDrawBuffer now requires a palette

File:

• branches/eam_branches/ipp-20101103/psLib/src/jpeg/psImageJpeg.c (modified) (3 diffs)

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

@@ -167 +167 @@
   int dy = image->numRows;
   
-  bDrawBuffer *bdbuf = bDrawBufferCreate(dx, dy);
+  int Npalette;
+  png_color *palette = KapaPNGPalette (&Npalette);
+
+  bDrawBuffer *bdbuf = bDrawBufferCreate(dx, dy, 1, palette, Npalette);
 
   return bdbuf;
@@ -180 +183 @@
   int dy = bdbuf->Ny;
 
-  int Npalette;
-  png_color *palette = KapaPNGPalette (&Npalette);
+  int Npalette = bdbuf->Npalette;
+  png_color *palette = bdbuf->palette;
   bDrawColor white = KapaColorByName ("white");
   for (int j = 0; j < dy; j++) {
@@ -336 +339 @@
 
     // set the scalebar labels
+    int Npalette;
+    png_color *palette = KapaPNGPalette (&Npalette);
+
     char string[64];
-    bDrawBuffer *labels = bDrawBufferCreate(dx, PS_JPEG_LABELPAD);
+    bDrawBuffer *labels = bDrawBufferCreate(dx, PS_JPEG_LABELPAD, 1, palette, Npalette);
     SetRotFont ("helvetica", 8);
-    bDrawSetBuffer(labels);
     sprint_double (string, options->min);
-    bDrawRotText(2, 2, string, 2, 0.0);
+    bDrawRotText(labels, 2, 2, string, 2, 0.0);
     sprint_double (string, options->max);
-    bDrawRotText(dx - 2, 2, string, 0, 0.0);
+    bDrawRotText(labels, dx - 2, 2, string, 0, 0.0);
     sprint_double (string, 0.5*(options->min + options->max));
-    bDrawRotText(0.5*dx, 2, string, 1, 0.0);
+    bDrawRotText(labels, 0.5*dx, 2, string, 1, 0.0);
     psImageJpegOverlayDraw(jpegImage, labels, 0, offset);
+    bdDrawBufferFree(labels);
   }