rebuild: dmInfo

diff --git a/bin/X86LINUX64/dmInfo b/bin/X86LINUX64/dmInfo
index aa61d70..c27f5d6 100755 (executable)
Binary files a/bin/X86LINUX64/dmInfo and b/bin/X86LINUX64/dmInfo differ

diff --git a/lib/X86LINUX64/libEosObjects.a b/lib/X86LINUX64/libEosObjects.a
index 24d8d70..3aeadd8 100644 (file)
Binary files a/lib/X86LINUX64/libEosObjects.a and b/lib/X86LINUX64/libEosObjects.a differ

diff --git a/lib/X86LINUX64/libEosObjects.so b/lib/X86LINUX64/libEosObjects.so
index 1057536..15f0732 100644 (file)
Binary files a/lib/X86LINUX64/libEosObjects.so and b/lib/X86LINUX64/libEosObjects.so differ

diff --git a/lib/X86LINUX64/libdmFile.a b/lib/X86LINUX64/libdmFile.a
index 4eee7cf..926d055 100644 (file)
Binary files a/lib/X86LINUX64/libdmFile.a and b/lib/X86LINUX64/libdmFile.a differ

diff --git a/lib/X86LINUX64/libdmFile.so b/lib/X86LINUX64/libdmFile.so
index d40d4ed..f953de5 100644 (file)
Binary files a/lib/X86LINUX64/libdmFile.so and b/lib/X86LINUX64/libdmFile.so differ

diff --git a/lib/X86LINUX64/shared/dmFileInfo.sharedo b/lib/X86LINUX64/shared/dmFileInfo.sharedo
index dea674e..3fe4fec 100644 (file)
Binary files a/lib/X86LINUX64/shared/dmFileInfo.sharedo and b/lib/X86LINUX64/shared/dmFileInfo.sharedo differ

diff --git a/lib/X86LINUX64/shared/dmFileRead.sharedo b/lib/X86LINUX64/shared/dmFileRead.sharedo
index 9a8c5d7..38549e0 100644 (file)
Binary files a/lib/X86LINUX64/shared/dmFileRead.sharedo and b/lib/X86LINUX64/shared/dmFileRead.sharedo differ

diff --git a/lib/X86LINUX64/shared/dmFileUtil.sharedo b/lib/X86LINUX64/shared/dmFileUtil.sharedo
index 5ad939a..fb6cd29 100644 (file)
Binary files a/lib/X86LINUX64/shared/dmFileUtil.sharedo and b/lib/X86LINUX64/shared/dmFileUtil.sharedo differ

diff --git a/lib/X86LINUX64/shared/ldm2mrc.sharedo b/lib/X86LINUX64/shared/ldm2mrc.sharedo
new file mode 100644 (file)
index 0000000..18d520c
Binary files /dev/null and b/lib/X86LINUX64/shared/ldm2mrc.sharedo differ

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/.Depend b/src/Objects/DataManip/dmFile/src/X86LINUX64/.Depend
index 9c6e3ec..af1c290 100644 (file)
--- a/src/Objects/DataManip/dmFile/src/X86LINUX64/.Depend
+++ b/src/Objects/DataManip/dmFile/src/X86LINUX64/.Depend
@@ -1,15 +1,34 @@
 X86LINUX64/dmFileInfo.o:dmFileInfo.o
 X86LINUX64/dmFileRead.o:dmFileRead.o
 X86LINUX64/dmFileUtil.o:dmFileUtil.o
