More fixes for .20

-Yosh

ChangeLog

+Wed Mar 11 22:02:03 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* Made 0.99.20 release
+
 Wed Mar 11 21:42:15 PST 1998 Manish Singh <yosh@gimp.org>
 
 	* app/iscissors.c: another iscissors patch, don't know

app/batch.c

@@ -145,7 +145,7 @@ batch_run_cmd (char *cmd)
 	  args[i].value.pdb_float = atof (cmd);
 	  break;
 	case PDB_STRING:
-	  cmd = strtok (NULL, " )");
+	  cmd = strtok (NULL, "\"");
 	  if (!cmd)
 	    goto error;
 

app/iscissors.c

@@ -754,10 +754,13 @@ iscissors_draw_CR (GDisplay  *gdisp,
 	  geometry[i][1] = pts[indices[i]].dy * SUPERSAMPLE;
 	  break;
 	case SCREEN_COORDS:
-	  /*gdisplay_transform_coords_f (gdisp, (int) pts[indices[i]].dx,
-				       (int) pts[indices[i]].dy, &x, &y, TRUE);*/
-	  geometry[i][0] = pts[indices[i]].dx/*x*/;
-	  geometry[i][1] = pts[indices[i]].dy/*y*/;
+	  /*gdisplay_transform_coords_f (gdisp, , &x, &y, TRUE);*/
+	  gdisplay_untransform_coords_f (gdisp, (int) pts[indices[i]].dx, (int) pts[indices[i]].dy,
+			   &x, &y, TRUE); 
+
+	  geometry[i][0] = x;
+	  geometry[i][1] = y;
+	  /*g_print("%f %f\n", x, y);*/
 	  break;
 	}
       geometry[i][2] = 0;
@@ -1981,8 +1984,10 @@ construct_edge_map (Tool    *tool,
   long dboffset;
    
   PixelRegion srcPR, destPR;
-  /* FILE *dump; */
-
+/*#define ISCISSORS_STILL_DOES_NOT_WORK */
+#ifdef ISCISSORS_STILL_DOES_NOT_WORK
+   FILE *dump; 
+#endif
   /*  init some variables  */
   srcPR.bytes = edge_buf->bytes;
   destPR.rowstride = edge_buf->bytes * edge_buf->width;
@@ -2067,14 +2072,16 @@ construct_edge_map (Tool    *tool,
       row ++;
       y = row * BLOCK_HEIGHT;
     }
+    
+#ifdef ISCISSORS_STILL_DOES_NOT_WORK
 
   /*  dump the edge buffer for debugging*/
 
-   /*dump=fopen("dump", "w"); 
+   dump=fopen("dump", "w"); 
    fprintf(dump, "P5\n%d %d\n255\n", edge_buf->width, edge_buf->height); 
    fwrite(edge_buf->data, edge_buf->width * edge_buf->height, sizeof (guchar), dump); 
-   fclose (dump);*/
-
+   fclose (dump);
+#endif
 }
 
 

app/tools/gimpiscissorstool.c

@@ -754,10 +754,13 @@ iscissors_draw_CR (GDisplay  *gdisp,
 	  geometry[i][1] = pts[indices[i]].dy * SUPERSAMPLE;
 	  break;
 	case SCREEN_COORDS:
-	  /*gdisplay_transform_coords_f (gdisp, (int) pts[indices[i]].dx,
-				       (int) pts[indices[i]].dy, &x, &y, TRUE);*/
-	  geometry[i][0] = pts[indices[i]].dx/*x*/;
-	  geometry[i][1] = pts[indices[i]].dy/*y*/;
+	  /*gdisplay_transform_coords_f (gdisp, , &x, &y, TRUE);*/
+	  gdisplay_untransform_coords_f (gdisp, (int) pts[indices[i]].dx, (int) pts[indices[i]].dy,
+			   &x, &y, TRUE); 
+
+	  geometry[i][0] = x;
+	  geometry[i][1] = y;
+	  /*g_print("%f %f\n", x, y);*/
 	  break;
 	}
       geometry[i][2] = 0;
