From 88f0914a8dd9327056361ae14d62ead303f2a9ed Mon Sep 17 00:00:00 2001 From: frog Date: Fri, 1 Oct 2004 12:40:55 +0000 Subject: [PATCH] * Added documentation of vtkgdcmReader on Website: - testvtkGdcmReader.cxx renamed to vtkGdcmDemo.cxx (to be compatible with it's binary name). - vtk/vtkGdcmDemo.cxx and vtkgdcmViewer.cxx: added comments for the Website to be more complete. - Doc/doxygen.config.in: vtk/vtkGdcmReader.cxx now appears on doxygenated documentation. - Doc/DoxyVtkGdcmReaderExamples.txt added (see http://www.creatis.insa-lyon.fr/Public/Gdcm/html.developper/ DoxyVtkGdmReaderExamples.html ) * src/win32, vtk/win32 manually maintained .dsp and .dsw removed. * CLEANUP_ROUND (3) for gdcmPixelConvert - src/gdcmFile.cxx, gdcmFile.h splitting GetImageDataIntoVectorRaw --- ChangeLog | 15 + Doc/CMakeLists.txt | 7 +- Doc/DoxyVtkGdmReaderExamples.txt | 9 + Doc/Website/Main.html | 17 + Doc/Website/VtkGdcm.html | 15 + Doc/doxygen.config.in | 4 +- TODO | 21 ++ src/gdcmFile.cxx | 102 ++++-- src/gdcmFile.h | 32 +- src/win32/.cvsignore | 3 - src/win32/gdcmdll.dsp | 339 ------------------ src/win32/libgdcmijpeg12.dsp | 295 --------------- src/win32/libgdcmijpeg8.dsp | 295 --------------- src/win32/libgdcmljpeg.dsp | 135 ------- vtk/CMakeLists.txt | 6 +- ...{testvtkGdcmReader.cxx => vtkGdcmDemo.cxx} | 82 +++-- vtk/vtkgdcmViewer.cxx | 14 + vtk/win32/.cvsignore | 3 - vtk/win32/vtkGdcmTest.dsp | 130 ------- vtk/win32/vtkgdcm.dsp | 251 ------------- 20 files changed, 226 insertions(+), 1549 deletions(-) create mode 100644 Doc/DoxyVtkGdmReaderExamples.txt delete mode 100644 src/win32/.cvsignore delete mode 100644 src/win32/gdcmdll.dsp delete mode 100644 src/win32/libgdcmijpeg12.dsp delete mode 100644 src/win32/libgdcmijpeg8.dsp delete mode 100644 src/win32/libgdcmljpeg.dsp rename vtk/{testvtkGdcmReader.cxx => vtkGdcmDemo.cxx} (58%) delete mode 100644 vtk/win32/.cvsignore delete mode 100644 vtk/win32/vtkGdcmTest.dsp delete mode 100644 vtk/win32/vtkgdcm.dsp diff --git a/ChangeLog b/ChangeLog index 6bdf25a0..24c8c10e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2004-10-01 Eric Boix + * Added documentation of vtkgdcmReader on Website: + - testvtkGdcmReader.cxx renamed to vtkGdcmDemo.cxx (to be compatible + with it's binary name). + - vtk/vtkGdcmDemo.cxx and vtkgdcmViewer.cxx: added comments for + the Website to be more complete. + - Doc/doxygen.config.in: vtk/vtkGdcmReader.cxx now appears on + doxygenated documentation. + - Doc/DoxyVtkGdcmReaderExamples.txt added + (see http://www.creatis.insa-lyon.fr/Public/Gdcm/html.developper/ + DoxyVtkGdmReaderExamples.html ) + * src/win32, vtk/win32 manually maintained .dsp and .dsw removed. + * CLEANUP_ROUND (3) for gdcmPixelConvert + - src/gdcmFile.cxx, gdcmFile.h splitting GetImageDataIntoVectorRaw + 2004-09-29 Eric Boix * CLEANUP_ROUND (2) for gdcmPixelConvert - src/gdcmFile.cxx, gdcmFile.h splitting GetImageDataIntoVectorRaw diff --git a/Doc/CMakeLists.txt b/Doc/CMakeLists.txt index 2781f7d6..6102dc84 100644 --- a/Doc/CMakeLists.txt +++ b/Doc/CMakeLists.txt @@ -20,11 +20,16 @@ IF(GDCM_DOCUMENTATION) # http://www.cmake.org/pipermail/cmake/2003-April/003673.html # Too bad CMake doesn't support multiline "" SET(GDCM_DOCUMENTATION_INPUT_COMMON - "${GDCM_SOURCE_DIR}/src ${GDCM_SOURCE_DIR}/Doc/DoxyPython.txt" + "${GDCM_SOURCE_DIR}/src ${GDCM_SOURCE_DIR}/Doc/DoxyPython.txt ${GDCM_SOURCE_DIR}/Doc/DoxyVtkGdmReaderExamples.txt" ) SET(GDCM_DOCUMENTATION_EXCLUDE_COMMON "${GDCM_SOURCE_DIR}/src/gdcmJpeg.cxx" ) + + IF(GDCM_VTK) + SET(GDCM_DOCUMENTATION_INPUT_COMMON + "${GDCM_DOCUMENTATION_INPUT_COMMON} ${GDCM_SOURCE_DIR}/vtk") + ENDIF(GDCM_VTK) #Should rewrote this thing with FOREACH: #----------------------------------------------------------------------------- diff --git a/Doc/DoxyVtkGdmReaderExamples.txt b/Doc/DoxyVtkGdmReaderExamples.txt new file mode 100644 index 00000000..ab9891fc --- /dev/null +++ b/Doc/DoxyVtkGdmReaderExamples.txt @@ -0,0 +1,9 @@ +/** + * \page DoxyVtkGdmReaderExamples VtkGdmReader examples + * Below you will find, by order of complexity, two examples that + * illustate how the vtkGdcmReader vtk class can be used. + * Basically, vtkGdcmReader behaves like any other derived class of + * vtkImageReader... + * \include vtkGdcmDemo.cxx + * \include vtkgdcmViewer.cxx + */ diff --git a/Doc/Website/Main.html b/Doc/Website/Main.html index 3d0e0a4e..42dfebdb 100644 --- a/Doc/Website/Main.html +++ b/Doc/Website/Main.html @@ -93,6 +93,23 @@ gdcm doesn't implement (yet?)
  • the integration of (optional) overlays on image.
    • +
  • a more complete supports of the + various Jpeg encodings +
    • +
+Gdcm also still needs +
    +
  • an enhanced and simpler API to access the various forms of pixel data + (e.g. RGB, GrayLevel, RawData...), +
    • +
  • a decent user's guide (currently, only a partial doxygenation is + available), +
    • +
  • the python wrappers to be fixed, +
    • +
  • a simple wxWdiget Dicom file editor. +
    • +
diff --git a/Doc/Website/VtkGdcm.html b/Doc/Website/VtkGdcm.html index bb17ab4c..906b3ff2 100644 --- a/Doc/Website/VtkGdcm.html +++ b/Doc/Website/VtkGdcm.html @@ -23,6 +23,21 @@ which enables
  • this class is wrapped for vtkPython (by using native VTK wrappers). +For a quick, but probably sufficient, introduction to the +usage of vtkGdcmReader please refer to the + +simple examples. + +The documentation of vtkGdcmReader is available in both forms + +
    diff --git a/Doc/doxygen.config.in b/Doc/doxygen.config.in index 0b97fdad..4783a68a 100644 --- a/Doc/doxygen.config.in +++ b/Doc/doxygen.config.in @@ -339,14 +339,14 @@ EXCLUDE_PATTERNS = # directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = @GDCM_SOURCE_DIR@/gdcmPython/demo +EXAMPLE_PATH = @GDCM_SOURCE_DIR@/gdcmPython/demo @GDCM_SOURCE_DIR@/vtk # If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left # blank all files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = *.py *.cxx # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be # searched for input files to be used with the \include or \dontinclude diff --git a/TODO b/TODO index 6481daf1..f410e287 100644 --- a/TODO +++ b/TODO @@ -13,6 +13,27 @@ Comments: ----------------------------------------------------------------------------- ----------------------------------------------------------------------------- +Description: vtk/vtkGdcmReader doesn't positionate the normal to the image +Date: 2004 Oct 1 +Attributed: +Details: vtkGdcmReader::CheckFileCoherence() sets the DataOrigin[i] + but doesn't set the plane (image seen in 3D) normal (is it + possible any how). This plane normal could be extracted from + the "orientation" info of the gdcmHeader ( refer to + grep "Orientation" Dicts/dicomV3.dic). + Problem exhibiting this defect: cine loop on a pile of images + whose Origin is correct, but whose normal is not set will + plainly suck ! +Comments: + * vtkGdcmReader inherits from vtkImageReader which aggregates + a vtkTranform. vtkGdcmReader could store (when the user requires + it, see below) the origin/normal taken from the Dicom Header + within this vtkTransform (looks like a natural place to store + this spacial information). + * Both settings of the origin and/OR the normal of the plane (image) + should be an option defined with a flag (On/Off) in the + vtkGdcmReader... +----------------------------------------------------------------------------- Description: Fix the Python wrappers Date: 2004 Sep 24 Attributed: no diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index 18928712..6b9138b2 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.cxx,v $ Language: C++ - Date: $Date: 2004/09/30 12:51:55 $ - Version: $Revision: 1.133 $ + Date: $Date: 2004/10/01 12:40:57 $ + Version: $Revision: 1.134 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -1051,32 +1051,12 @@ bool gdcmFile::ReadPixelData(void* destination) return false; } - // ---------------------- Compacted File (12 Bits Per Pixel) - // unpack 12 Bits pixels into 16 Bits pixels - // 2 pixels 12bit = [0xABCDEF] - // 2 pixels 16bit = [0x0ABD] + [0x0FCE] - if ( Header->GetBitsAllocated() == 12 ) { - int nbPixels = Header->GetXSize() * Header->GetYSize(); - uint8_t b0, b1, b2; - - uint16_t* pdestination = (uint16_t*)destination; - for(int p = 0; p < nbPixels; p += 2 ) - { - fread(&b0,1,1,fp); - fread(&b1,1,1,fp); - fread(&b2,1,1,fp); - - //Two steps is necessary to please VC++ - *pdestination++ = ((b0 >> 4) << 8) + ((b0 & 0x0f) << 4) + (b1 & 0x0f); - // A B D - *pdestination++ = ((b2 & 0x0f) << 8) + ((b1 >> 4) << 4) + (b2 >> 4); - // F C E - - // Troubles expected on Big-Endian processors ? - } - + ConvertDecompress12BitsTo16Bits( (uint8_t*)destination, + Header->GetXSize(), + Header->GetYSize(), + fp); Header->CloseFile(); return true; } @@ -1109,22 +1089,13 @@ bool gdcmFile::ReadPixelData(void* destination) } // --------------- SingleFrame/Multiframe JPEG Lossless/Lossy/2000 - int nb; - std::string str_nb = Header->GetEntryByNumber(0x0028,0x0100); - if ( str_nb == GDCM_UNFOUND ) - { - nb = 16; - } - else + int numberBitsAllocated = Header->GetBitsAllocated(); + if ( ( numberBitsAllocated == 0 ) || ( numberBitsAllocated == 12 ) ) { - nb = atoi( str_nb.c_str() ); - if ( nb == 12 ) - { - nb = 16; // ?? 12 should be ACR-NEMA only - } + numberBitsAllocated = 16; } - int nBytes= nb/8; + int nBytes= numberBitsAllocated/8; int taille = Header->GetXSize() * Header->GetYSize() * Header->GetSamplesPerPixel(); long fragmentBegining; // for ftell, fseek @@ -1237,4 +1208,57 @@ bool gdcmFile::ReadPixelData(void* destination) Header->CloseFile(); return res; } + +/** + * \brief Read from file a 12 bits per pixel image and uncompress it + * into a 16 bits per pixel image. + */ +void gdcmFile::ConvertDecompress12BitsTo16Bits( + uint8_t* pixelZone, + int sizeX, + int sizeY, + FILE* filePtr) + throw ( gdcmFormatError ) +{ + int nbPixels = sizeX * sizeY; + uint16_t* destination = (uint16_t*)pixelZone; + + for( int p = 0; p < nbPixels; p += 2 ) + { + uint8_t b0, b1, b2; + size_t ItemRead; + + ItemRead = fread( &b0, 1, 1, filePtr); + if ( ItemRead != 1 ) + { + throw gdcmFormatError( "gdcmFile::ConvertDecompress12BitsTo16Bits()", + "Unfound first block" ); + } + + ItemRead = fread( &b1, 1, 1, filePtr); + if ( ItemRead != 1 ) + { + throw gdcmFormatError( "gdcmFile::ConvertDecompress12BitsTo16Bits()", + "Unfound second block" ); + } + + ItemRead = fread( &b2, 1, 1, filePtr); + if ( ItemRead != 1 ) + { + throw gdcmFormatError( "gdcmFile::ConvertDecompress12BitsTo16Bits()", + "Unfound second block" ); + } + + // Two steps are necessary to please VC++ + // + // 2 pixels 12bit = [0xABCDEF] + // 2 pixels 16bit = [0x0ABD] + [0x0FCE] + // A B D + *destination++ = ((b0 >> 4) << 8) + ((b0 & 0x0f) << 4) + (b1 & 0x0f); + // F C E + *destination++ = ((b2 & 0x0f) << 8) + ((b1 >> 4) << 4) + (b2 >> 4); + + /// \todo JPR Troubles expected on Big-Endian processors ? + } +} //----------------------------------------------------------------------------- diff --git a/src/gdcmFile.h b/src/gdcmFile.h index 693bea28..a69011f8 100644 --- a/src/gdcmFile.h +++ b/src/gdcmFile.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.h,v $ Language: C++ - Date: $Date: 2004/09/30 12:51:55 $ - Version: $Revision: 1.54 $ + Date: $Date: 2004/10/01 12:40:57 $ + Version: $Revision: 1.55 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -43,17 +43,23 @@ public: void ConvertRGBPlanesToRGBPixels( uint8_t* source, uint8_t* destination ); void ConvertYcBcRPlanesToRGBPixels( uint8_t* source, uint8_t* destination ); - void ConvertReArrangeBits( uint8_t* pixelZone, - size_t imageDataSize, - int numberBitsStored, - int numberBitsAllocated, - int highBitPosition ) throw ( gdcmFormatError ); - void ConvertReorderEndianity( uint8_t* pixelZone, - size_t imageDataSize, - int numberBitsStored, - int numberBitsAllocated, - bool signedPixel ); - + void ConvertReArrangeBits( + uint8_t* pixelZone, + size_t imageDataSize, + int numberBitsStored, + int numberBitsAllocated, + int highBitPosition ) throw ( gdcmFormatError ); + void ConvertReorderEndianity( + uint8_t* pixelZone, + size_t imageDataSize, + int numberBitsStored, + int numberBitsAllocated, + bool signedPixel ); + void ConvertDecompress12BitsTo16Bits( + uint8_t* pixelZone, + int sizeX, + int sizeY, + FILE* filePtr) throw ( gdcmFormatError); /// Accessor to \ref ImageDataSize size_t GetImageDataSize(){ return ImageDataSize; }; diff --git a/src/win32/.cvsignore b/src/win32/.cvsignore deleted file mode 100644 index b452d010..00000000 --- a/src/win32/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -*Debug* -*Release* -*.plg \ No newline at end of file diff --git a/src/win32/gdcmdll.dsp b/src/win32/gdcmdll.dsp deleted file mode 100644 index c94c8586..00000000 --- a/src/win32/gdcmdll.dsp +++ /dev/null @@ -1,339 +0,0 @@ -# Microsoft Developer Studio Project File - Name="gdcmdll" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=gdcmdll - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "gdcmdll.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "gdcmdll.mak" CFG="gdcmdll - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "gdcmdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "gdcmdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "gdcmdll - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /w /W0 /GX /O2 /I "$(CREATIS)\glib-1.3\src\glib" /I "..\jpeg\libijg8" /I "..\jpeg\libijg12" /I "..\jpeg\ljpg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib msvcrt.lib msvcprt.lib Wsock32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"../../lib/gdcmdll.dll" -# SUBTRACT LINK32 /debug -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy for test -PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy ..\..\lib\gdcmdll.dll ..\..\test\ copy Release\gdcmdll.lib ..\..\lib\ -# End Special Build Tool - -!ELSEIF "$(CFG)" == "gdcmdll - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /w /W0 /Gm /GX /ZI /Od /I "$(CREATIS)\glib-1.3\src\glib" /I "..\jpeg\libijg8" /I "..\jpeg\libijg12" /I "..\jpeg\ljpg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib msvcrtd.lib msvcprtd.lib Wsock32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"..\..\lib\gdcmdll.dll" /pdbtype:sept -# SUBTRACT LINK32 /incremental:no /debug -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy for test -PostBuild_Cmds=copy ..\..\lib\gdcmdll.dll ..\..\gdcmPython\ copy ..\..\lib\gdcmdll.dll ..\..\test\ copy Debug\gdcmdll.lib ..\..\lib\ -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "gdcmdll - Win32 Release" -# Name "gdcmdll - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\gdcmDebug.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmDicomDir.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmDicomDirElement.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmDicomDirImage.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmDicomDirMeta.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmDicomDirPatient.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmDicomDirSerie.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmDicomDirStudy.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmDict.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmDictEntry.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmDictSet.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmDirList.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmException.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmFile.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmGlobal.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmHeader.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmHeaderEntry.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmHeaderHelper.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmJpeg.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmJpeg12.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmJpeg2000.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmObject.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmParsePixels.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmParser.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmRLE.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmTS.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmUtil.cxx -# End Source File -# Begin Source File - -SOURCE=..\gdcmVR.cxx -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\gdcm.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmDebug.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmCommon.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmDicomDir.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmDicomDirElement.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmDicomDirImage.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmDicomDirMeta.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmDicomDirPatient.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmDicomDirSerie.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmDicomDirStudy.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmDict.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmDictEntry.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmDictSet.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmDirList.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmException.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmFile.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmGlobal.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmHeader.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmHeaderEntry.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmHeaderHelper.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmObject.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmParser.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmTS.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmUtil.h -# End Source File -# Begin Source File - -SOURCE=..\gdcmVR.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=..\..\lib\libgdcmljpeg.lib -# End Source File -# Begin Source File - -SOURCE=..\..\lib\libgdcmijpeg8.lib -# End Source File -# Begin Source File - -SOURCE=..\..\lib\libgdcmijpeg12.lib -# End Source File -# End Target -# End Project diff --git a/src/win32/libgdcmijpeg12.dsp b/src/win32/libgdcmijpeg12.dsp deleted file mode 100644 index 786828eb..00000000 --- a/src/win32/libgdcmijpeg12.dsp +++ /dev/null @@ -1,295 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libgdcmijpeg12" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=libgdcmijpeg12 - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libgdcmijpeg12.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libgdcmijpeg12.mak" CFG="libgdcmijpeg12 - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libgdcmijpeg12 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libgdcmijpeg12 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libgdcmijpeg12 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release__libgdcmijpeg12" -# PROP Intermediate_Dir "Release__libgdcmijpeg12" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG12_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG12_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib msvcrt.lib /nologo /dll /machine:I386 /nodefaultlib /out:"..\..\lib\libgdcmijpeg12.dll" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy Release__libgdcmijpeg12\libgdcmijpeg12.lib ..\..\lib\ copy ..\..\lib\libgdcmijpeg12.dll ..\..\gdcmPython\ copy ..\..\lib\libgdcmijpeg12.dll ..\..\vtk\ copy ..\..\lib\libgdcmijpeg12.dll ..\..\test\ -# End Special Build Tool - -!ELSEIF "$(CFG)" == "libgdcmijpeg12 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug__libgdcmijpeg12" -# PROP Intermediate_Dir "Debug__libgdcmijpeg12" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG12_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG12_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib msvcrtd.lib /nologo /dll /debug /machine:I386 /nodefaultlib /out:"..\..\lib\libgdcmijpeg12.dll" /pdbtype:sept -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy Debug__libgdcmijpeg12\libgdcmijpeg12.lib ..\..\lib\ copy ..\..\lib\libgdcmijpeg12.dll ..\..\gdcmPython\ copy ..\..\lib\libgdcmijpeg12.dll ..\..\vtk\ copy ..\..\lib\libgdcmijpeg12.dll ..\..\test\ -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "libgdcmijpeg12 - Win32 Release" -# Name "libgdcmijpeg12 - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\jpeg\libijg12\jcapimin12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jcapistd12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jccoefct12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jccolor12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jcdctmgr12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jchuff12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jcinit12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jcmainct12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jcmarker12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jcmaster12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jcomapi12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jcparam12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jcphuff12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jcprepct12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jcsample12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jctrans12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdapimin12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdapistd12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdatadst12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdatasrc12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdcoefct12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdcolor12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jddctmgr12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdhuff12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdinput12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdmainct12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdmarker12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdmaster12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdmerge12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdphuff12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdpostct12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdsample12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jdtrans12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jerror12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jfdctflt12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jfdctfst12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jfdctint12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jidctflt12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jidctfst12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jidctint12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jidctred12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jmemmgr12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jmemnobs12.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jquant112.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jquant212.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg12\jutils12.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/src/win32/libgdcmijpeg8.dsp b/src/win32/libgdcmijpeg8.dsp deleted file mode 100644 index 180cafe3..00000000 --- a/src/win32/libgdcmijpeg8.dsp +++ /dev/null @@ -1,295 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libgdcmijpeg8" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=libgdcmijpeg8 - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libgdcmijpeg8.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libgdcmijpeg8.mak" CFG="libgdcmijpeg8 - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libgdcmijpeg8 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libgdcmijpeg8 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libgdcmijpeg8 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release__libgdcmijpeg8" -# PROP Intermediate_Dir "Release__libgdcmijpeg8" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG8_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG8_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib msvcrt.lib /nologo /dll /machine:I386 /nodefaultlib /out:"..\..\lib\libgdcmijpeg8.dll" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy Release__libgdcmijpeg8\libgdcmijpeg8.lib ..\..\lib\ copy ..\..\lib\libgdcmijpeg8.dll ..\..\gdcmPython\ copy ..\..\lib\libgdcmijpeg8.dll ..\..\vtk\ copy ..\..\lib\libgdcmijpeg8.dll ..\..\test\ -# End Special Build Tool - -!ELSEIF "$(CFG)" == "libgdcmijpeg8 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug__libgdcmijpeg8" -# PROP Intermediate_Dir "Debug__libgdcmijpeg8" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG8_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG8_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib msvcrtd.lib /nologo /dll /debug /machine:I386 /nodefaultlib /out:"..\..\lib\libgdcmijpeg8.dll" /pdbtype:sept -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy Debug__libgdcmijpeg8\libgdcmijpeg8.lib ..\..\lib\ copy ..\..\lib\libgdcmijpeg8.dll ..\..\gdcmPython\ copy ..\..\lib\libgdcmijpeg8.dll ..\..\vtk\ copy ..\..\lib\libgdcmijpeg8.dll ..\..\test\ -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "libgdcmijpeg8 - Win32 Release" -# Name "libgdcmijpeg8 - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\jpeg\libijg8\jcapimin.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jcapistd.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jccoefct.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jccolor.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jcdctmgr.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jchuff.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jcinit.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jcmainct.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jcmarker.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jcmaster.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jcomapi.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jcparam.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jcphuff.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jcprepct.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jcsample.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jctrans.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdapimin.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdapistd.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdatadst.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdatasrc.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdcoefct.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdcolor.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jddctmgr.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdhuff.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdinput.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdmainct.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdmarker.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdmaster.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdmerge.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdphuff.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdpostct.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdsample.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jdtrans.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jerror.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jfdctflt.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jfdctfst.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jfdctint.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jidctflt.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jidctfst.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jidctint.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jidctred.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jmemmgr.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jmemnobs.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jquant1.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jquant2.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\libijg8\jutils.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/src/win32/libgdcmljpeg.dsp b/src/win32/libgdcmljpeg.dsp deleted file mode 100644 index 68f9dd96..00000000 --- a/src/win32/libgdcmljpeg.dsp +++ /dev/null @@ -1,135 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libgdcmljpeg" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=libgdcmljpeg - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libgdcmljpeg.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libgdcmljpeg.mak" CFG="libgdcmljpeg - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libgdcmljpeg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libgdcmljpeg - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libgdcmljpeg - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release__libgdcmljpeg" -# PROP Intermediate_Dir "Release__libgdcmljpeg" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMLJPEG_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMLJPEG_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib msvcrt.lib /nologo /dll /machine:I386 /nodefaultlib /out:"..\..\lib\libgdcmljpeg.dll" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy Release__libgdcmljpeg\libgdcmljpeg.lib ..\..\lib\ copy ..\..\lib\libgdcmljpeg.dll ..\..\gdcmPython\ copy ..\..\lib\libgdcmljpeg.dll ..\..\vtk\ copy ..\..\lib\libgdcmljpeg.dll ..\..\test\ -# End Special Build Tool - -!ELSEIF "$(CFG)" == "libgdcmljpeg - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug__libgdcmljpeg" -# PROP Intermediate_Dir "Debug__libgdcmljpeg" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMLJPEG_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMLJPEG_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib msvcrtd.lib /nologo /dll /debug /machine:I386 /nodefaultlib /out:"..\..\lib\libgdcmljpeg.dll" /pdbtype:sept -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy Debug__libgdcmljpeg\libgdcmljpeg.lib ..\..\lib\ copy ..\..\lib\libgdcmljpeg.dll ..\..\gdcmPython\ copy ..\..\lib\libgdcmljpeg.dll ..\..\vtk\ copy ..\..\lib\libgdcmljpeg.dll ..\..\test\ -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "libgdcmljpeg - Win32 Release" -# Name "libgdcmljpeg - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\jpeg\ljpg\decomp.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\ljpg\huffd.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\ljpg\jpegutil.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\ljpg\mcu.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\ljpg\predict.c -# End Source File -# Begin Source File - -SOURCE=..\jpeg\ljpg\read.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/vtk/CMakeLists.txt b/vtk/CMakeLists.txt index 3d21617b..6b2fa6b5 100644 --- a/vtk/CMakeLists.txt +++ b/vtk/CMakeLists.txt @@ -23,10 +23,8 @@ TARGET_LINK_LIBRARIES(vtkgdcm ) #----------------------------------------------------------------------------- -# See with frog why m4 didn't link to lib, and include cxx file instead ? SET(vtkgdcmdemo_SOURCES - testvtkGdcmReader.cxx -# vtkGdcmReader.cxx + vtkGdcmDemo.cxx ) ADD_EXECUTABLE(vtkgdcmdemo ${vtkgdcmdemo_SOURCES}) TARGET_LINK_LIBRARIES(vtkgdcmdemo @@ -36,10 +34,8 @@ TARGET_LINK_LIBRARIES(vtkgdcmdemo ) #----------------------------------------------------------------------------- -# See with frog why m4 didn't link to lib, and include cxx file instead ? SET(vtkgdcmViewer_SOURCES vtkgdcmViewer.cxx - #vtkGdcmReader.cxx ) ADD_EXECUTABLE(vtkgdcmViewer ${vtkgdcmViewer_SOURCES}) TARGET_LINK_LIBRARIES(vtkgdcmViewer diff --git a/vtk/testvtkGdcmReader.cxx b/vtk/vtkGdcmDemo.cxx similarity index 58% rename from vtk/testvtkGdcmReader.cxx rename to vtk/vtkGdcmDemo.cxx index 198d14ba..d94763cb 100644 --- a/vtk/testvtkGdcmReader.cxx +++ b/vtk/vtkGdcmDemo.cxx @@ -1,4 +1,18 @@ -// $Header: /cvs/public/gdcm/vtk/Attic/testvtkGdcmReader.cxx,v 1.9 2004/03/30 09:00:40 regrain Exp $ +// $Header: /cvs/public/gdcm/vtk/vtkGdcmDemo.cxx,v 1.1 2004/10/01 12:40:58 frog Exp $ + +//---------------------------------------------------------------------------- +// A simple straightfoward example of vtkGdcmReader vtk class usage. +// +// The vtkGdcmReader vtk class behaves like any other derived class of +// vtkImageReader. It's usage within a vtk pipeline hence follows the +// classical vtk pattern. +// This example is a really simple Dicom image viewer demo. +// It builds the minimal vtk rendering pipeline in order to display +// (with the native vtk classes) a single Dicom image parsed with gdcm. +// +// Usage: the filename of the Dicom image to display should be given as +// command line arguments, +//---------------------------------------------------------------------------- #include #include @@ -25,40 +39,27 @@ int main( int argc, char *argv[] ) { - int *taille; - int x,y; - - // Lecture de l'image vtkGdcmReader *reader = vtkGdcmReader::New(); -// reader->DebugOn(); - // Alloc Used High - // 8 8 7 U : OK - // reader->SetFileName("../gdcmData/CT-MONO2-8-abdo.dcm"); - // 16 12 11 U : OK but saturated - // reader->SetFileName("../gdcmData/CT-MONO2-12-lomb-an2.acr2"); - // 16 12 11 U OK - //OKreader->SetFileName("../gdcmData/MR-MONO2-12-an2.acr2"); - // 16 10 9 U OK - //reader->SetFileName("../gdcmData/CR-MONO1-10-chest.dcm"); - //reader->Update(); - // 16 16 15 S: OK saturation ? - // reader->SetFileName("../gdcmData/CT-MONO2-16-ort.dcm"); - // 16 16 15 S: - - if (argc > 1) - reader->SetFileName( argv[1] ); - else - reader->SetFileName("../gdcmData/CT-MONO2-16-ankle.dcm"); + + if (argc < 2) + { + std::cerr << "Usage: " << argv[0] << " image.dcm\n"; + return 0; + } + + reader->SetFileName( argv[1] ); reader->UpdateWholeExtent(); -// reader->Update(); - vtkImageData *ima = reader->GetOutput(); - taille=ima->GetDimensions(); - x = taille[0]; y = taille[1]; + vtkImageData* ima = reader->GetOutput(); + + ///////// Display image size on terminal: + int* Size = ima->GetDimensions(); cout << "Dimensions of the picture as read with gdcm: " - << x << " x " << y << endl; + << Size[0] << " x " << Size[1] << endl; - vtkLookupTable *VTKtable = vtkLookupTable::New(); + ///////// A simple display pipeline: + // + vtkLookupTable* VTKtable = vtkLookupTable::New(); VTKtable->SetNumberOfColors(1000); VTKtable->SetTableRange(0,1000); VTKtable->SetSaturationRange(0,0); @@ -66,25 +67,30 @@ int main( int argc, char *argv[] ) VTKtable->SetValueRange(0,1); VTKtable->SetAlphaRange(1,1); VTKtable->Build(); - // Texture - vtkTexture * VTKtexture = vtkTexture::New(); + + //// Texture + vtkTexture* VTKtexture = vtkTexture::New(); VTKtexture->SetInput(ima); VTKtexture->InterpolateOn(); VTKtexture->SetLookupTable(VTKtable); - // PlaneSource - vtkPlaneSource *VTKplane = vtkPlaneSource::New(); + + //// PlaneSource + vtkPlaneSource* VTKplane = vtkPlaneSource::New(); VTKplane->SetOrigin( -0.5, -0.5, 0.0); VTKplane->SetPoint1( 0.5, -0.5, 0.0); VTKplane->SetPoint2( -0.5, 0.5, 0.0); - // PolyDataMapper + + //// PolyDataMapper vtkPolyDataMapper *VTKplaneMapper = vtkPolyDataMapper::New(); VTKplaneMapper->SetInput(VTKplane->GetOutput()); - // Actor + + //// Actor vtkActor* VTKplaneActor = vtkActor::New(); VTKplaneActor->SetTexture(VTKtexture); VTKplaneActor->SetMapper(VTKplaneMapper); VTKplaneActor->PickableOn(); - // + + //// Final rendering with simple interactor: vtkRenderer *ren = vtkRenderer::New(); vtkRenderWindow *renwin = vtkRenderWindow::New(); renwin->AddRenderer(ren); @@ -95,6 +101,7 @@ int main( int argc, char *argv[] ) renwin->Render(); iren->Start(); + //// Clean up: reader->Delete(); VTKtable->Delete(); VTKtexture->Delete(); @@ -107,4 +114,3 @@ int main( int argc, char *argv[] ) return(0); } - diff --git a/vtk/vtkgdcmViewer.cxx b/vtk/vtkgdcmViewer.cxx index 709d93da..3f64b40b 100644 --- a/vtk/vtkgdcmViewer.cxx +++ b/vtk/vtkgdcmViewer.cxx @@ -1,3 +1,17 @@ +// This example illustrates how the vtkGdcmReader vtk class can be +// used in order to: +// * produce a simple (vtk based) Dicom image STACK VIEWER. +// * dump the stack considered as a volume in a vtkStructuredPoints +// vtk file: the vtk gdcm wrappers can be seen as a simple way to convert +// a stack of Dicom images into a native vtk volume. +// +// Usage: +// * the filenames of the Dicom images constituting the stack should be +// given as command line arguments, +// * you can navigate through the stack by hitting any character key, +// * the produced vtk file is named "foo.vtk" (in the invocation directory). +// +//---------------------------------------------------------------------------- #include #include diff --git a/vtk/win32/.cvsignore b/vtk/win32/.cvsignore deleted file mode 100644 index b452d010..00000000 --- a/vtk/win32/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -*Debug* -*Release* -*.plg \ No newline at end of file diff --git a/vtk/win32/vtkGdcmTest.dsp b/vtk/win32/vtkGdcmTest.dsp deleted file mode 100644 index 6c8d8cad..00000000 --- a/vtk/win32/vtkGdcmTest.dsp +++ /dev/null @@ -1,130 +0,0 @@ -# Microsoft Developer Studio Project File - Name="vtkGdcmTest" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=vtkGdcmTest - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "vtkGdcmTest.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "vtkGdcmTest.mak" CFG="vtkGdcmTest - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "vtkGdcmTest - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "vtkGdcmTest - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "vtkGdcmTest - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "vtkGdcmTest___Win32_Release" -# PROP BASE Intermediate_Dir "vtkGdcmTest___Win32_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vtkGdcmTest___Win32_Release" -# PROP Intermediate_Dir "vtkGdcmTest___Win32_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "$(VTKPATH)\include\vtk" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\vtkGdcmTest.exe" - -!ELSEIF "$(CFG)" == "vtkGdcmTest - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vtkGdcmTest___Win32_Debug0" -# PROP BASE Intermediate_Dir "vtkGdcmTest___Win32_Debug0" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vtkGdcmTest___Win32_Debug0" -# PROP Intermediate_Dir "vtkGdcmTest___Win32_Debug0" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "$(VTKPATH)\include\vtk" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\vtkGdcmTest.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "vtkGdcmTest - Win32 Release" -# Name "vtkGdcmTest - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\testvtkGdcmReader.cxx -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkRendering.lib -# End Source File -# Begin Source File - -SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkFiltering.lib -# End Source File -# Begin Source File - -SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkGraphics.lib -# End Source File -# Begin Source File - -SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkImaging.lib -# End Source File -# Begin Source File - -SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkIO.lib -# End Source File -# Begin Source File - -SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkCommon.lib -# End Source File -# Begin Source File - -SOURCE=..\..\lib\vtkgdcm.lib -# End Source File -# End Group -# End Target -# End Project diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp deleted file mode 100644 index 13d5e661..00000000 --- a/vtk/win32/vtkgdcm.dsp +++ /dev/null @@ -1,251 +0,0 @@ -# Microsoft Developer Studio Project File - Name="vtkgdcm" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=vtkgdcm - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "vtkgdcm.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "vtkgdcm.mak" CFG="vtkgdcm - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "vtkgdcm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "vtkgdcm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "vtkgdcm - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "..\..\src\jpeg\libijg8" /I "..\..\src\jpeg\libijg12" /I "..\..\src\jpeg\ljpg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 Wsock32.lib kernel32.lib user32.lib gdi32.lib /nologo /dll /machine:I386 /out:"..\..\lib\vtkgdcm.dll" /libpath:"$(VTKPATH)\lib\vtk ../../lib/" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy ..\..\lib\vtkgdcm.dll ..\ copy Release\vtkgdcm.lib ..\..\lib\vtkgdcm.lib -# End Special Build Tool - -!ELSEIF "$(CFG)" == "vtkgdcm - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "..\..\src\jpeg\libijg8" /I "..\..\src\jpeg\libijg12" /I "..\..\src\jpeg\ljpg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VTKGDCM_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Wsock32.lib kernel32.lib user32.lib gdi32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\lib\vtkgdcm.dll" /pdbtype:sept /libpath:"$(VTKPATH)\lib\vtk ../../lib/" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy ..\..\lib\vtkgdcm.dll ..\ copy Debug\vtkgdcm.lib ..\..\lib\vtkgdcm.lib -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "vtkgdcm - Win32 Release" -# Name "vtkgdcm - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\src\gdcmDebug.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmDicomDirElement.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmDicomDirImage.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmDicomDirMeta.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmDicomDirPatient.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmDicomDirSerie.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmDicomDirStudy.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmDict.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmDictEntry.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmDictSet.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmDirList.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmException.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmFile.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmGlobal.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmHeader.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmHeaderEntry.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmHeaderHelper.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmJpeg.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmJpeg12.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmJpeg2000.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmObject.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmParsePixels.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmParser.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmRLE.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmTS.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmUtil.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\gdcmVR.cxx -# End Source File -# Begin Source File - -SOURCE=..\vtkGdcmReader.cxx -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkIO.lib -# End Source File -# Begin Source File - -SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkCommon.lib -# End Source File -# Begin Source File - -SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkFiltering.lib -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\src\gdcmDirList.h -# End Source File -# Begin Source File - -SOURCE=..\..\lib\libgdcmljpeg.lib -# End Source File -# Begin Source File - -SOURCE=..\..\lib\libgdcmijpeg8.lib -# End Source File -# Begin Source File - -SOURCE=..\..\lib\libgdcmijpeg12.lib -# End Source File -# End Target -# End Project -- 2.45.1