Changeset 7040 for trunk/Ohana/src/kapa/graph/PNGit.c

Timestamp:

May 2, 2006, 9:19:22 AM (20 years ago)

Author:

eugene

Message:

removed old junk

File:

• trunk/Ohana/src/kapa/graph/PNGit.c (modified) (6 diffs)

trunk/Ohana/src/kapa/graph/PNGit.c

@@ -1 +1 @@
 # include "Ximage.h"
-# include <png.h>
 
-int PNGit_old () {
+int PNGit () {
 
   FILE *f;
@@ -8 +7 @@
   png_infop info_ptr;
   png_color *palette;
-  int *pchoice;
-  XColor color;
-  png_byte **rows;
-  int dx, dy;
-  int i, j, k, found;
   int Npalette;
-  XImage *tmpimage;
-  unsigned long pixel;
   char filename[1024];
   int Nbytes, status;
 
-  Npalette = GetColormapSize ();
-  ALLOCATE (pchoice, int, Npalette);
-  ALLOCATE (palette, png_color, Npalette);
+  bDrawBuffer *buffer;
 
-  dx = graphic.dx;
-  dy = graphic.dy;
-  
   /* expect a line telling the number of bytes and a filename */
   status = read (sock, filename, 16);
@@ -33 +20 @@
   filename[status] = 0; /* make the string easy to parse */
 
-  ALLOCATE (rows, png_byte *, dy);
-  for (i = 0; i < dy; i++) {
-    ALLOCATE (rows[i], png_byte, dx);
-  }
-
-  /* define the palette */
-  for (i = 0; i < Npalette; i++) {
-    color.pixel = graphic.color[i];
-    XQueryColor (graphic.display, graphic.colormap, &color);
-    palette[i].red = (0x100 * color.red / 0x10000);
-    palette[i].green = (0x100 * color.green / 0x10000);
-    palette[i].blue = (0x100 * color.blue / 0x10000);
-    pchoice[i] = color.pixel;
-  }
-
   f = fopen (filename, "w");
   if (f == (FILE *) NULL) {
     fprintf (stderr, "can't open output file %s\n", "Xgraph.png");
-    free (pchoice);
-    free (palette);
     return (TRUE);  /* true because otherwise it quits kapa! */
   }
@@ -58 +28 @@
   png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, (png_voidp) NULL, (png_voidp) NULL, (png_voidp) NULL);
   if (!png_ptr) {
+    fprintf (stderr, "can't get png structure\n");
     fclose (f);
-    fprintf (stderr, "can't get png structure\n");
-    free (pchoice);
-    free (palette);
     return (TRUE);
   }
@@ -67 +35 @@
   info_ptr = png_create_info_struct (png_ptr);
   if (!info_ptr) {
+    fprintf (stderr, "can't get png info structure\n");
     png_destroy_write_struct (&png_ptr, (png_infopp) NULL);
     fclose (f);
-    fprintf (stderr, "can't get png info structure\n");
-    free (pchoice);
-    free (palette);
     return (TRUE);
   }
 
   if (setjmp (png_ptr[0].jmpbuf)) {
+    fprintf (stderr, "can't get png return\n");
     png_destroy_write_struct (&png_ptr, &info_ptr);
     fclose (f);
-    fprintf (stderr, "can't get png return\n");
-    free (pchoice);
-    free (palette);
     return (TRUE);
   }
@@ -88 +52 @@
   /* see docs for write-row-callback to provide progress info */
 
-  png_set_IHDR (png_ptr, info_ptr, dx, dy, 8, PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); 
+  png_set_IHDR (png_ptr, info_ptr, graphic.dx, graphic.dy, 8, PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); 
 
-  /* png_set_IHDR (png_ptr, info_ptr, dx, dy, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); */
+  /* png_set_IHDR (png_ptr, info_ptr, graphic.dx, graphic.dy, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); */
 
+  palette = KapaPNGPalette (&Npalette);
   png_set_PLTE (png_ptr, info_ptr, palette, Npalette); 
  
   png_write_info (png_ptr, info_ptr);
 
-  /* a new attempt... */
+  buffer = bDrawIt ();
 
-  {
-    XWindowAttributes WindowAttributes;
-    Pixmap tmp_pixmap;
-    Window tmp_window;
-    
-    XGetWindowAttributes (graphic.display, graphic.window, &WindowAttributes);
-    
-    tmp_pixmap = XCreatePixmap (graphic.display, graphic.window, dx, dy, WindowAttributes.depth);
-
-    tmp_window = graphic.window;
-    graphic.window = tmp_pixmap;
-
-    Refresh (1);
-
-    tmpimage = XGetImage (graphic.display, graphic.window, 0, 0, dx, dy, 0xffffffff, ZPixmap);
-    for (j = 0; j < dy; j++) {
-      for (i = 0; i < dx; i++) {
-        pixel = XGetPixel (tmpimage, i, j);
-        for (found = k = 0; (k < Npalette) && !found; k++) {
-          if (pixel == pchoice[k]) {
-            found = TRUE;
-            rows[j][i] = k;
-          }
-        }
-      }
-    }
-    graphic.window = tmp_window;
-    XFreePixmap (graphic.display, tmp_pixmap);
-  }
-
-  png_write_image (png_ptr, rows);
+  png_write_image (png_ptr, buffer[0].pixels);
   png_write_end (png_ptr, info_ptr);
   png_destroy_write_struct (&png_ptr, &info_ptr);
-
-  for (i = 0; i < dy; i++) {
-    free (rows[i]);
-  }
-  free (rows);
-
-  XDestroyImage (tmpimage);
-
+  
+  bDrawBufferFree (buffer);
+  free (palette);
   fclose (f);
-  free (pchoice);
-  free (palette);
   return (TRUE);