Changeset 4833448 in git


Ignore:
Timestamp:
16/09/11 13:56:33 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/tags/1.2.0, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/trunk, travis-osx
Children:
f9b8a6b
Parents:
2bb17c9
Message:

lib/codes.po,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/trunk@3643 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r2bb17c9 r4833448  
     1Fri Sep 16 12:55:05 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * lib/codes.po,src/cavern.c: Add --3d-version option to allow the user
     4          to specify the version of the 3d format to output.  (ticket#21)
     5
    16Fri Sep 16 12:52:55 GMT 2011  Olly Betts <olly@survex.com>
    27
  • lib/codes.po

    r2bb17c9 r4833448  
    522522
    523523#, c-format
    524 #~ msgid "Error in format of font file `%s'"
    525 #~ msgstr "88"
     524msgid "3d file format versions %d to %d supported"
     525msgstr "88"
    526526
    527527#: ../src/readval.c:116
  • src/cavern.c

    r2bb17c9 r4833448  
    11/* cavern.c
    22 * SURVEX Cave surveying software: data reduction main and related functions
    3  * Copyright (C) 1991-2003,2004,2005,2010 Olly Betts
     3 * Copyright (C) 1991-2003,2004,2005,2010,2011 Olly Betts
    44 *
    55 * This program is free software; you can redistribute it and/or modify
     
    2323
    2424#include <limits.h>
     25#include <stdlib.h>
    2526#include <time.h>
    2627
     
    105106   {"warnings-are-errors", no_argument, 0, 'w'},
    106107   {"log", no_argument, 0, 1},
     108   {"3d-version", required_argument, 0, 'v'},
    107109#if OS_WIN32
    108110   {"pause", no_argument, 0, 2},
     
    113115};
    114116
    115 #define short_opts "pao:qswz:"
     117#define short_opts "pao:qsv:wz:"
    116118
    117119/* TRANSLATE extract help messages to message file */
     
    124126   {HLP_ENCODELONG(5),          "turn warnings into errors"},
    125127   {HLP_ENCODELONG(6),          "log output to .log file"},
     128   {HLP_ENCODELONG(7),          "specify the 3d file format version to output"},
    126129 /*{'z',                        "set optimizations for network reduction"},*/
    127130   {0, 0}
     
    229232         fSuppress = 1;
    230233         break;
     234       case 'v': {
     235         int v = atoi(optarg);
     236         if (v < IMG_VERSION_MIN || v > IMG_VERSION_MAX)
     237            fatalerror(/*3d file format versions %d to %d supported*/88,
     238                       IMG_VERSION_MIN, IMG_VERSION_MAX);
     239         img_output_version = v;
     240         break;
     241       }
    231242       case 'w':
    232243         f_warnings_are_errors = 1;
Note: See TracChangeset for help on using the changeset viewer.