add mising parameter in text_bbox() needed if compiling without cairo, tedax_netlist updated to be in line with other backends.

src/draw.c

@@ -262,11 +262,11 @@ void draw_string(int layer, int what, const char *str, short rot, short flip, in
  double a=0.0,yy;
  register double rx1=0,rx2=0,ry1=0,ry2=0;
  double curr_x1,curr_y1,curr_x2,curr_y2;
- register double zx1, invxscale;
- register int pos=0,pos2=0;
- register unsigned int cc;
- register double *char_ptr_x1,*char_ptr_y1,*char_ptr_x2,*char_ptr_y2;
- register int i,lines, no_of_lines, longest_line;
+ double zx1, invxscale;
+ int pos=0,pos2=0;
+ unsigned int cc;
+ double *char_ptr_x1,*char_ptr_y1,*char_ptr_x2,*char_ptr_y2;
+ int i,lines, no_of_lines, longest_line;
 
  if(str==NULL || !has_x ) return;
  dbg(2, "draw_string(): string=%s\n",str);

src/psprint.c

@@ -344,7 +344,7 @@ static void old_ps_draw_string(int gctext,  const char *str,
                    x1,y1, &rx1,&ry1,&rx2,&ry2, &no_of_lines, &longest_line);
  #else
  text_bbox(str, xscale, yscale, rot, flip, hcenter, vcenter,
-           x1,y1, &rx1,&ry1,&rx2,&ry2, &no_of_lines);
+           x1,y1, &rx1,&ry1,&rx2,&ry2, &no_of_lines, &longest_line);
  #endif
  xscale*=nocairo_font_xscale;
  yscale*=nocairo_font_yscale;

src/spice_netlist.c

@@ -425,9 +425,9 @@ void spice_netlist(FILE *fd, int spice_stop )
        }
      }
     }
+    my_free(952, &type);
   }
   if(!spice_stop && !netlist_count) redraw_hilights(); /* draw_hilight_net(1); */
-  my_free(952, &type);
 }
 
 /* calculate the hash function relative to string s */

src/tedax_netlist.c

@@ -196,9 +196,11 @@ void tedax_netlist(FILE *fd, int tedax_stop )
   int i;
   char *type=NULL;
 
-  xctx->prep_net_structs = 0;
-  prepare_netlist_structs(1);
-  traverse_node_hash();  /* print all warnings about unconnected floatings etc */
+  if(!tedax_stop) {
+    xctx->prep_net_structs = 0;
+    prepare_netlist_structs(1);
+    traverse_node_hash();  /* print all warnings about unconnected floatings etc */
+  }
   if(!tedax_stop) {
     for(i=0;i<xctx->instances;i++) /* print first ipin/opin defs ... */
     {
@@ -235,9 +237,9 @@ void tedax_netlist(FILE *fd, int tedax_stop )
        }
      }
     }
+    my_free(967, &type);
   }
-  if(!netlist_count) redraw_hilights(); /* draw_hilight_net(1); */
-  my_free(967, &type);
+  if(!tedax_stop && !netlist_count) redraw_hilights(); /* draw_hilight_net(1); */
 }
 
 

src/vhdl_netlist.c

@@ -689,8 +689,8 @@ void vhdl_netlist(FILE *fd , int vhdl_stop)
      }
     }
    }
+   my_free(1097, &type);
  }
  dbg(1, "vhdl_netlist():       end\n");
  if(!vhdl_stop && !netlist_count) redraw_hilights(); /* draw_hilight_net(1); */
- my_free(1097, &type);
 }