Skip to content

Commit

Permalink
update to GDCM v2.8.4, also using github mirrors for OpenSSL and GDCM…
Browse files Browse the repository at this point in the history 
… to facilitate navigation
  • Loading branch information
@aglv
aglv committed Nov 14, 2017
1 parent fe17ef4 commit b6d0d1c
Show file tree
Hide file tree
Showing 9 changed files with 133 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
View file
Expand Up @@ -12,10 +12,10 @@
url = git@github.com:commontk/DCMTK.git
[submodule "GDCM"]
path = GDCM
url = git://git.code.sf.net/p/gdcm/gdcm
url = git@github.com:malaterre/GDCM.git
[submodule "OpenJPEG"]
path = OpenJPEG
url = git@github.com:uclouvain/openjpeg.git
[submodule "OpenSSL"]
path = OpenSSL
url = git://git.openssl.org/openssl.git
url = git@github.com:openssl/openssl.git
2 changes: 1 addition & 1 deletion GDCM
Submodule GDCM updated 33 files
+1 −0 Applications/Cxx/gdcmdump.cxx
+4 −0 Applications/Cxx/gdcmimg.cxx
+23 −1 CMakeLists.txt
+1 −1 Examples/Cxx/DumpExamCard.cxx
+9 −0 Examples/Java/ScanDirectory.java
+0 −1 Source/Common/CMakeLists.txt
+7 −1 Source/Common/gdcmCAPICryptographicMessageSyntax.cxx
+2 −1 Source/DataDictionary/CMakeLists.txt
+4 −2 Source/DataDictionary/Part6.xml
+4 −2 Source/DataDictionary/Part6.xsl
+0 −24 Source/DataDictionary/Part7a.xml
+36 −0 Source/DataDictionary/Part7b.xml
+1 −1 Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx
+26 −0 Source/MediaStorageAndFileFormat/gdcmPixelFormat.h
+3 −1 Source/MediaStorageAndFileFormat/gdcmSegmentHelper.h
+9 −8 Source/MediaStorageAndFileFormat/gdcmStringFilter.cxx
+35 −35 Source/MediaStorageAndFileFormat/gdcmSurfaceHelper.h
+1 −1 Source/MessageExchangeDefinition/gdcmULTransitionTable.cxx
+1 −1 Testing/Data
+3 −0 Testing/Source/Data/CMakeLists.txt
+2 −1 Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestAttribute1.cxx
+2 −0 Testing/Source/DataStructureAndEncodingDefinition/Java/CMakeLists.txt
+100 −0 Testing/Source/DataStructureAndEncodingDefinition/Java/TestReaderUpToTag.java
+58 −0 Testing/Source/DataStructureAndEncodingDefinition/Java/TestTag.java
+26 −14 Utilities/C99/stdint.h
+1 −1 Utilities/VTK/CMakeLists.txt
+6 −6 Utilities/gdcmcharls/encoderstrategy.h
+1 −1 Utilities/gdcmcharls/header.cpp
+0 −12 Utilities/gdcmcharls/header.h
+0 −0 Utilities/gdcmopenjpeg/doc/.gitkeep
+34 −34 Utilities/gdcmutfcpp/utf8.h
+36 −2 Wrapping/Java/CMakeLists.txt
+108 −5 Wrapping/Java/gdcm.i
130 changes: 130 additions & 0 deletions Horos.xcodeproj/project.pbxproj
View file
Expand Up @@ -18,6 +18,17 @@
name = "Unzip Binaries";
productName = "Unzip Binaries";
};
71E6C0B01FBAD31E00FF75B6 /* Git Submodule Sync */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 71E6C0B31FBAD31E00FF75B6 /* Build configuration list for PBXAggregateTarget "Git Submodule Sync" */;
buildPhases = (
71E6C0B41FBAD32800FF75B6 /* Git Submodule Sync */,
);
dependencies = (
);
name = "Git Submodule Sync";
productName = "Git Submodule Sync";
};
BF7486A50CC6AA5C00198387 /* Documentation */ = {
isa = PBXAggregateTarget;
buildConfigurationList = BF7486AA0CC6AA7C00198387 /* Build configuration list for PBXAggregateTarget "Documentation" */;
Expand Down Expand Up @@ -3040,6 +3051,48 @@
remoteGlobalIDString = CEDF6C600B46FE99008B45B8;
remoteInfo = DICOMPrint;
};
71E6C0B51FBAD34100FF75B6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 71E6C0B01FBAD31E00FF75B6;
remoteInfo = "Git Submodule Sync";
};
71E6C0B71FBAD34500FF75B6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 71E6C0B01FBAD31E00FF75B6;
remoteInfo = "Git Submodule Sync";
};
71E6C0B91FBAD34800FF75B6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 71E6C0B01FBAD31E00FF75B6;
remoteInfo = "Git Submodule Sync";
};
71E6C0BB1FBAD34C00FF75B6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 71E6C0B01FBAD31E00FF75B6;
remoteInfo = "Git Submodule Sync";
};
71E6C0BD1FBAD35000FF75B6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 71E6C0B01FBAD31E00FF75B6;
remoteInfo = "Git Submodule Sync";
};
71E6C0BF1FBAD35400FF75B6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 71E6C0B01FBAD31E00FF75B6;
remoteInfo = "Git Submodule Sync";
};
99FE27FC1CF4A442003C32AB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
Expand Down Expand Up @@ -9748,6 +9801,7 @@
buildRules = (
);
dependencies = (
71E6C0C01FBAD35400FF75B6 /* PBXTargetDependency */,
);
name = VTK;
productName = VTK;
Expand All @@ -9766,6 +9820,7 @@
buildRules = (
);
dependencies = (
71E6C0BE1FBAD35000FF75B6 /* PBXTargetDependency */,
);
name = ITK;
productName = VTK;
Expand All @@ -9784,6 +9839,7 @@
buildRules = (
);
dependencies = (
71E6C0BA1FBAD34800FF75B6 /* PBXTargetDependency */,
);
name = CharLS;
productName = VTK;
Expand All @@ -9802,6 +9858,7 @@
buildRules = (
);
dependencies = (
71E6C0BC1FBAD34C00FF75B6 /* PBXTargetDependency */,
710BAF621FB1A478004909E4 /* PBXTargetDependency */,
);
name = GDCM;
Expand All @@ -9821,6 +9878,7 @@
buildRules = (
);
dependencies = (
71E6C0B81FBAD34500FF75B6 /* PBXTargetDependency */,
);
name = OpenJPEG;
productName = VTK;
Expand All @@ -9839,6 +9897,7 @@
buildRules = (
);
dependencies = (
71E6C0B61FBAD34100FF75B6 /* PBXTargetDependency */,
);
name = OpenSSL;
productName = VTK;
Expand Down Expand Up @@ -9972,6 +10031,9 @@
710BAEFB1FAB124C004909E4 = {
CreatedOnToolsVersion = 9.0;
};
71E6C0B01FBAD31E00FF75B6 = {
CreatedOnToolsVersion = 9.0;
};
AB0F3A2B1046BD2B004129DD = {
DevelopmentTeam = KM2Q4CB65V;
};
Expand Down Expand Up @@ -10019,6 +10081,7 @@
710BAF291FAB2837004909E4 /* CharLS */,
710BAF581FB1A418004909E4 /* OpenJPEG */,
717C19CB1FB3712E005A5834 /* OpenSSL */,
71E6C0B01FBAD31E00FF75B6 /* Git Submodule Sync */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -10858,6 +10921,20 @@
shellPath = /bin/sh;
shellScript = "path=$(cat \"$TARGET_TEMP_DIR/../Horos API.build/Product.path\")\nrsync --exclude=\".DS_Store\" -rtlv \"$path\" \"$TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH/\"";
};
71E6C0B41FBAD32800FF75B6 /* Git Submodule Sync */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Git Submodule Sync";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "git submodule sync";
};
AB0F3A3F1046BE51004129DD /* Copy Headers and Create Horos.h */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -12588,6 +12665,36 @@
target = CEDF6C600B46FE99008B45B8 /* DICOMPrint */;
targetProxy = 71C99EA21D19A80C00208F3B /* PBXContainerItemProxy */;
};
71E6C0B61FBAD34100FF75B6 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 71E6C0B01FBAD31E00FF75B6 /* Git Submodule Sync */;
targetProxy = 71E6C0B51FBAD34100FF75B6 /* PBXContainerItemProxy */;
};
71E6C0B81FBAD34500FF75B6 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 71E6C0B01FBAD31E00FF75B6 /* Git Submodule Sync */;
targetProxy = 71E6C0B71FBAD34500FF75B6 /* PBXContainerItemProxy */;
};
71E6C0BA1FBAD34800FF75B6 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 71E6C0B01FBAD31E00FF75B6 /* Git Submodule Sync */;
targetProxy = 71E6C0B91FBAD34800FF75B6 /* PBXContainerItemProxy */;
};
71E6C0BC1FBAD34C00FF75B6 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 71E6C0B01FBAD31E00FF75B6 /* Git Submodule Sync */;
targetProxy = 71E6C0BB1FBAD34C00FF75B6 /* PBXContainerItemProxy */;
};
71E6C0BE1FBAD35000FF75B6 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 71E6C0B01FBAD31E00FF75B6 /* Git Submodule Sync */;
targetProxy = 71E6C0BD1FBAD35000FF75B6 /* PBXContainerItemProxy */;
};
71E6C0C01FBAD35400FF75B6 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 71E6C0B01FBAD31E00FF75B6 /* Git Submodule Sync */;
targetProxy = 71E6C0BF1FBAD35400FF75B6 /* PBXContainerItemProxy */;
};
99FE27FD1CF4A442003C32AB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 4A2F5931078D148300C514A2 /* Unzip Binaries */;
Expand Down Expand Up @@ -13499,6 +13606,20 @@
};
name = Release;
};
71E6C0B11FBAD31E00FF75B6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = $TARGET_NAME;
};
name = Debug;
};
71E6C0B21FBAD31E00FF75B6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = $TARGET_NAME;
};
name = Release;
};
7E76BEC1085757B60073649A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -13795,6 +13916,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
71E6C0B31FBAD31E00FF75B6 /* Build configuration list for PBXAggregateTarget "Git Submodule Sync" */ = {
isa = XCConfigurationList;
buildConfigurations = (
71E6C0B11FBAD31E00FF75B6 /* Debug */,
71E6C0B21FBAD31E00FF75B6 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
7E76BEC0085757B60073649A /* Build configuration list for PBXNativeTarget "Horos DCM" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down
3 changes: 0 additions & 3 deletions Scripts/CharLS/1-Submodule.sh
View file
Expand Up @@ -2,9 +2,6 @@

set -e; set -o xtrace

[ -f "$TARGET_NAME/CMakeLists.txt" ] && exit 0

echo "warning: submodule $TARGET_NAME requires init/update, please wait..."
cd "$TARGET_NAME"
git submodule update --init --recursive

Expand Down
3 changes: 0 additions & 3 deletions Scripts/GDCM/1-Submodule.sh
View file
Expand Up @@ -2,9 +2,6 @@

set -e; set -o xtrace

[ -f "$TARGET_NAME/CMakeLists.txt" ] && exit 0

echo "warning: submodule $TARGET_NAME requires init/update, please wait..."
cd "$TARGET_NAME"
git submodule update --init --recursive

Expand Down
3 changes: 0 additions & 3 deletions Scripts/ITK/1-Submodule.sh
View file
Expand Up @@ -2,9 +2,6 @@

set -e; set -o xtrace

[ -f "$TARGET_NAME/CMakeLists.txt" ] && exit 0

echo "warning: submodule $TARGET_NAME requires init/update, please wait..."
cd "$TARGET_NAME"
git submodule update --init --recursive

Expand Down
1 change: 0 additions & 1 deletion Scripts/OpenJPEG/1-Submodule.sh
View file
Expand Up @@ -4,7 +4,6 @@ set -e; set -o xtrace

[ -f "$TARGET_NAME/CMakeLists.txt" ] && exit 0

echo "warning: submodule $TARGET_NAME requires init/update, please wait..."
cd "$TARGET_NAME"
git submodule update --init --recursive

Expand Down
3 changes: 0 additions & 3 deletions Scripts/OpenSSL/1-Submodule.sh
View file
Expand Up @@ -2,9 +2,6 @@

set -e; set -o xtrace

[ -f "$TARGET_NAME/config" ] && exit 0

echo "warning: submodule $TARGET_NAME requires init/update, please wait..."
cd "$TARGET_NAME"
git submodule update --init --recursive

Expand Down
3 changes: 0 additions & 3 deletions Scripts/VTK/1-Submodule.sh
View file
Expand Up @@ -2,9 +2,6 @@

set -e; set -o xtrace

[ -f "$TARGET_NAME/CMakeLists.txt" ] && exit 0

echo "warning: submodule $TARGET_NAME requires init/update, please wait..."
cd "$TARGET_NAME"
git submodule update --init --recursive

Expand Down

0 comments on commit b6d0d1c

Please sign in to comment.