modified: lib/X86MAC64/shared/lmrcImageCorrelation.sharedo

	new file:   src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagePattersonFunctionCalc.c
	modified:   src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/mrcImageAutoRotationCorrelation
	modified:   src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/mrcImageShapeSearch

diff --git a/bin/X86MAC64/mrcImageShapeSearch b/bin/X86MAC64/mrcImageShapeSearch
index c764cec..feb8e6a 100755 (executable)
Binary files a/bin/X86MAC64/mrcImageShapeSearch and b/bin/X86MAC64/mrcImageShapeSearch differ

diff --git a/lib/X86MAC64/libEosObjects.a b/lib/X86MAC64/libEosObjects.a
index 3967353..b20319b 100644 (file)
Binary files a/lib/X86MAC64/libEosObjects.a and b/lib/X86MAC64/libEosObjects.a differ

diff --git a/lib/X86MAC64/libmrcImage.a b/lib/X86MAC64/libmrcImage.a
index 1df61e7..3292bde 100644 (file)
Binary files a/lib/X86MAC64/libmrcImage.a and b/lib/X86MAC64/libmrcImage.a differ

diff --git a/lib/X86MAC64/shared/lmrcImageCorrelation.sharedo b/lib/X86MAC64/shared/lmrcImageCorrelation.sharedo
index 99e6b10..88a77f9 100644 (file)
Binary files a/lib/X86MAC64/shared/lmrcImageCorrelation.sharedo and b/lib/X86MAC64/shared/lmrcImageCorrelation.sharedo differ

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/.Depend b/src/Objects/DataManip/mrcImage/src/X86MAC64/.Depend
index fe781ac..38deb61 100644 (file)
--- a/src/Objects/DataManip/mrcImage/src/X86MAC64/.Depend
+++ b/src/Objects/DataManip/mrcImage/src/X86MAC64/.Depend
@@ -49,6 +49,7 @@ X86MAC64/lmrcImageEdgeEnhancement.o:lmrcImageEdgeEnhancement.o
 X86MAC64/lmrcImageErosion.o:lmrcImageErosion.o
 X86MAC64/lmrcImageFFT.o:lmrcImageFFT.o
 X86MAC64/lmrcImageFOMCalc.o:lmrcImageFOMCalc.o
+X86MAC64/lmrcImageFeatureCalc.o:lmrcImageFeatureCalc.o
 X86MAC64/lmrcImageFeatureExtraction.o:lmrcImageFeatureExtraction.o
 X86MAC64/lmrcImageFeatureExtractionCoOccurrence.o:lmrcImageFeatureExtractionCoOccurrence.o
 X86MAC64/lmrcImageFeatureExtractionRunLength.o:lmrcImageFeatureExtractionRunLength.o

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/.Source b/src/Objects/DataManip/mrcImage/src/X86MAC64/.Source
index 18af604..1064542 100644 (file)
--- a/src/Objects/DataManip/mrcImage/src/X86MAC64/.Source
+++ b/src/Objects/DataManip/mrcImage/src/X86MAC64/.Source
@@ -50,6 +50,7 @@ lmrcImageEdgeEnhancement.c \
 lmrcImageErosion.c \
 lmrcImageFFT.c \
 lmrcImageFOMCalc.c \
+lmrcImageFeatureCalc.c \
 lmrcImageFeatureExtraction.c \
 lmrcImageFeatureExtractionCoOccurrence.c \
 lmrcImageFeatureExtractionRunLength.c \
@@ -223,6 +224,7 @@ lmrcImageEdgeEnhancement.o \
 lmrcImageErosion.o \
 lmrcImageFFT.o \
 lmrcImageFOMCalc.o \
+lmrcImageFeatureCalc.o \
 lmrcImageFeatureExtraction.o \
 lmrcImageFeatureExtractionCoOccurrence.o \
 lmrcImageFeatureExtractionRunLength.o \
@@ -396,6 +398,7 @@ lmrcImageEdgeEnhancement.sharedo \
 lmrcImageErosion.sharedo \
 lmrcImageFFT.sharedo \
 lmrcImageFOMCalc.sharedo \
+lmrcImageFeatureCalc.sharedo \
 lmrcImageFeatureExtraction.sharedo \
 lmrcImageFeatureExtractionCoOccurrence.sharedo \
 lmrcImageFeatureExtractionRunLength.sharedo \
@@ -569,6 +572,7 @@ X86MAC64/lmrcImageEdgeEnhancement.o \
 X86MAC64/lmrcImageErosion.o \
 X86MAC64/lmrcImageFFT.o \
 X86MAC64/lmrcImageFOMCalc.o \
+X86MAC64/lmrcImageFeatureCalc.o \
 X86MAC64/lmrcImageFeatureExtraction.o \
 X86MAC64/lmrcImageFeatureExtractionCoOccurrence.o \
 X86MAC64/lmrcImageFeatureExtractionRunLength.o \
@@ -742,6 +746,7 @@ X86MAC64/lmrcImageEdgeEnhancement.sharedo \
 X86MAC64/lmrcImageErosion.sharedo \
 X86MAC64/lmrcImageFFT.sharedo \
 X86MAC64/lmrcImageFOMCalc.sharedo \
+X86MAC64/lmrcImageFeatureCalc.sharedo \
 X86MAC64/lmrcImageFeatureExtraction.sharedo \
 X86MAC64/lmrcImageFeatureExtractionCoOccurrence.sharedo \
 X86MAC64/lmrcImageFeatureExtractionRunLength.sharedo \