-dmFileInfo.o: dmFileInfo.c ../inc/dmFile.h /usr/include/stdio.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
+X86LINUX64/ldm2mrc.o:ldm2mrc.o
+dmFileInfo.o: dmFileInfo.c /usr/include/string.h /usr/include/features.h \
+ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
+ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \
- /usr/include/bits/types.h /usr/include/bits/typesizes.h \
- /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/xlocale.h /home/people/tacyas/Eos/include/genUtil.h \
+ /usr/include/math.h /usr/include/bits/huge_val.h \
+ /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \
+ /usr/include/bits/inf.h /usr/include/bits/nan.h \
+ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
+ /usr/include/values.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/limits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/syslimits.h \
+ /usr/include/limits.h /usr/include/bits/posix1_lim.h \
+ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
+ /usr/include/bits/posix2_lim.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/float.h ../inc/dmFile.h \
+ /usr/include/stdio.h /usr/include/bits/types.h \
+ /usr/include/bits/typesizes.h /usr/include/libio.h \
+ /usr/include/_G_config.h /usr/include/wchar.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
+ /home/people/tacyas/Eos/include/mrcImage.h \
+ /home/people/tacyas/Eos/include/genUtil.h \
+ /home/people/tacyas/Eos/include/Matrix3D.h \
+ /home/people/tacyas/Eos/include/Vector.h \
+ /home/people/tacyas/Eos/include/Array.h \
+ /home/people/tacyas/Eos/include/ctfInfo.h
 dmFileRead.o: dmFileRead.c /home/people/tacyas/Eos/include/genUtil.h \
  /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
@@ -37,8 +56,47 @@ dmFileRead.o: dmFileRead.c /home/people/tacyas/Eos/include/genUtil.h \
  /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
  /usr/include/bits/select.h /usr/include/bits/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
- /usr/include/bits/pthreadtypes.h /usr/include/alloca.h ../inc/dmFile.h
-dmFileUtil.o: dmFileUtil.c ../inc/dmFile.h /usr/include/stdio.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/alloca.h ../inc/dmFile.h \
+ /home/people/tacyas/Eos/include/mrcImage.h \
+ /home/people/tacyas/Eos/include/genUtil.h \
+ /home/people/tacyas/Eos/include/Matrix3D.h \
+ /home/people/tacyas/Eos/include/Vector.h \
+ /home/people/tacyas/Eos/include/Array.h \
+ /home/people/tacyas/Eos/include/ctfInfo.h
+dmFileUtil.o: dmFileUtil.c /usr/include/stdlib.h /usr/include/features.h \
+ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
+ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \
+ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/byteswap.h /usr/include/sys/types.h \
+ /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /usr/include/time.h /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/sigset.h /usr/include/bits/time.h \
+ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
+ /usr/include/alloca.h /home/people/tacyas/Eos/include/genUtil.h \
+ /usr/include/string.h /usr/include/xlocale.h /usr/include/math.h \
+ /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \
+ /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
+ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
+ /usr/include/bits/mathcalls.h /usr/include/values.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/limits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/syslimits.h \
+ /usr/include/limits.h /usr/include/bits/posix1_lim.h \
+ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
+ /usr/include/bits/posix2_lim.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/float.h ../inc/dmFile.h \
+ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \
+ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
+ /home/people/tacyas/Eos/include/mrcImage.h \
+ /home/people/tacyas/Eos/include/genUtil.h \
+ /home/people/tacyas/Eos/include/Matrix3D.h \
+ /home/people/tacyas/Eos/include/Vector.h \
+ /home/people/tacyas/Eos/include/Array.h \
+ /home/people/tacyas/Eos/include/ctfInfo.h
+ldm2mrc.o: ldm2mrc.c ../inc/dmFile.h /usr/include/stdio.h \
  /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
  /usr/include/gnu/stubs-64.h \
