Changeset c0d8e5d in git for src/export.cc


Ignore:
Timestamp:
28/02/15 12:38:29 (5 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
327540d
Parents:
586e78c
Message:

src/export.cc: Eliminate more static variables.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/export.cc

    r586e78c rc0d8e5d  
    106106static double marker_size; /* for station markers */
    107107static double grid; /* grid spacing (or 0 for no grid) */
    108 static const char *unit = "mm";
    109 const double SVG_MARGIN = 5.0; // In units of "unit".
    110 
    111 static const char *survey = NULL;
    112108
    113109const int *
     
    594590            double max_x, double max_y, double /*max_z*/)
    595591{
    596    size_t i;
     592   const char *unit = "mm";
     593   const double SVG_MARGIN = 5.0; // In units of "unit".
    597594   htab = (point **)osmalloc(HTAB_SIZE * ossizeof(point *));
    598    for (i = 0; i < HTAB_SIZE; ++i) htab[i] = NULL;
     595   for (size_t i = 0; i < HTAB_SIZE; ++i) htab[i] = NULL;
    599596   fprintf(fh, "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n");
    600597   double width = (max_x - min_x) * factor + SVG_MARGIN * 2;
     
    778775            double max_x, double max_y, double max_z)
    779776{
     777   // FIXME: allow survey to be set from aven somehow!
     778   const char *survey = NULL;
    780779   htab = (point **)osmalloc(HTAB_SIZE * ossizeof(point *));
    781780   for (size_t i = 0; i < HTAB_SIZE; ++i) htab[i] = NULL;
     
    11691168   grid = grid_;
    11701169   marker_size = marker_size_;
    1171 
    1172 #if 0 // FIXME: allow this to be set from aven somehow!
    1173        case 's':
    1174          survey = optarg;
    1175          break;
    1176 #endif
    11771170
    11781171   ExportFilter * filt;
Note: See TracChangeset for help on using the changeset viewer.