Skip to content

Commit

Permalink
Added link #138
Browse files Browse the repository at this point in the history
  • Loading branch information
neurolabusc committed Oct 16, 2017
1 parent ab1af98 commit b759e86
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ This software should run on macOS, Linux and Windows typically without requiring
- Experimental [ECAT support](https://github.com/rordenlab/dcm2niix/issues/95).
- Updated cmake to make JPEG2000 support easier with improved Travis and AppVeyor support [Ningfei Li](https://github.com/ningfei).
- Supports Data/Time for images that report Data/Time (0008,002A) but not separate Date and Time (0008,0022 and 0008,0032).
- [BIDS reports morning times correctly](http://www.nitrc.org/forum/message.php?msg_id=20852).
- [BIDS reports SliceTiming correctly](http://www.nitrc.org/forum/message.php?msg_id=20852).
- Options -1..-9 to control [gz compression level](https://github.com/rordenlab/dcm2niix/issues/90).
- Includes some [PET details in the BIDS JSON sidecar](https://github.com/rordenlab/dcm2niix/issues/87).
- Better detection of image order for Philips 4D DICOM (reported by Jason McMorrow and Stephen Wilson).
Expand Down Expand Up @@ -208,6 +208,7 @@ If you have any problems with the cmake build script described above or want to
- [dcm2niir](https://github.com/muschellij2/dcm2niir) R wrapper for dcm2niix/dcm2nii.
- [divest](https://github.com/jonclayden/divest) R interface to dcm2niix.
- [sci-tran dcm2niix](https://github.com/scitran-apps/dcm2niix) docker.
- [neuro_docker](https://github.com/Neurita/neuro_docker) includes dcm2niix.
- [neuro_docker](https://github.com/Neurita/neuro_docker) includes dcm2niix as part of a provides a single, static Dockerfile.
- [neurodocker](https://github.com/kaczmarj/neurodocker) generates [custom](https://github.com/rordenlab/dcm2niix/issues/138) Dockerfiles given specific versions of neuroimaging software.
- [dcm2niix_afni](https://afni.nimh.nih.gov/pub/dist/doc/program_help/dcm2niix_afni.html) is a version of dcm2niix included with the [AFNI](https://afni.nimh.nih.gov/) distribution.
- [MRIcroGL](https://github.com/neurolabusc/MRIcroGL) is available for MacOS, Linux and Windows and provides a graphical interface for dcm2niix. You can get compiled copies from the [MRIcroGL NITRC web site](https://www.nitrc.org/projects/mricrogl/).
10 changes: 4 additions & 6 deletions console/nii_dicom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1972,7 +1972,7 @@ unsigned char * nii_loadImgCore(char* imgname, struct nifti_1_header hdr, int bi
if (bitsAllocated == 12)
conv12bit16bit(bImg, hdr);
return bImg;
} //nii_loadImg()
} //nii_loadImgCore()

unsigned char * nii_planar2rgb(unsigned char* bImg, struct nifti_1_header *hdr, int isPlanar) {
//DICOM data saved in triples RGBRGBRGB, NIfTI RGB saved in planes RRR..RGGG..GBBBB..B
Expand Down Expand Up @@ -2589,15 +2589,13 @@ unsigned char * nii_loadImgXL(char* imgname, struct nifti_1_header *hdr, struct
if ((dcm.compressionScheme == kCompressYes) && (compressFlag != kCompressNone) )
img = nii_loadImgCoreJasper(imgname, *hdr, dcm, compressFlag);
else
#else
UNUSED(compressFlag); //avoid compiler -Wunused-parameter warning: compressFlag required when myEnableJasper or not myDisableOpenJPEG
#endif
#endif
#endif
if (dcm.compressionScheme == kCompressYes) {
if (dcm.compressionScheme == kCompressYes) {
printMessage("Software not set up to decompress DICOM\n");
return NULL;
} else
img = nii_loadImgCore(imgname, *hdr, dcm.bitsAllocated);
img = nii_loadImgCore(imgname, *hdr, dcm.bitsAllocated);
if (img == NULL) return img;
if ((dcm.compressionScheme == kCompressNone) && (dcm.isLittleEndian != littleEndianPlatform()) && (hdr->bitpix > 8))
img = nii_byteswap(img, hdr);
Expand Down

0 comments on commit b759e86

Please sign in to comment.