@@ -46,4 +104,20 @@ dmFileUtil.o: dmFileUtil.c ../inc/dmFile.h /usr/include/stdio.h \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
+ /home/people/tacyas/Eos/include/mrcImage.h /usr/include/math.h \
+ /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \
+ /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
+ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
+ /usr/include/bits/mathcalls.h /home/people/tacyas/Eos/include/genUtil.h \
+ /usr/include/string.h /usr/include/xlocale.h /usr/include/values.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/limits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/syslimits.h \
+ /usr/include/limits.h /usr/include/bits/posix1_lim.h \
+ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
+ /usr/include/bits/posix2_lim.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/float.h \
+ /home/people/tacyas/Eos/include/Matrix3D.h \
+ /home/people/tacyas/Eos/include/Vector.h \
+ /home/people/tacyas/Eos/include/Array.h \
+ /home/people/tacyas/Eos/include/ctfInfo.h

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/.Source b/src/Objects/DataManip/dmFile/src/X86LINUX64/.Source
index 40c1897..a817230 100644 (file)
--- a/src/Objects/DataManip/dmFile/src/X86LINUX64/.Source
+++ b/src/Objects/DataManip/dmFile/src/X86LINUX64/.Source
@@ -2,45 +2,54 @@ SRC = \
 dmFileInfo.c \
 dmFileRead.c \
 dmFileUtil.c \
+ldm2mrc.c \
 
 OBJ = \
 dmFileInfo.o \
 dmFileRead.o \
 dmFileUtil.o \
+ldm2mrc.o \
 
 SHAREDOBJ = \
 dmFileInfo.sharedo \
 dmFileRead.sharedo \
 dmFileUtil.sharedo \
+ldm2mrc.sharedo \
 
 REALOBJ = \
 X86LINUX64/dmFileInfo.o \
 X86LINUX64/dmFileRead.o \
 X86LINUX64/dmFileUtil.o \
+X86LINUX64/ldm2mrc.o \
 
 REALSHAREDOBJ = \
 X86LINUX64/dmFileInfo.sharedo \
 X86LINUX64/dmFileRead.sharedo \
 X86LINUX64/dmFileUtil.sharedo \
+X86LINUX64/ldm2mrc.sharedo \
 
 OBJDEBUG = \
 dmFileInfo.debugo \
 dmFileRead.debugo \
 dmFileUtil.debugo \
+ldm2mrc.debugo \
 
 REALOBJDEBUG = \
 X86LINUX64/dmFileInfo.debugo \
 X86LINUX64/dmFileRead.debugo \
 X86LINUX64/dmFileUtil.debugo \
+X86LINUX64/ldm2mrc.debugo \
 
 OBJCUDAGDB = \
 dmFileInfo.cudagdb.o \
 dmFileRead.cudagdb.o \
 dmFileUtil.cudagdb.o \
+ldm2mrc.cudagdb.o \
 
 REALOBJCUDAGDB = \
 X86LINUX64/dmFileInfo.cudagdb.o \
 X86LINUX64/dmFileRead.cudagdb.o \
 X86LINUX64/dmFileUtil.cudagdb.o \