@@ -915,6 +920,7 @@ lmrcImageEdgeEnhancement.debugo \
 lmrcImageErosion.debugo \
 lmrcImageFFT.debugo \
 lmrcImageFOMCalc.debugo \
+lmrcImageFeatureCalc.debugo \
 lmrcImageFeatureExtraction.debugo \
 lmrcImageFeatureExtractionCoOccurrence.debugo \
 lmrcImageFeatureExtractionRunLength.debugo \
@@ -1085,6 +1091,7 @@ X86MAC64/lmrcImageEdgeEnhancement.debugo \
 X86MAC64/lmrcImageErosion.debugo \
 X86MAC64/lmrcImageFFT.debugo \
 X86MAC64/lmrcImageFOMCalc.debugo \
+X86MAC64/lmrcImageFeatureCalc.debugo \
 X86MAC64/lmrcImageFeatureExtraction.debugo \
 X86MAC64/lmrcImageFeatureExtractionCoOccurrence.debugo \
 X86MAC64/lmrcImageFeatureExtractionRunLength.debugo \
@@ -1258,6 +1265,7 @@ lmrcImageEdgeEnhancement.cudagdb.o \
 lmrcImageErosion.cudagdb.o \
 lmrcImageFFT.cudagdb.o \
 lmrcImageFOMCalc.cudagdb.o \
+lmrcImageFeatureCalc.cudagdb.o \
 lmrcImageFeatureExtraction.cudagdb.o \
 lmrcImageFeatureExtractionCoOccurrence.cudagdb.o \
 lmrcImageFeatureExtractionRunLength.cudagdb.o \
@@ -1431,6 +1439,7 @@ X86MAC64/lmrcImageEdgeEnhancement.cudagdb.o \
 X86MAC64/lmrcImageErosion.cudagdb.o \
 X86MAC64/lmrcImageFFT.cudagdb.o \
 X86MAC64/lmrcImageFOMCalc.cudagdb.o \
+X86MAC64/lmrcImageFeatureCalc.cudagdb.o \
 X86MAC64/lmrcImageFeatureExtraction.cudagdb.o \
 X86MAC64/lmrcImageFeatureExtractionCoOccurrence.cudagdb.o \
 X86MAC64/lmrcImageFeatureExtractionRunLength.cudagdb.o \

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a b/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a
index 1df61e7..3292bde 100644 (file)
Binary files a/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a and b/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a differ

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a b/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a
index f35db2e..67dc12d 100644 (file)
Binary files a/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a and b/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a differ

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.debugo b/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.debugo
index 6e9af63..1508be9 100644 (file)
Binary files a/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.debugo and b/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.debugo differ

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.o b/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.o
index 99e6b10..88a77f9 100644 (file)
Binary files a/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.o and b/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.o differ

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.sharedo b/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.sharedo
index 99e6b10..88a77f9 100644 (file)
Binary files a/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.sharedo and b/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCorrelation.sharedo differ

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagePattersonFunctionCalc.c b/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagePattersonFunctionCalc.c
new file mode 120000 (symlink)
index 0000000..fc6a88c
--- /dev/null
+++ b/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImagePattersonFunctionCalc.c
@@ -0,0 +1 @@
+../lmrcImagePattersonFunctionCalc.c
\ No newline at end of file

diff --git a/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/argCheck.o b/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/argCheck.o
index 22b7f75..dba66ad 100644 (file)
Binary files a/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/argCheck.o and b/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/argCheck.o differ

diff --git a/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/init.o b/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/init.o
index 9fd0e39..da2d8e1 100644 (file)
Binary files a/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/init.o and b/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/init.o differ

diff --git a/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/mrcImageAutoRotationCorrelation b/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/mrcImageAutoRotationCorrelation
index eec8039..10dd819 100755 (executable)
Binary files a/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/mrcImageAutoRotationCorrelation and b/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/mrcImageAutoRotationCorrelation differ

diff --git a/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/mrcImageAutoRotationCorrelation.o b/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/mrcImageAutoRotationCorrelation.o
index cf4e41d..a7db37b 100644 (file)
Binary files a/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/mrcImageAutoRotationCorrelation.o and b/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/mrcImageAutoRotationCorrelation.o differ

diff --git a/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/usage.o b/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/usage.o
index f5bf612..6588872 100644 (file)
Binary files a/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/usage.o and b/src/Tools/mrcImage/mrcImageAutoRotationCorrelation/src/X86MAC64/usage.o differ

diff --git a/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/init.o b/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/init.o
index b2acca5..fbaf0c6 100644 (file)
Binary files a/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/init.o and b/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/init.o differ

diff --git a/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/mrcImageShapeSearch b/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/mrcImageShapeSearch
index c764cec..feb8e6a 100755 (executable)
Binary files a/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/mrcImageShapeSearch and b/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/mrcImageShapeSearch differ

diff --git a/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/mrcImageShapeSearch.o b/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/mrcImageShapeSearch.o
index 9035b80..a8d9be3 100644 (file)
Binary files a/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/mrcImageShapeSearch.o and b/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/mrcImageShapeSearch.o differ

diff --git a/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/usage.o b/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/usage.o
index 091fc39..96a46fa 100644 (file)
Binary files a/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/usage.o and b/src/Tools/mrcImage/mrcImageShapeSearch/src/X86MAC64/usage.o differ