jpr [Fri, 3 Oct 2003 07:46:06 +0000 (07:46 +0000)]
gdcmFile::GetImageDataIntoVector now
- deals with MultiFrames MultiFragments Run Length Encoded files
- deals with YcBcR (YBR_FULL) files
- deals with YBR_YBR_FULL_422 files (they work as RBG files ?!?)
WARNING : nothing was checked for YBR_PARTIAL_422, YBR_ICT, YBR_RCT files.
(no sample found :-(
malaterre [Thu, 2 Oct 2003 11:26:15 +0000 (11:26 +0000)]
src/*.cxx removed pragma thingies to src/gdcmCommon.h
Two reasons: - clear things
- third parties access gdcm through header files, so won't
suffer anymore VC++ complains
-->File gdcmParse.cxx added
gdcmFile::ParsePixelData(void); display the result
of Dicom-encapsulated JPEG or RLE files 'Pixels Element' parsing.
For checking purpose only.
-->modif to improve the processing of multi-Frames multi-Segments compressed files.
* src/gdcmUtil.[cxx|h] : change the _CreateCleanString return value from
char* to std::string. Thus, the use of strdup becoomes useless. (see
previous commis of Malaterre)
* src/gdcmElValSet.cxx : reuse commented call to _CreateCleanString like
before the last Malaterre's commit.
-- BeNours
* This commit should fix the Debug building under VC++, the problem was mainly a mixture of debug and release lib being loaded at startup.
* I also remove a depency to a specific C function: strdup. Because I had to force the link to msvcrtd (whereas strdup is in libc).
* "gdcm::Unfound" string changed to a constant variable (GDCM_UNFOUND)
located in the gdcmCommon.h file. All use of reference of tha has been
changed to now use the variable GDCM_UNFOUND.
-- BeNours
* Cosmetic changes:
- gdcmPython/testSuite.py adapted to the JPR updated Dicts/dicomV3.dic
Dicom dictionary. The test suite can now be run again. Note:
I'm note very happy with the " (RET)" changes. I believe this
RETAINED comment should be dropped when parsing the dictionary.
- PACKAGER corrected
- DEVELOPPER added.
- AUTHORS updated and now in alphabetical order
* src/gdcmHeaderHelper.[h cxx]: added new class that provide an
interpretation to data given by gdcmHeader. For instance there are
heuristics to get informations (look at different places).
* it also include a specific class: gdcmSerieHeaderHelper devoted to
sorting DICOM images based on different strategies.
* modified Makefiles accordingly.
* src/*.cxx : added pragma disable 4786/4251 to get rid of ~4300 warning
when building in debug mode
* vtk/win32/vtkgdcm.dsp : change /MT -> /MD and /MTd -> /MDd to match
src/win32/gdcmdll.dsp
* vtk/win32/vtkgdcm.dsp : added /nodefaultlib "mscvrt" for debug mode
* src/win32/libgdcmjpeg12.dsp was not dos format
* src/win32/libgdcmjpeg12.dsp : libgdcmijpeg12_EXPORTS -> LIBGDCMIJPEG12_EXPORTS
* src/win32/gdcmdll.dsp: + /I "..\jpeg\libijg12"
* src/gdcmHeader.h : add std:: prefix for stl elements... like others in
the file
* src/gdcmFile.cxx : bug fix in affectation type
* src/jpeg/libijpeg12/jmorecfg12.h : export for windows modified... like
in src/jpeg/libijpeg8/jmorecfg8.h (JPR : copy/paste exists !!!)
* Modifs of MVSC projects to compile them. Not concerning 2 identic
symbols... futur problem ?
-- BeNours
* src/jpeg/libijg12/.cvsignore, jconfig.* : ommited files while last
commit of JPR (before his hollidays to facilitate our work).
* setup.py : bug fix in code. Modifications made while the last commit
of JPR. The code hasn't been tested before the commit... it's so
useless to make that (for best programmer that is JPR) !!!
-- BeNours
Upgrade of Dicom Dictionary to be 2003 compliant (400 entries added)
Next step will be the removal of NIH defined 3-rd field,
whixh is not part of the dictionary
* vtk/testvtkGdcmReader.cxx : remove a symbol that is unused
* src/jpeg/libijg8/jmorecfg.h : adding export symbol for windows
* *.dsp : modifications to use new libgdcmijpeg8 library
* setup.py : bug fix on VTKPATH variable
* PACKAGER : adding all concerning windows
-- BeNours
* src/gdcmElValSet.cxx, gdcmFile.cxx: JPR bug fix, removal of
garbage debug code.
* TODO, vtk/vtkGdcmReader.cxx: upcoming fixes comments.
* gdcmPython/testSuite.py: JPR bug fix, brutal erasement of
test suite reported error.
* PACKAGER file added (describes what a packager must do when
packaging a new release).
* MANIFEST.in, now declares jconfig.linux and jconfig.vc
* configure.in: upgraded version number to 0.3.0
* fixing build of rpm (through rpm -ta):
- Doc/Makefile.am exports proper doxygen files
- src/jpeg/libijg8/Makefile.am exports the include files. --- Frog
* vtk/vtkGdcmReader.[cxx|h] : bug fix when loading only one file.
We were obtaining error message from vtk. Now, creation of file list
is made in an internal list to prevent this problem.
Bug fix when output is empty.
Bug fix in update of progress value. Previous commit for this was a bad
correction.
-- BeNours
* src/gdcmHeader.h : added method to get the file name
* vtk/vtkGdcmReader.[cxx|h] : bug fix concerning loading of bad dicom
files. Added method to remove all files on the input
Added FIXME comment concerning the bad parsing of header made by
ExecuteInformation method (in ExecuteData method)
-- BeNours
2003-07-03 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
* setup.py : adding include dir of jpeg lib to compile all sources
* */Win32/*.dsp : JPR fix for windows compilation
-- BeNours
now gdcmFile::GetImageDataIntoVector, gdcmFile::GetImageData, and so on
return an RGB pixel map
(they return no longer an R Plane + a G Plane + a B Plane)
see gdcmData/US-RGB-8-epicard.dcm
* src/jpeg/libijg8/jconfig.* : JPR bug fix : now compile on both
linux and WINDOWS !
* src/gdcmJpeg.cxx : JPR bug fix : erroneous include
* src/win32/gdcmdll.dsp : JPR fix for windows compilation
-- BeNours
* setup.py is again effective on un*x (takes into account the
addon of the jpeg library)
* Doc/DoxyDevelInstal.txt added (developper's raw documentation)
* Doc/Doxy* updated (includes above enhancements)
* INSTALL now points to web documentation --- Frog
* gdcmPython/Makefile.am now avoids calling the wrappers for the
clean target.
* src/gdcm*.[cxx|h] :
- to allow compilation with gcc 3.x
-- clean up of STL usage (added explicit usage of std::)
-- small fixes on exceptions.
Note: linking not tested !
- clean of doxygen comments to avoid warnings at documentation
building stage.
* vtk/vtkGdcmReader.cxx: g++ warning message clean up (platform
dependent convertion).