+X86LINUX64/ldm2mrc.cudagdb.o \
 
 

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileInfo.debugo b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileInfo.debugo
index 25fc53d..c8870bd 100644 (file)
Binary files a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileInfo.debugo and b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileInfo.debugo differ

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileInfo.o b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileInfo.o
index 2842d9c..21b496c 100644 (file)
Binary files a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileInfo.o and b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileInfo.o differ

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileInfo.sharedo b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileInfo.sharedo
index dea674e..3fe4fec 100644 (file)
Binary files a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileInfo.sharedo and b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileInfo.sharedo differ

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileRead.debugo b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileRead.debugo
index 3f8ca0f..f7195a7 100644 (file)
Binary files a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileRead.debugo and b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileRead.debugo differ

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileRead.o b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileRead.o
index bdf7a69..9386867 100644 (file)
Binary files a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileRead.o and b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileRead.o differ

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileRead.sharedo b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileRead.sharedo
index 9a8c5d7..38549e0 100644 (file)
Binary files a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileRead.sharedo and b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileRead.sharedo differ

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

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileUtil.debugo b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileUtil.debugo
index eb96f63..047c0a8 100644 (file)
Binary files a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileUtil.debugo and b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileUtil.debugo differ

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileUtil.o b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileUtil.o
index 082f984..cc05fc1 100644 (file)
Binary files a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileUtil.o and b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileUtil.o differ

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileUtil.sharedo b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileUtil.sharedo
index 5ad939a..fb6cd29 100644 (file)
Binary files a/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileUtil.sharedo and b/src/Objects/DataManip/dmFile/src/X86LINUX64/dmFileUtil.sharedo differ

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/ldm2mrc.debugo b/src/Objects/DataManip/dmFile/src/X86LINUX64/ldm2mrc.debugo
new file mode 100644 (file)
index 0000000..e6b3c6d
Binary files /dev/null and b/src/Objects/DataManip/dmFile/src/X86LINUX64/ldm2mrc.debugo differ

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/ldm2mrc.o b/src/Objects/DataManip/dmFile/src/X86LINUX64/ldm2mrc.o
new file mode 100644 (file)
index 0000000..18d520c
Binary files /dev/null and b/src/Objects/DataManip/dmFile/src/X86LINUX64/ldm2mrc.o differ

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/ldm2mrc.sharedo b/src/Objects/DataManip/dmFile/src/X86LINUX64/ldm2mrc.sharedo
new file mode 100644 (file)
index 0000000..18d520c
Binary files /dev/null and b/src/Objects/DataManip/dmFile/src/X86LINUX64/ldm2mrc.sharedo differ

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/libdmFile.a b/src/Objects/DataManip/dmFile/src/X86LINUX64/libdmFile.a
index 4eee7cf..926d055 100644 (file)
Binary files a/src/Objects/DataManip/dmFile/src/X86LINUX64/libdmFile.a and b/src/Objects/DataManip/dmFile/src/X86LINUX64/libdmFile.a differ

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/libdmFile.debug.a b/src/Objects/DataManip/dmFile/src/X86LINUX64/libdmFile.debug.a
index 38cb723..a913ed9 100644 (file)
Binary files a/src/Objects/DataManip/dmFile/src/X86LINUX64/libdmFile.debug.a and b/src/Objects/DataManip/dmFile/src/X86LINUX64/libdmFile.debug.a differ

diff --git a/src/Objects/DataManip/dmFile/src/X86LINUX64/libdmFile.so b/src/Objects/DataManip/dmFile/src/X86LINUX64/libdmFile.so
index d40d4ed..f953de5 100755 (executable)
Binary files a/src/Objects/DataManip/dmFile/src/X86LINUX64/libdmFile.so and b/src/Objects/DataManip/dmFile/src/X86LINUX64/libdmFile.so differ

diff --git a/src/Tools/filter/dmInfo/src/X86LINUX64/.Depend b/src/Tools/filter/dmInfo/src/X86LINUX64/.Depend
index 0c4cb31..3844056 100644 (file)
--- a/src/Tools/filter/dmInfo/src/X86LINUX64/.Depend
+++ b/src/Tools/filter/dmInfo/src/X86LINUX64/.Depend
@@ -55,7 +55,13 @@ dmInfo.o: dmInfo.c /usr/include/stdio.h /usr/include/features.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/float.h \
- /home/people/tacyas/Eos/include/dmFile.h
+ /home/people/tacyas/Eos/include/dmFile.h \
+ /home/people/tacyas/Eos/include/mrcImage.h \
+ /home/people/tacyas/Eos/include/genUtil.h \
+ /home/people/tacyas/Eos/include/Matrix3D.h \
+ /home/people/tacyas/Eos/include/Vector.h \
+ /home/people/tacyas/Eos/include/Array.h \
+ /home/people/tacyas/Eos/include/ctfInfo.h
 init.o: init.c /usr/include/stdio.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
  /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \

diff --git a/src/Tools/filter/dmInfo/src/X86LINUX64/dmInfo b/src/Tools/filter/dmInfo/src/X86LINUX64/dmInfo
new file mode 100755 (executable)
index 0000000..c27f5d6
Binary files /dev/null and b/src/Tools/filter/dmInfo/src/X86LINUX64/dmInfo differ