Changeset 7cc9658 in git


Ignore:
Timestamp:
20/09/11 07:48:41 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
svn/1.0, svn/tags/1.0.40
Children:
5d7d82d
Parents:
02ac18d
Message:

Backport change from 1.2.0:
src/cavern.c: Add --3d-version option to allow the user
to specify the version of the 3d format to output. (ticket#21)

git-svn-id: file:///home/survex-svn/survex/branches/1.0@3682 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r02ac18d r7cc9658  
     1Tue Sep 20 06:48:01 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * Backport change from 1.2.0:
     4        * src/cavern.c: Add --3d-version option to allow the user
     5          to specify the version of the 3d format to output.  (ticket#21)
     6
    17Tue Sep 20 06:44:32 GMT 2011  Olly Betts <olly@survex.com>
    28
  • src/cavern.c

    r02ac18d r7cc9658  
    11/* cavern.c
    22 * SURVEX Cave surveying software: data reduction main and related functions
    3  * Copyright (C) 1991-2003,2004,2005 Olly Betts
     3 * Copyright (C) 1991-2003,2004,2005,2011 Olly Betts
    44 *
    55 * This program is free software; you can redistribute it and/or modify
     
    118118   {"warnings-are-errors", no_argument, 0, 'w'},
    119119   {"log", no_argument, 0, 1},
     120   {"3d-version", required_argument, 0, 'v'},
    120121#ifdef CHASM3DX
    121122   {"chasm-format", no_argument, 0, 'x'},
     
    130131
    131132#ifdef CHASM3DX
    132 #define short_opts "pxao:qswz:"
     133#define short_opts "pxao:qsv:wz:"
    133134#else
    134 #define short_opts "pao:qswz:"
     135#define short_opts "pao:qsv:wz:"
    135136#endif
    136137
     
    144145   {HLP_ENCODELONG(5),          "turn warnings into errors"},
    145146   {HLP_ENCODELONG(6),          "log output to .log file"},
    146 #ifdef CHASM3DX
    147    {HLP_ENCODELONG(7),          "output data in chasm's 3dx format"},
     147   {HLP_ENCODELONG(7),          "specify the 3d file format version to output"},
     148#ifdef CHASM3DX
     149   {HLP_ENCODELONG(8),          "output data in chasm's 3dx format"},
    148150#endif
    149151 /*{'z',                        "set optimizations for network reduction"},*/
     
    247249         fSuppress = 1;
    248250         break;
     251       case 'v': {
     252         int v = atoi(optarg);
     253         if (v < IMG_VERSION_MIN || v > IMG_VERSION_MAX)
     254            fatalerror(/*3d file format versions %d to %d supported*/88,
     255                       IMG_VERSION_MIN, IMG_VERSION_MAX);
     256         img_output_version = v;
     257         break;
     258       }
    249259       case 'w':
    250260         f_warnings_are_errors = 1;
Note: See TracChangeset for help on using the changeset viewer.