Commit 97abd452 authored by Yaroslav Halchenko's avatar Yaroslav Halchenko
Browse files

Merge commit '0.85-24-gff1307fb' into debian

* commit '0.85-24-gff1307fb': (22 commits)
  disallow use of both -only options in -file-information
  add -only-number-of-maps to -file-information
  prevent string matching of partial command switch if more arguments are present
  add tips to -cifti-reorder about direction to use for particular cifti types
  document the ability to use "make install", and using OSMesa, fix version info of Quazip
  WB-382: Draw Borders as Unstretched Lines: Instead of implementing the unstretched lines functionality, lines are not drawn when one of the endpoints does not project to the flat surface, typically due to a cut or medial wall removal.
  Fixed OpenGL Invalid Operation.  Border line drawing mistakenly contained a glBegin/glEnd pair inside another glBegin/glEnd pair.
  ENH: install target binaries
  add casts to make sure int-to-float error checking does what is intended
  make reading functions for GiftiLabelTable consistent, fix bug preventing warning of multiple labels that should be interpreted as unlabeled
  update Quazip to 0.6 (last LGPLv2 version) as an attempt at issue #1
  fix bug where -zip-scene-file doesn't include the scene file
  Fix compilation error on 32-bit systems
  Changed operation NiftiInformation so that when the '-print-header' operation is used, it reads only the NiftiHeader and not the entire NiftiFile.  There is no need to read the entire file for this operation and for very large files, this operation either took a very long time or crashed.
  Fixed compilation warning in metric file.
  make -label-merge preserve column names
  Moved helper method for creating cartesian chart data from CiftiMappableDataFile to CaretMappableDataFile so that it can be used by Metric and Volume Files.  Added loading of charts from a multi-map volume file.  Added Charting library for include files in CommandLine and Test caused by addtions to VolumeFile.h
  ChartableInterface::getCaretMappableDataFile() was pure virtual but implemented identically in all implementing classes.  Since it does not require any 'member data' it is now implemented in the interface and implementation has been removed from all of the implementing classes.
  I thought I had committed these changes to metric file charting prior to pulling from repository but I guess not.
  Adding Charting include files to MetricFile.h required adding the Charting Module to both Commands and OperationsBase CMakeLists.txt files to enable compilation.
  ...
parents 970d37a1 ff1307fb
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment