← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xplanet/trusty

« back to all changes in this revision

Viewing changes to src/Options.cpp

  • Committer: Package Import Robot
  • Author(s): Steve McIntyre
  • Date: 2014-01-30 18:54:10 UTC
  • mfrom: (4.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20140130185410-o2u51emh707gbevv
Tags: 1.3.0-1
http://bugs.debian.org/678464
http://bugs.debian.org/736052
http://bugs.debian.org/662568
* New maintainer
* Move to new upstream version 1.3.0. (Closes: #678464)
  + Upstream highlights:
    - add "outlined" keyword to marker files
    - update JPL ephemeris code for 64 bit machines
    - add bump_shade config file parameter
    - add opacity keyword for markers
    - implement Rayleigh scattering
  + Remove old Debian patches now obsoleted:
    - possible-buffer-overflow (included upstream)
    - orbit-step-bug (included upstream)
    - gcc44-includes (included upstream)
    - hyphen-used-as-minus-sign (included upstream)
    - tsc-aspect-ratio (included upstream)
  + Update (and include!) FreeMonoBold
* Update libtiff build-deps (Closes: #736052)
* Update libpng build-deps (Closes: #662568)
* Update Standards-Version to 3.9.5
* Update to debhelper 9 to enable hardening build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Options.cpp
102
102
    originMode_(LBR),
103
103
    outputBase_(""),
104
104
    outputExt_(defaultMapExt),
 
105
    outputMapRect_(""), 
105
106
    outputStartIndex_(0),
106
107
    oX_(0),
107
108
    oY_(0),
120
121
    random_(false),
121
122
    rangeSpecified_(false), 
122
123
    range_(1000),
 
124
    rayleighFile_(""),
123
125
    rotate_(0),
124
126
    rotate0_(0),
125
127
    saveDesktopFile_(false),
200
202
            {"center",         required_argument, NULL, CENTER},
201
203
            {"color",          required_argument, NULL, COLOR},
202
204
            {"config",         required_argument, NULL, CONFIG_FILE},
 
205
            {"create_scattering_tables", required_argument, NULL, RAYLEIGH_FILE},
203
206
            {"date",           required_argument, NULL, DATE},
204
207
            {"date_format",    required_argument, NULL, DATE_FORMAT},
205
208
            {"dynamic_origin", required_argument, NULL, DYNAMIC_ORIGIN},
233
236
            {"origin",         required_argument, NULL, ORIGIN},
234
237
            {"origin_file",    required_argument, NULL, ORIGINFILE},
235
238
            {"output",         required_argument, NULL, OUTPUT},
 
239
            {"output_map",     required_argument, NULL, OUTPUT_MAP_RECT},
236
240
            {"output_start_index",required_argument,NULL,OUTPUT_START_INDEX},
237
241
            {"pango",          no_argument,       NULL, PANGO},
238
242
            {"path_relative_to",         required_argument, NULL, PATH_RELATIVE_TO},
622
626
            displayMode_ = OUTPUT;
623
627
            geometrySelected_ = true;
624
628
            break;
 
629
        case OUTPUT_MAP_RECT:
 
630
        {
 
631
            string base = optarg;
 
632
            string ext = defaultMapExt;
 
633
            if (base.find('.') != string::npos)
 
634
            {
 
635
                ext.assign(base, base.rfind('.'), base.size());
 
636
                base.assign(base, 0, base.rfind('.'));
 
637
            }
 
638
            outputMapRect_ = base + ext;
 
639
        }
 
640
        break;
625
641
        case OUTPUT_START_INDEX:
626
642
            sscanf(optarg, "%d", &outputStartIndex_);
627
643
            break;
744
760
                       __FILE__, __LINE__);
745
761
            }
746
762
            break;
 
763
        case RAYLEIGH_FILE:
 
764
            rayleighFile_ = optarg;
 
765
            break;
747
766
        case ROTATE:
748
767
            sscanf(optarg, "%lf", &rotate0_);
749
768
            rotate0_ = fmod(rotate0_, 360.) * deg_to_rad;