Modifiy mrcImage3DPad: Filament/Sphere/Elliposiod/Rectangle

	modified:   include/lmrcImage3DPad.h
	modified:   src/Objects/DataManip/mrcImage/src/lmrcImage3DPad.c
	modified:   src/Objects/DataManip/mrcImage/src/lmrcImage3DPad.h
	modified:   src/Tools/mrcImage/mrcImage3DPad/src/mrcImage3DPad.c

Modify genUtil.h

diff --git a/bin/X86MAC64/mrcImage3DPad b/bin/X86MAC64/mrcImage3DPad
index a592ce2..8514cba 100755 (executable)
Binary files a/bin/X86MAC64/mrcImage3DPad and b/bin/X86MAC64/mrcImage3DPad differ

diff --git a/lib/X86MAC64/libEosObjects.a b/lib/X86MAC64/libEosObjects.a
index 7ee2607..11ef85a 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 25e252c..0ed16ad 100644 (file)
Binary files a/lib/X86MAC64/libmrcImage.a and b/lib/X86MAC64/libmrcImage.a differ

diff --git a/lib/X86MAC64/shared/lmrcImage3DPad.sharedo b/lib/X86MAC64/shared/lmrcImage3DPad.sharedo
index 02ea5f5..83b170b 100644 (file)
Binary files a/lib/X86MAC64/shared/lmrcImage3DPad.sharedo and b/lib/X86MAC64/shared/lmrcImage3DPad.sharedo differ

diff --git a/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a b/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a
index 25e252c..0ed16ad 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 a285c76..66680d7 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/lmrcImage3DPad.sharedo b/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImage3DPad.sharedo
index 02ea5f5..83b170b 100644 (file)
Binary files a/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImage3DPad.sharedo and b/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImage3DPad.sharedo differ

diff --git a/src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/.Depend b/src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/.Depend
index 7760d1e..ca1cb24 100644 (file)
--- a/src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/.Depend
+++ b/src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/.Depend
@@ -18,7 +18,7 @@ argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
   /usr/include/sys/_types/_pthread_attr_t.h \
   /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
   /usr/include/sys/resource.h \
-  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \
   /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
   /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
   /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
@@ -36,7 +36,7 @@ argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
   /Users/tacyas/Eos/include/string.h /usr/include/math.h ../inc/config.h \
   ../inc/../inc/mrcImage3DPad.h /Users/tacyas/Eos/include/genUtil.h \
   /Users/tacyas/Eos/include/File.h /Users/tacyas/Eos/include/Memory.h \
-  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/limits.h \
   /usr/include/limits.h /usr/include/machine/limits.h \
   /usr/include/i386/limits.h /usr/include/i386/_limits.h \
   /usr/include/sys/syslimits.h
@@ -60,7 +60,7 @@ init.o: init.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
   /usr/include/sys/_types/_pthread_attr_t.h \
   /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
   /usr/include/sys/resource.h \
-  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \
   /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
   /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
   /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
@@ -78,7 +78,7 @@ init.o: init.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
   /Users/tacyas/Eos/include/string.h /usr/include/math.h ../inc/config.h \
   ../inc/../inc/mrcImage3DPad.h /Users/tacyas/Eos/include/genUtil.h \
   /Users/tacyas/Eos/include/File.h /Users/tacyas/Eos/include/Memory.h \
-  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/limits.h \
   /usr/include/limits.h /usr/include/machine/limits.h \
   /usr/include/i386/limits.h /usr/include/i386/_limits.h \
   /usr/include/sys/syslimits.h
@@ -102,7 +102,7 @@ mrcImage3DPad.o: mrcImage3DPad.c /usr/include/stdio.h \
   /usr/include/sys/_types/_pthread_attr_t.h \
   /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
   /usr/include/sys/resource.h \
-  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \
   /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
   /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
   /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
@@ -144,7 +144,7 @@ usage.o: usage.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
   /usr/include/sys/_types/_pthread_attr_t.h \
   /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
   /usr/include/sys/resource.h \
-  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \
   /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
   /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
   /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
@@ -180,7 +180,7 @@ util.o: util.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
   /usr/include/sys/_types/_pthread_attr_t.h \
   /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
   /usr/include/sys/resource.h \
-  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \
   /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
   /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
   /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \

diff --git a/src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/mrcImage3DPad b/src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/mrcImage3DPad
index a592ce2..8514cba 100755 (executable)
Binary files a/src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/mrcImage3DPad and b/src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/mrcImage3DPad differ