@@ -1981,8 +1984,10 @@ construct_edge_map (Tool    *tool,
   long dboffset;
    
   PixelRegion srcPR, destPR;
-  /* FILE *dump; */
-
+/*#define ISCISSORS_STILL_DOES_NOT_WORK */
+#ifdef ISCISSORS_STILL_DOES_NOT_WORK
+   FILE *dump; 
+#endif
   /*  init some variables  */
   srcPR.bytes = edge_buf->bytes;
   destPR.rowstride = edge_buf->bytes * edge_buf->width;
@@ -2067,14 +2072,16 @@ construct_edge_map (Tool    *tool,
       row ++;
       y = row * BLOCK_HEIGHT;
     }
+    
+#ifdef ISCISSORS_STILL_DOES_NOT_WORK
 
   /*  dump the edge buffer for debugging*/
 
-   /*dump=fopen("dump", "w"); 
+   dump=fopen("dump", "w"); 
    fprintf(dump, "P5\n%d %d\n255\n", edge_buf->width, edge_buf->height); 
    fwrite(edge_buf->data, edge_buf->width * edge_buf->height, sizeof (guchar), dump); 
-   fclose (dump);*/
-
+   fclose (dump);
+#endif
 }
 
 

app/tools/iscissors.c

@@ -754,10 +754,13 @@ iscissors_draw_CR (GDisplay  *gdisp,
 	  geometry[i][1] = pts[indices[i]].dy * SUPERSAMPLE;
 	  break;
 	case SCREEN_COORDS:
-	  /*gdisplay_transform_coords_f (gdisp, (int) pts[indices[i]].dx,
-				       (int) pts[indices[i]].dy, &x, &y, TRUE);*/
-	  geometry[i][0] = pts[indices[i]].dx/*x*/;
-	  geometry[i][1] = pts[indices[i]].dy/*y*/;
+	  /*gdisplay_transform_coords_f (gdisp, , &x, &y, TRUE);*/
+	  gdisplay_untransform_coords_f (gdisp, (int) pts[indices[i]].dx, (int) pts[indices[i]].dy,
+			   &x, &y, TRUE); 
+
+	  geometry[i][0] = x;
+	  geometry[i][1] = y;
+	  /*g_print("%f %f\n", x, y);*/
 	  break;
 	}
       geometry[i][2] = 0;
@@ -1981,8 +1984,10 @@ construct_edge_map (Tool    *tool,
   long dboffset;
    
   PixelRegion srcPR, destPR;
-  /* FILE *dump; */
-
+/*#define ISCISSORS_STILL_DOES_NOT_WORK */
+#ifdef ISCISSORS_STILL_DOES_NOT_WORK
+   FILE *dump; 
+#endif
   /*  init some variables  */
   srcPR.bytes = edge_buf->bytes;
   destPR.rowstride = edge_buf->bytes * edge_buf->width;
@@ -2067,14 +2072,16 @@ construct_edge_map (Tool    *tool,
       row ++;
       y = row * BLOCK_HEIGHT;
     }
+    
+#ifdef ISCISSORS_STILL_DOES_NOT_WORK
 
   /*  dump the edge buffer for debugging*/
 
-   /*dump=fopen("dump", "w"); 
+   dump=fopen("dump", "w"); 
    fprintf(dump, "P5\n%d %d\n255\n", edge_buf->width, edge_buf->height); 
    fwrite(edge_buf->data, edge_buf->width * edge_buf->height, sizeof (guchar), dump); 
-   fclose (dump);*/
-
+   fclose (dump);
+#endif
 }
 
 

docs/Makefile.am

@@ -11,6 +11,7 @@ BUILT_SOURCES = pdb_dump.texi
 
 info_TEXINFOS = pdb.texi
 pdb_TEXINFOS = pdb_dump.texi
+man_MANS = gimp.1
 
 pdb_dump.texi: $(srcdir)/pdb_self_doc.el $(srcdir)/pdb_dump
 	cd $(srcdir) && \