Changeset 33650

Timestamp:

Apr 1, 2012, 2:30:36 PM (14 years ago)

Author:

eugene

Message:

working on trimming pngs to avoid excess whitespace

Location:

trunk/Ohana/src

Files:

• kapa2/include/prototypes.h (modified) (1 diff)
• kapa2/src/PNGit.c (modified) (2 diffs)
• kapa2/src/Sections.c (modified) (1 diff)
• kapa2/src/bDrawIt.c (modified) (1 diff)
• libkapa/src/bDrawFuncs.c (modified) (1 diff)

trunk/Ohana/src/kapa2/include/prototypes.h

@@ -99 +99 @@
 int           ListSection         PROTO((int sock));
 void          SetSectionSizes     PROTO((Section *section));
+int           SectionMinBoundary  PROTO((Graphic *graphic));
 
 KapaGraphWidget *InitGraph        PROTO((void));

trunk/Ohana/src/kapa2/src/PNGit.c

@@ -22 +22 @@
 
   graphic = GetGraphic();
+
+  // limit the png window to the min needed to contain the active graphic regions
+  SectionMinBoundary (graphic);
 
   f = fopen (filename, "w");
@@ -81 +84 @@
   /* see docs for write-row-callback to provide progress info */
   if (haveImage) {
-    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);
+    png_set_IHDR (png_ptr, info_ptr, graphic->dxwin, graphic->dywin, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
     png_set_sRGB (png_ptr, info_ptr, PNG_sRGB_INTENT_ABSOLUTE);
   } else {
-    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, graphic->dxwin, graphic->dywin, 8, PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); 
     png_set_PLTE (png_ptr, info_ptr, palette, Npalette); 
   }

trunk/Ohana/src/kapa2/src/Sections.c

@@ -245 +245 @@
     int Xe = 0;
     int Ye = 0;
+
+# if (1)
+    graphic->xwin  = 0;
+    graphic->ywin  = 0;
+    graphic->dxwin = graphic->dx;
+    graphic->dywin = graphic->dy; 
+    return TRUE;
+# endif
 
     // the boundary for a single section should probably be adjusted depending on the 

trunk/Ohana/src/kapa2/src/bDrawIt.c

@@ -12 +12 @@
 
   black = KapaColorByName ("black");
-
-  // SectionMinBoundary (graphic);
 
   // if we want to trim, we'll need to carry about the start in graphic coords and

trunk/Ohana/src/libkapa/src/bDrawFuncs.c

@@ -1 +1 @@
 # include <kapa_internal.h>
-# define myAssert(LOGIC,MSG) { if (!(LOGIC)) { fprintf (stderr, "%s\n", MSG); abort (); } }
 
 // move these to the bDrawBuffer type