Skip to content

Commit

Permalink
Making version consistent with MRIcroGL
Browse files Browse the repository at this point in the history
  • Loading branch information
neurolabusc committed Jun 7, 2016
1 parent 2330608 commit 6da5019
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This software is open source. The bulk of the code is covered by the BSD license

## Versions

20-May-2016
6-June-2016
- Re-enable custom output directory "-o" option broken by 30-Apr-2016 version
- Deal with mis-behaved GE CT images where slice direction across images is not consistent.

Expand Down
6 changes: 3 additions & 3 deletions console/nii_dicom.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ extern "C" {
#endif

#ifdef myEnableJasper
#define kDCMvers "20May2016j" //JASPER for JPEG2000
#define kDCMvers "6June2016j" //JASPER for JPEG2000
#else
#ifdef myDisableOpenJPEG
#define kDCMvers "20May2016" //no decompressor
#define kDCMvers "6June2016" //no decompressor
#else
#define kDCMvers "20May2016o" //OPENJPEG for JPEG2000
#define kDCMvers "6June2016o" //OPENJPEG for JPEG2000
#endif
#endif

Expand Down
5 changes: 0 additions & 5 deletions console/nii_dicom_batch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1920,11 +1920,6 @@ int nii_loadDir (struct TDCMopts* opts) {
#endif
return EXIT_FAILURE;
}
#ifdef myUseCOut
std::cout << "Version " <<kDCMvers <<std::endl;
#else
printf("Version %s (%llu-bit)\n",kDCMvers, (unsigned long long) sizeof(size_t)*8);
#endif
char indir[512];
strcpy(indir,opts->indir);
bool isFile = is_fileNotDir(opts->indir);
Expand Down

0 comments on commit 6da5019

Please sign in to comment.