From: Takuo Yasunaga Date: Sun, 15 Jun 2014 18:50:00 +0000 (+0900) Subject: rebuild X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d593c34279b26ff26c6b77faf4f4d6a1f84eb425;p=eos%2FhostdependX86LINUX64.git rebuild Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base Conflicts: src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c src/Tools/Config/Define.inc src/Tools/Integration/Display2/src/Display2.html src/Tools/mrcImage/mrc2hdf/src/ALPHA src/Tools/mrcImage/mrc2hdf/src/ALPHALINUX src/Tools/mrcImage/mrc2hdf/src/ALPHALINUX5 src/Tools/mrcImage/mrc2hdf/src/ALPHAOSF1 src/Tools/mrcImage/mrc2hdf/src/HP src/Tools/mrcImage/mrc2hdf/src/I386LINUX src/Tools/mrcImage/mrc2hdf/src/SGI src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html src/Tools/mrcImage/mrcImageSplit/src/mrcImageSplit.html new file: bin/mrcImageAsProbability new file: bin/mrcImageDeconvolution new file: hostdepend/I386LINUX/bin/I386LINUX/StereoDisplay modified: hostdepend/I386LINUX/lib/I386LINUX/* modified: hostdepend/X86LINUX64/bin/X86LINUX64/* --- d593c34279b26ff26c6b77faf4f4d6a1f84eb425 diff --cc hostdepend/I386LINUX/bin/I386LINUX/StereoDisplay index 0000000000,0000000000..335ac37bb7 new file mode 100755 Binary files differ diff --cc hostdepend/I386LINUX/lib/I386LINUX/libEosObjects.a index a3fd8ebbc9,627fa34a12..391352e4df Binary files differ diff --cc hostdepend/I386LINUX/lib/I386LINUX/libEosObjects.so index 73498cd7b5,a4fe5c0d4a..2f716f3b8e Binary files differ diff --cc hostdepend/I386LINUX/lib/I386LINUX/libTclTk.a index ff5213123c,ff5213123c..9497a31280 Binary files differ diff --cc hostdepend/I386LINUX/lib/I386LINUX/libTclTk.so index b60edffd2c,ade9be1dfc..de1fd0cdc2 Binary files differ diff --cc hostdepend/I386LINUX/lib/I386LINUX/shared/tkImgFmtMRC.sharedo index 1947299633,1947299633..3c85e279ea Binary files differ diff --cc hostdepend/I386LINUX/src/Objects/DataExpress/TclTk/src/I386LINUX/libTclTk.a index ff5213123c,ff5213123c..9497a31280 Binary files differ diff --cc hostdepend/I386LINUX/src/Objects/DataExpress/TclTk/src/I386LINUX/libTclTk.debug.a index 13ecd4e3a4,f135b63a52..577dccdf09 Binary files differ diff --cc hostdepend/I386LINUX/src/Objects/DataExpress/TclTk/src/I386LINUX/libTclTk.so index b60edffd2c,ade9be1dfc..de1fd0cdc2 Binary files differ diff --cc hostdepend/I386LINUX/src/Objects/DataExpress/TclTk/src/I386LINUX/tkImgFmtMRC.sharedo index 1947299633,1947299633..3c85e279ea Binary files differ diff --cc hostdepend/I386LINUX/src/Tools/Integration/Display2/src/I386LINUX/Display2 index 8c0bf9b98f,d117a90fc5..914d269151 Binary files differ diff --cc hostdepend/I386LINUX/src/Tools/Integration/StereoDisplay/src/I386LINUX/.Depend index e69de29bb2,e69de29bb2..5b34271127 --- a/hostdepend/I386LINUX/src/Tools/Integration/StereoDisplay/src/I386LINUX/.Depend +++ b/hostdepend/I386LINUX/src/Tools/Integration/StereoDisplay/src/I386LINUX/.Depend @@@ -1,0 -1,0 +1,96 @@@ ++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-32.h \ ++ /usr/lib/gcc/i686-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/lib/gcc/i686-redhat-linux/4.4.7/include/stdarg.h \ ++ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ ++ /usr/include/stdlib.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/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 \ ++ /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 ../inc/config.h \ ++ ../inc/../inc/StereoDisplay.h /home/eos/Eos/include/genUtil.h \ ++ /usr/include/values.h \ ++ /usr/lib/gcc/i686-redhat-linux/4.4.7/include/limits.h \ ++ /usr/lib/gcc/i686-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/i686-redhat-linux/4.4.7/include/float.h \ ++ /home/eos/Eos/include/String.h /home/eos/Eos/include/File.h \ ++ /home/eos/Eos/include/Memory.h ++StereoDisplay.o: StereoDisplay.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-32.h \ ++ /usr/lib/gcc/i686-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/lib/gcc/i686-redhat-linux/4.4.7/include/stdarg.h \ ++ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ ++ /usr/include/stdlib.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/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 \ ++ /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/GL/gl.h \ ++ /usr/include/GL/glext.h /usr/include/inttypes.h /usr/include/stdint.h \ ++ /usr/include/bits/wchar.h /usr/include/GL/glu.h /usr/include/GL/glut.h \ ++ /usr/include/GL/freeglut_std.h ../inc/config.h \ ++ ../inc/../inc/StereoDisplay.h /home/eos/Eos/include/genUtil.h \ ++ /usr/include/values.h \ ++ /usr/lib/gcc/i686-redhat-linux/4.4.7/include/limits.h \ ++ /usr/lib/gcc/i686-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/i686-redhat-linux/4.4.7/include/float.h \ ++ /home/eos/Eos/include/Memory.h /home/eos/Eos/include/File.h \ ++ /home/eos/Eos/include/String.h /home/eos/Eos/include/tgaFile.h ++usage.o: usage.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-32.h \ ++ /usr/lib/gcc/i686-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/lib/gcc/i686-redhat-linux/4.4.7/include/stdarg.h \ ++ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ ++ /usr/include/stdlib.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/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/config.h \ ++ ../inc/../inc/StereoDisplay.h ++util.o: util.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-32.h \ ++ /usr/lib/gcc/i686-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/lib/gcc/i686-redhat-linux/4.4.7/include/stdarg.h \ ++ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ ++ /usr/include/stdlib.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/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/config.h \ ++ ../inc/../inc/StereoDisplay.h diff --cc hostdepend/I386LINUX/src/Tools/Integration/StereoDisplay/src/I386LINUX/StereoDisplay index 0000000000,0000000000..335ac37bb7 new file mode 100755 Binary files differ diff --cc hostdepend/I386LINUX/src/Tools/Integration/ctfDisplay/src/I386LINUX/ctfDisplay index 924bf60b73,eaddbc475d..3a88799a84 Binary files differ diff --cc hostdepend/I386LINUX/src/Tools/Integration/imagesView/src/I386LINUX/imagesView index 3cb518f7f7,e01822082d..a5e7e5be80 Binary files differ diff --cc src/Objects/DataExpress/TclTk/src/tkImgFmtMRC.c index 8da33295d4,8da33295d4..f57f790c7c --- a/src/Objects/DataExpress/TclTk/src/tkImgFmtMRC.c +++ b/src/Objects/DataExpress/TclTk/src/tkImgFmtMRC.c @@@ -85,11 -85,11 +85,12 @@@ tkMRCFileMatch(f, fileName, format, wid "-index", NULL }; static int flagInitial = 0; -- extern char* strdup(const char*); ++/* ++ extern char* strdup(const char*); extern size_t strlen(const char*); extern int strcmp(const char*, const char*); extern int strncmp(const char*, const char*, size_t); -- ++*/ /* If first call */ if(0==flagInitial) { __tkmrcInfo.fileName = strdup(fileName); diff --cc src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c index 9e94340146,4f6abb4a5a..27552d8547 --- a/src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c +++ b/src/Objects/DataExpress/eosRuby/src/Swig/molvieRuby_wrap.c @@@ -2059,7 -2058,7 +2059,11 @@@ SWIG_AsVal_double (VALUE obj, double *v } ++<<<<<<< HEAD +/*@SWIG:/usr/share/swig/1.3.40/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/ ++======= + /*@SWIG:/sw/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ ++>>>>>>> FETCH_HEAD SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args) { VALUE obj = args[0]; @@@ -2301,11 -2294,11 +2305,19 @@@ SWIG_From_char (char c return SWIG_FromCharPtrAndSize(&c,1); } ++<<<<<<< HEAD +swig_class SwigClassEulerAngleInfo; + +SWIGINTERN VALUE +_wrap_EulerAngleInfo_EAMode_set(int argc, VALUE *argv, VALUE self) { + EulerAngleInfo *arg1 = (EulerAngleInfo *) 0 ; ++======= + static swig_class SwigClassEulerAngleInfo; + + SWIGINTERN VALUE + _wrap_EulerAngleInfo_EAMode_set(int argc, VALUE *argv, VALUE self) { + struct EulerAngleInfo *arg1 = (struct EulerAngleInfo *) 0 ; ++>>>>>>> FETCH_HEAD char *arg2 ; void *argp1 = 0 ; int res1 = 0 ; @@@ -2317,9 -2310,9 +2329,15 @@@ } res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_EulerAngleInfo, 0 | 0 ); if (!SWIG_IsOK(res1)) { ++<<<<<<< HEAD + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EulerAngleInfo *","EAMode", 1, self )); + } + arg1 = (EulerAngleInfo *)(argp1); ++======= + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct EulerAngleInfo *","EAMode", 1, self )); + } + arg1 = (struct EulerAngleInfo *)(argp1); ++>>>>>>> FETCH_HEAD res2 = SWIG_AsCharArray(argv[0], temp2, 5); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char [5]","EAMode", 2, argv[0] )); @@@ -2335,7 -2328,7 +2353,11 @@@ fail SWIGINTERN VALUE _wrap_EulerAngleInfo_EAMode_get(int argc, VALUE *argv, VALUE self) { ++<<<<<<< HEAD + EulerAngleInfo *arg1 = (EulerAngleInfo *) 0 ; ++======= + struct EulerAngleInfo *arg1 = (struct EulerAngleInfo *) 0 ; ++>>>>>>> FETCH_HEAD void *argp1 = 0 ; int res1 = 0 ; char *result = 0 ; @@@ -2346,9 -2339,9 +2368,15 @@@ } res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_EulerAngleInfo, 0 | 0 ); if (!SWIG_IsOK(res1)) { ++<<<<<<< HEAD + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EulerAngleInfo *","EAMode", 1, self )); + } + arg1 = (EulerAngleInfo *)(argp1); ++======= + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct EulerAngleInfo *","EAMode", 1, self )); + } + arg1 = (struct EulerAngleInfo *)(argp1); ++>>>>>>> FETCH_HEAD result = (char *)(char *) ((arg1)->EAMode); { size_t size = 5; @@@ -2365,7 -2358,7 +2393,11 @@@ fail SWIGINTERN VALUE _wrap_EulerAngleInfo_Rot1_set(int argc, VALUE *argv, VALUE self) { ++<<<<<<< HEAD + EulerAngleInfo *arg1 = (EulerAngleInfo *) 0 ; ++======= + struct EulerAngleInfo *arg1 = (struct EulerAngleInfo *) 0 ; ++>>>>>>> FETCH_HEAD double arg2 ; void *argp1 = 0 ; int res1 = 0 ; @@@ -2377,9 -2370,9 +2409,15 @@@ } res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_EulerAngleInfo, 0 | 0 ); if (!SWIG_IsOK(res1)) { ++<<<<<<< HEAD + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EulerAngleInfo *","Rot1", 1, self )); + } + arg1 = (EulerAngleInfo *)(argp1); ++======= + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct EulerAngleInfo *","Rot1", 1, self )); + } + arg1 = (struct EulerAngleInfo *)(argp1); ++>>>>>>> FETCH_HEAD ecode2 = SWIG_AsVal_double(argv[0], &val2); if (!SWIG_IsOK(ecode2)) { SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "double","Rot1", 2, argv[0] )); @@@ -2394,7 -2387,7 +2432,11 @@@ fail SWIGINTERN VALUE _wrap_EulerAngleInfo_Rot1_get(int argc, VALUE *argv, VALUE self) { ++<<<<<<< HEAD + EulerAngleInfo *arg1 = (EulerAngleInfo *) 0 ; ++======= + struct EulerAngleInfo *arg1 = (struct EulerAngleInfo *) 0 ; ++>>>>>>> FETCH_HEAD void *argp1 = 0 ; int res1 = 0 ; double result; @@@ -2405,9 -2398,9 +2447,15 @@@ } res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_EulerAngleInfo, 0 | 0 ); if (!SWIG_IsOK(res1)) { ++<<<<<<< HEAD + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EulerAngleInfo *","Rot1", 1, self )); + } + arg1 = (EulerAngleInfo *)(argp1); ++======= + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct EulerAngleInfo *","Rot1", 1, self )); + } + arg1 = (struct EulerAngleInfo *)(argp1); ++>>>>>>> FETCH_HEAD result = (double) ((arg1)->Rot1); vresult = SWIG_From_double((double)(result)); return vresult; @@@ -2418,7 -2411,7 +2466,11 @@@ fail SWIGINTERN VALUE _wrap_EulerAngleInfo_Rot2_set(int argc, VALUE *argv, VALUE self) { ++<<<<<<< HEAD + EulerAngleInfo *arg1 = (EulerAngleInfo *) 0 ; ++======= + struct EulerAngleInfo *arg1 = (struct EulerAngleInfo *) 0 ; ++>>>>>>> FETCH_HEAD double arg2 ; void *argp1 = 0 ; int res1 = 0 ; @@@ -2430,9 -2423,9 +2482,15 @@@ } res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_EulerAngleInfo, 0 | 0 ); if (!SWIG_IsOK(res1)) { ++<<<<<<< HEAD + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EulerAngleInfo *","Rot2", 1, self )); + } + arg1 = (EulerAngleInfo *)(argp1); ++======= + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct EulerAngleInfo *","Rot2", 1, self )); + } + arg1 = (struct EulerAngleInfo *)(argp1); ++>>>>>>> FETCH_HEAD ecode2 = SWIG_AsVal_double(argv[0], &val2); if (!SWIG_IsOK(ecode2)) { SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "double","Rot2", 2, argv[0] )); @@@ -2447,7 -2440,7 +2505,11 @@@ fail SWIGINTERN VALUE _wrap_EulerAngleInfo_Rot2_get(int argc, VALUE *argv, VALUE self) { ++<<<<<<< HEAD + EulerAngleInfo *arg1 = (EulerAngleInfo *) 0 ; ++======= + struct EulerAngleInfo *arg1 = (struct EulerAngleInfo *) 0 ; ++>>>>>>> FETCH_HEAD void *argp1 = 0 ; int res1 = 0 ; double result; @@@ -2458,9 -2451,9 +2520,15 @@@ } res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_EulerAngleInfo, 0 | 0 ); if (!SWIG_IsOK(res1)) { ++<<<<<<< HEAD + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EulerAngleInfo *","Rot2", 1, self )); + } + arg1 = (EulerAngleInfo *)(argp1); ++======= + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct EulerAngleInfo *","Rot2", 1, self )); + } + arg1 = (struct EulerAngleInfo *)(argp1); ++>>>>>>> FETCH_HEAD result = (double) ((arg1)->Rot2); vresult = SWIG_From_double((double)(result)); return vresult; @@@ -2471,7 -2464,7 +2539,11 @@@ fail SWIGINTERN VALUE _wrap_EulerAngleInfo_Rot3_set(int argc, VALUE *argv, VALUE self) { ++<<<<<<< HEAD + EulerAngleInfo *arg1 = (EulerAngleInfo *) 0 ; ++======= + struct EulerAngleInfo *arg1 = (struct EulerAngleInfo *) 0 ; ++>>>>>>> FETCH_HEAD double arg2 ; void *argp1 = 0 ; int res1 = 0 ; @@@ -2483,9 -2476,9 +2555,15 @@@ } res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_EulerAngleInfo, 0 | 0 ); if (!SWIG_IsOK(res1)) { ++<<<<<<< HEAD + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EulerAngleInfo *","Rot3", 1, self )); + } + arg1 = (EulerAngleInfo *)(argp1); ++======= + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct EulerAngleInfo *","Rot3", 1, self )); + } + arg1 = (struct EulerAngleInfo *)(argp1); ++>>>>>>> FETCH_HEAD ecode2 = SWIG_AsVal_double(argv[0], &val2); if (!SWIG_IsOK(ecode2)) { SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "double","Rot3", 2, argv[0] )); @@@ -2500,7 -2493,7 +2578,11 @@@ fail SWIGINTERN VALUE _wrap_EulerAngleInfo_Rot3_get(int argc, VALUE *argv, VALUE self) { ++<<<<<<< HEAD + EulerAngleInfo *arg1 = (EulerAngleInfo *) 0 ; ++======= + struct EulerAngleInfo *arg1 = (struct EulerAngleInfo *) 0 ; ++>>>>>>> FETCH_HEAD void *argp1 = 0 ; int res1 = 0 ; double result; @@@ -2511,9 -2504,9 +2593,15 @@@ } res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_EulerAngleInfo, 0 | 0 ); if (!SWIG_IsOK(res1)) { ++<<<<<<< HEAD + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EulerAngleInfo *","Rot3", 1, self )); + } + arg1 = (EulerAngleInfo *)(argp1); ++======= + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct EulerAngleInfo *","Rot3", 1, self )); + } + arg1 = (struct EulerAngleInfo *)(argp1); ++>>>>>>> FETCH_HEAD result = (double) ((arg1)->Rot3); vresult = SWIG_From_double((double)(result)); return vresult; @@@ -2541,12 -2534,12 +2629,20 @@@ _wrap_EulerAngleInfo_allocate(VALUE sel SWIGINTERN VALUE _wrap_new_EulerAngleInfo(int argc, VALUE *argv, VALUE self) { ++<<<<<<< HEAD + EulerAngleInfo *result = 0 ; ++======= + struct EulerAngleInfo *result = 0 ; ++>>>>>>> FETCH_HEAD if ((argc < 0) || (argc > 0)) { rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; } ++<<<<<<< HEAD + result = (EulerAngleInfo *)calloc(1, sizeof(EulerAngleInfo)); ++======= + result = (struct EulerAngleInfo *)calloc(1, sizeof(struct EulerAngleInfo)); ++>>>>>>> FETCH_HEAD DATA_PTR(self) = result; return self; fail: @@@ -2555,7 -2548,7 +2651,11 @@@ SWIGINTERN void ++<<<<<<< HEAD +free_EulerAngleInfo(EulerAngleInfo *arg1) { ++======= + free_EulerAngleInfo(struct EulerAngleInfo *arg1) { ++>>>>>>> FETCH_HEAD free((char *) arg1); } diff --cc src/Objects/DataManip/mrcImage/src/.CHeader index ab504c7954,9bee562ce0..71ed2aa49a --- a/src/Objects/DataManip/mrcImage/src/.CHeader +++ b/src/Objects/DataManip/mrcImage/src/.CHeader @@@ -20,10 -23,9 +21,11 @@@ lmrcImageContourSurface.h lmrcImageContraction.h \ lmrcImageCorrelation.h \ lmrcImageCrystalCreate.h \ +lmrcImageCTFCompensation.h \ +lmrcImageCTFDetermination.h \ lmrcImageDataMaxAndMinGetByImage.h \ lmrcImageDataStraightCopy.h \ + lmrcImageDeconvolution.h \ lmrcImageDensity.h \ lmrcImageDensityInverse.h \ lmrcImageDensityNormalizationByImage.h \ diff --cc src/Tools/Config/Define.inc index cb37ca086c,5ee4e393e4..55209653e6 --- a/src/Tools/Config/Define.inc +++ b/src/Tools/Config/Define.inc @@@ -40,6 -40,21 +40,17 @@@ WORLDNAME=Tool WORLDNAME=Tools WORLDNAME=Tools WORLDNAME=Tools + WORLDNAME=Tools + WORLDNAME=Tools + WORLDNAME=Tools + WORLDNAME=Tools + WORLDNAME=Tools + WORLDNAME=Tools + WORLDNAME=Tools + WORLDNAME=Tools + WORLDNAME=Tools + WORLDNAME=Tools + WORLDNAME=Tools -WORLDNAME=Tools -WORLDNAME=Tools -WORLDNAME=Tools -WORLDNAME=Tools WORLDNAME=Tools WORLDNAME=Tools WORLDNAME=Tools diff --cc src/Tools/Integration/Display2/src/Display2.html index b4e11a4e21,04b17628cf..80910d7f14 --- a/src/Tools/Integration/Display2/src/Display2.html +++ b/src/Tools/Integration/Display2/src/Display2.html @@@ -9,7 -9,7 +9,11 @@@ Usage: Display2 Options: [-i[nput] In (NULL )] :Optional :InputDataFile ++<<<<<<< HEAD + [-t[epmlate] Template (85.roi )] :Optional :Template for InputFile ++======= + [-t[epmlate] Template (2100635408.roi )] :Optional :Template for InputFile ++>>>>>>> FETCH_HEAD [-H[ighForThres] ThresHigh (0.0 )] :Optional :Template for InputFile [-L[owForThres] ThresLow (0.0 )] :Optional :Template for InputFile [-Zoom Zoom (1.0 )] :Optional :Zoom for InputFile diff --cc src/Tools/Integration/StereoDisplay/src/StereoDisplay.c index 0000000000,0000000000..3cbba8fb17 new file mode 100755 --- /dev/null +++ b/src/Tools/Integration/StereoDisplay/src/StereoDisplay.c @@@ -1,0 -1,0 +1,323 @@@ ++/* ++# StereoDisplay : $Revision$ ++# $Date$ ++# Created by $Author$ ++# Usage : StereoDisplay ++# Attention ++# $Loccker$ ++# $State$ ++# ++*/ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#define GLOBAL_DECLARATION ++#include "../inc/config.h" ++ ++#define DEBUG ++#include "genUtil.h" ++#include "Memory.h" ++#include "File.h" ++#include "String.h" ++#include "tgaFile.h" ++ ++ ++typedef struct lStereoDisplayInfo { ++ int DoubleBuffer; ++ ++ int ImageNum; ++ int curImageNum; ++ ++ int offsetx; ++ int offsety; ++ ++ int winWidth; ++ int winHeight; ++} lStereoDisplayInfo; ++ ++static lStereoDisplayInfo disp = {1, 0, 0, 0, 0, 1024, 600} ; ++ ++typedef struct StereoDisplayImage StereoDisplayImage; ++struct StereoDisplayImage { ++ int Width; ++ int Height; ++ GLubyte* Left; ++ GLubyte* Right; ++ StereoDisplayImage* next; ++ StereoDisplayImage* prev; ++}; ++ ++typedef struct lStereoDisplayImageList { ++ StereoDisplayImage* Image; ++ StereoDisplayImage* Top; ++} StereoDisplayImageList; ++ ++static StereoDisplayImageList Image = {NULL,NULL}; ++ ++extern void keyboard(unsigned char c, int x, int y); ++extern void resize(int w, int h); ++ ++void ++resize(int w, int h) ++{ ++ disp.winWidth = w; ++ disp.winHeight = h; ++ glutPostRedisplay(); ++} ++ ++StereoDisplayImageList* ++StereoDisplayImageAlloc(StereoDisplayImageList* Image, int mode) ++{ ++ Image->Image->Left = (GLubyte*)memoryAllocate(sizeof(GLubyte)*3*Image->Image->Width*Image->Image->Height, "in StereoImageAlloc"); ++ Image->Image->Right = (GLubyte*)memoryAllocate(sizeof(GLubyte)*3*Image->Image->Width*Image->Image->Height, "in StereoImageAlloc"); ++ return Image; ++} ++ ++StereoDisplayImageList* ++StereoDisplayImageRead(StereoDisplayImageList* Image, FILE* inl, FILE* inr, int mode) ++{ ++ int i, j, dstk, srck, I, J; ++ tgaFile tgal; ++ tgaFile tgar; ++ ++ tgaFileInit(&tgal, NULL, 0); ++ tgaFileInit(&tgar, NULL, 0); ++ ++ tgaFileRead(&tgal, inl, 0); ++ tgaFileRead(&tgar, inr, 0); ++ ++#ifdef DEBUG ++ tgaFileHeaderPrint(&tgal, stderr, 0); ++ tgaFileHeaderPrint(&tgar, stderr, 0); ++#endif ++ ++ if(NULL==Image->Top) { ++ Image->Image = (StereoDisplayImage*)memoryAllocate(sizeof(StereoDisplayImage), "ImageRead"); ++ Image->Image->prev = Image->Top = Image->Image; ++ } else { ++ Image->Image->next = (StereoDisplayImage*)memoryAllocate(sizeof(StereoDisplayImage), "ImageRead"); ++ Image->Image->next->prev = Image->Image; ++ Image->Image = Image->Image->next; ++ } ++ Image->Image->next = Image->Top; ++ ++ if(tgal.Header.ImageSpec.Width != tgar.Header.ImageSpec.Width ++ ||tgal.Header.ImageSpec.Height != tgar.Header.ImageSpec.Height ++ ||tgal.Header.ImageSpec.Depth != tgar.Header.ImageSpec.Depth) { ++ fprintf(stderr, "Right Image is not the same in Size as Left one\n"); ++ fprintf(stderr, "Left: %d %d %d\n", ++ tgal.Header.ImageSpec.Width, tgal.Header.ImageSpec.Height, tgal.Header.ImageSpec.Depth); ++ fprintf(stderr, "Right: %d %d %d\n", ++ tgar.Header.ImageSpec.Width, tgar.Header.ImageSpec.Height, tgar.Header.ImageSpec.Depth); ++ exit(EXIT_FAILURE); ++ } else { ++ Image->Image->Width = tgal.Header.ImageSpec.Width; ++ Image->Image->Height = tgal.Header.ImageSpec.Height; ++ } ++ ++ StereoDisplayImageAlloc(Image, 0); ++ ++ for(i=0; iImage->Width ;i++){ ++ for(j=0; jImage->Height;j++){ ++ dstk = 3*(i+j*Image->Image->Width); ++ if(0x2&tgal.Header.ImageSpec.Descriptor.Bit.ImageOrigin) { ++ J = Image->Image->Height - 1 - j; ++ } else { ++ J = j; ++ } ++ if(0x1&tgal.Header.ImageSpec.Descriptor.Bit.ImageOrigin) { ++ I = Image->Image->Width - 1 - i; ++ } else { ++ I = i; ++ } ++ srck = tgal.Header.ImageSpec.Depth/8*(I+J*Image->Image->Width); ++ ++ Image->Image->Left [dstk+2] = tgal.Image[srck+0]; ++ Image->Image->Left [dstk+1] = tgal.Image[srck+1]; ++ Image->Image->Left [dstk+0] = tgal.Image[srck+2]; ++ Image->Image->Right[dstk+2] = tgar.Image[srck+0]; ++ Image->Image->Right[dstk+1] = tgar.Image[srck+1]; ++ Image->Image->Right[dstk+0] = tgar.Image[srck+2]; ++ } ++ } ++ return Image; ++} ++ ++void ++imageSet(FILE* inl, FILE* inr) ++{ ++ glClearColor(0.0,0.0,0.0,0.0); ++ StereoDisplayImageRead(&Image, inl, inr, 0); ++ glPixelStorei(GL_UNPACK_ALIGNMENT,1); ++} ++ ++void ++imageSetList(FILE* fpt, int num) ++{ ++ int i; ++ char s[STRING_MAX_LENGTH]; ++ char* left; ++ char* right; ++ FILE* fptLeft; ++ FILE* fptRight; ++ ++ glClearColor(0.0,0.0,0.0,0.0); ++ fseek(fpt, 0, SEEK_SET); ++ for(i=0; iprev = Image.Image; ++ Image.Image = Image.Top; ++ ++ glPixelStorei(GL_UNPACK_ALIGNMENT,1); ++} ++ ++void ++display(void) ++{ ++ if(!disp.DoubleBuffer){ ++ glClear(GL_COLOR_BUFFER_BIT); ++ glRasterPos2f(-1,-1); ++ glDrawPixels(Image.Image->Width,Image.Image->Height, ++ GL_RGB,GL_UNSIGNED_BYTE,Image.Image->Left); ++ glRasterPos2f(0,-1); ++ glDrawPixels(Image.Image->Width,Image.Image->Height, ++ GL_RGB,GL_UNSIGNED_BYTE,Image.Image->Right); ++ glFlush(); ++ } else{ ++ glDrawBuffer(GL_BACK); ++ glClear(GL_COLOR_BUFFER_BIT); ++ glDrawBuffer(GL_BACK_LEFT); ++ glPixelZoom(disp.winWidth/(float)Image.Image->Width, disp.winHeight/(float)Image.Image->Height); ++ glDrawPixels(Image.Image->Width,Image.Image->Height, ++ GL_RGB,GL_UNSIGNED_BYTE,Image.Image->Left); ++ glutSwapBuffers(); ++ glDrawBuffer(GL_BACK_RIGHT); ++ glPixelZoom(disp.winWidth/(float)Image.Image->Width, disp.winHeight/(float)Image.Image->Height); ++ glDrawPixels(Image.Image->Width,Image.Image->Height, ++ GL_RGB,GL_UNSIGNED_BYTE,Image.Image->Right); ++ glutSwapBuffers(); ++ } ++} ++ ++void ++DisplaySetting(int WindowX,int WindowY) ++{ ++ if(!disp.DoubleBuffer){ ++ glutInitDisplayMode(GLUT_SINGLE | GLUT_RGB); ++ glutInitWindowSize(disp.winWidth, disp.winHeight); ++ glutInitWindowPosition(WindowX-disp.offsetx, ++ WindowY-disp.offsety); ++ glutCreateWindow("StereoDisplay v1.03 NakedEyeMode"); ++ } else { ++ glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_STEREO); ++ glutInitWindowSize(disp.winWidth,disp.winHeight); ++ glutInitWindowPosition(WindowX-disp.offsetx, ++ WindowY-disp.offsety); ++ glutCreateWindow("StereoDisplay v1.03 CrystalEyeMode"); ++ } ++ ++} ++ ++void ++DisplayRecreate(lStereoDisplayInfo* disp) ++{ ++ int WindowY=0,WindowX=0; ++ ++ WindowX=glutGet(GLUT_WINDOW_X); ++ WindowY=glutGet(GLUT_WINDOW_Y); ++ glutDestroyWindow(glutGetWindow()); ++ DisplaySetting(WindowX,WindowY); ++ glutDisplayFunc(display); ++ glutKeyboardFunc(keyboard); ++} ++ ++void ++keyboard(unsigned char key,int x,int y) ++{ ++ switch(key) { ++ case 'q': ++ case 'Q': ++ exit(EXIT_FAILURE); ++ break; ++ case 'd': ++ disp.DoubleBuffer=1; ++ DisplayRecreate(&disp); ++ break; ++ case 's': ++ disp.DoubleBuffer=0; ++ DisplayRecreate(&disp); ++ break; ++ case 'j': ++ case 'l': ++ Image.Image = Image.Image->next; ++ //disp.curImageNum = (disp.curImageNum++)%disp.ImageNum; ++ break; ++ case 'h': ++ case 'k': ++ Image.Image = Image.Image->prev; ++ //disp.curImageNum = (disp.curImageNum--)%disp.ImageNum; ++ break; ++ ++ default: ++ break; ++ } ++ glutPostRedisplay(); ++} ++ ++int ++main(int argc, char* argv[]) ++{ ++ StereoDisplayInfo info; ++ ++ init0(&info); ++ argCheck(&info, argc, argv); ++ init1(&info); ++ ++ DEBUGPRINT("Program Start\n"); ++ glutInit(&argc,argv); ++ DisplaySetting(0,0); ++ ++ ++ disp.offsetx=glutGet(GLUT_WINDOW_X); ++ disp.offsety=glutGet(GLUT_WINDOW_Y); ++ ++ if(info.flagInl && info.flagInr) { ++ DEBUGPRINT2("Left %s Right %s\n", info.Inl, info.Inr); ++ imageSet(info.fptInl, info.fptInr); ++ } else if(info.flagIn) { ++ DEBUGPRINT2("%s %d\n", info.InList, info.flagIn); ++ imageSetList(info.fptInList, info.flagIn); ++ } else { ++ fprintf(stderr, "You need -ir/il or -I \n"); ++ usage(argv[0]); ++ } ++ glutReshapeFunc(resize); ++ glutDisplayFunc(display); ++ glutKeyboardFunc(keyboard); ++ ++ glutMainLoop(); ++ ++ return EXIT_SUCCESS; ++} ++ ++void ++additionalUsage() ++{ ++ fprintf(stderr, "----- Additional Usage -----\n"); ++ fprintf(stderr, ">>> -I for InFileList\n"); ++ fprintf(stderr, "Left1 Right1 \n"); ++ fprintf(stderr, "Left2 Right2 \n"); ++ fprintf(stderr, "..... \n"); ++} ++ diff --cc src/Tools/Integration/StereoDisplay/src/StereoDisplay.html index ac5c64ffb8,ac5c64ffb8..9f672fc04d --- a/src/Tools/Integration/StereoDisplay/src/StereoDisplay.html +++ b/src/Tools/Integration/StereoDisplay/src/StereoDisplay.html @@@ -1,1 -1,1 +1,24 @@@ --/bin/bash: StereoDisplay: No such file or directory ++ ++ ++StereoDisplay ++ ++ ++

StereoDisplay

++

Usage

++
++Usage: StereoDisplay
++Options:
++    [-il[nputl]          Inl                 (NULL      )] :Optional  :Input: Left
++    [-ir[nputr]          Inr                 (NULL      )] :Optional  :Input: Right
++    [-I[nputFileList]    In                  (NULL      )] :Optional  :Input: Left Right
++    [-o[utput]           Out                 (NULL      )] :Optional  :OutputDataFile
++    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile
++    [-m[ode]             mode                (0         )] :Optional  :Mode
++----- Additional Usage -----
++>>> -I for InFileList
++Left1 Right1 
++Left2 Right2 
++..... 
++
++ ++ diff --cc src/Tools/Integration/StereoDisplay/src/argCheck.c index 0000000000,0000000000..ead7997cc3 new file mode 100755 --- /dev/null +++ b/src/Tools/Integration/StereoDisplay/src/argCheck.c @@@ -1,0 -1,0 +1,118 @@@ ++#include ++#include ++#include ++#include ++#include "../inc/config.h" ++#include "genUtil.h" ++#include "String.h" ++#include "File.h" ++#include "Memory.h" ++ ++ ++void ++argCheck(StereoDisplayInfo* info, int argc, char* argv[]) ++{ ++ long i, j, nv; ++ char s[1024]; ++ FILE* fpt; ++ ++ if(NULL==(fpt=fopen(".EosLog", "a+"))) { ++ ++ } else { ++ for(i=0; iInl = stringGetNthWord(argv[i+1], 1, " ,"); ++ i++; ++ info->flagInl++; ++ } else { ++ usage(argv[0]); ++ exit(EXIT_FAILURE); ++ } ++ SBREAK; ++ } ++ SCASE("ir") { ++ if(i+1Inr = stringGetNthWord(argv[i+1], 1, " ,"); ++ i++; ++ info->flagInr++; ++ } else { ++ usage(argv[0]); ++ exit(EXIT_FAILURE); ++ } ++ SBREAK; ++ } ++ SCASE("I") { ++ if(i+1InList = stringGetNthWord(argv[i+1], 1, " ,"); ++ i++; ++ info->flagIn++; ++ } else { ++ usage(argv[0]); ++ exit(EXIT_FAILURE); ++ } ++ SBREAK; ++ } ++ SCASE("o") { ++ if(i+1Out = stringGetNthWord(argv[i+1], 1, " ,"); ++ i++; ++ info->flagOut++; ++ } else { ++ usage(argv[0]); ++ exit(EXIT_FAILURE); ++ } ++ SBREAK; ++ } ++ SCASE("c") { ++ if(i+1configFile = stringGetNthWord(argv[i+1], 1, " ,"); ++ i++; ++ info->flagconfigFile++; ++ } else { ++ usage(argv[0]); ++ exit(EXIT_FAILURE); ++ } ++ SBREAK; ++ } ++ SCASE("m") { ++ if(i+1mode = stringGetNthIntegerData(argv[i+1], 1, " ,"); ++ i++; ++ info->flagmode++; ++ } else { ++ usage(argv[0]); ++ exit(EXIT_FAILURE); ++ } ++ SBREAK; ++ } ++ SCASE("h") { ++ usage(argv[0]); ++ exit(EXIT_SUCCESS); ++ break; ++ } ++ SCASE("html") { ++ htmlBeforeUsage(argv[0]); ++ usage(argv[0]); ++ htmlAfterUsage(argv[0]); ++ exit(EXIT_SUCCESS); ++ break; ++ } ++ SDEFAULT { ++ fprintf(stderr, "Not Supported Options: :%s\n", argv[i]); ++ usage(argv[0]); ++ exit(EXIT_FAILURE); ++ break; ++ } ++ SSWITCHEND; ++ } ++ } ++} diff --cc src/Tools/Integration/StereoDisplay/src/init.c index 0000000000,0000000000..15cb702629 new file mode 100755 --- /dev/null +++ b/src/Tools/Integration/StereoDisplay/src/init.c @@@ -1,0 -1,0 +1,106 @@@ ++#include ++#include ++#include ++#include ++#include "../inc/config.h" ++#include "genUtil.h" ++#include "String.h" ++#include "File.h" ++#include "Memory.h" ++ ++ ++void ++init0(StereoDisplayInfo* info) ++{ ++ info->fptInl = NULL; info->flagInl = 0; ++ info->fptInr = NULL; info->flagInr = 0; ++ info->fptIn = NULL; info->fptInList = NULL; info->flagIn = 0; ++ info->fptOut = NULL; info->flagOut = 0; ++ info->fptconfigFile = NULL; info->flagconfigFile = 0; ++ info->mode = 0; info->flagmode = 0; ++} ++ ++void ++init1(StereoDisplayInfo* info) ++{ ++ char s[1024]; ++ int i; ++ if(info->flagInl) { ++ info->fptInl = fileOpen(info->Inl, "r"); ++ } ++ ++ if(info->flagInr) { ++ info->fptInr = fileOpen(info->Inr, "r"); ++ } ++ ++ if(info->flagIn) { ++ info->fptInList = fileOpen(info->InList, "r"); ++ fseek(info->fptInList, 0L, SEEK_SET); ++ i=0; ++ while(NULL!=stringGetFromFile(s, "", info->fptInList, stdout, 1)) { ++ i++; ++ } ++ info->fptIn = (FILE**)memoryAllocate(i*sizeof(FILE*), "in init1"); ++ info->In = (char**)memoryAllocate(i*sizeof(char*), "in init1"); ++ info->flagIn = i; ++ fseek(info->fptInList, 0L, SEEK_SET); ++ i=0; ++ while(NULL!=stringGetFromFile(s, "", info->fptInList, stdout, 1)) { ++ info->In[i] = stringGetNthWord(s, 1, " ,"); ++ info->fptIn[i] = fileOpen(info->In[i],"r"); ++ i++; ++ } ++ } ++ ++ if(info->flagOut) { ++ info->fptOut = fileOpen(info->Out, "w"); ++ } ++ ++ if(info->flagconfigFile) { ++ info->fptconfigFile = fileOpen(info->configFile, "r"); ++ } ++ ++ if(info->flagmode) { ++ } ++ ++} ++#ifdef KHOROS ++#include ++#include "bootstrap.h" ++#include "dataserv.h" ++#include "datamanip.h" ++extern void func_usage_additions(void); ++extern void func_free_args(kexit_status status, kaddr client_data); ++extern void func_get_args(kform* pane); ++ ++void ++func_usage_additions(void) ++{ ++} ++void ++func_free_args(kexit_status status, kaddr client_data) ++{ ++} ++void ++func_get_args(kform* pane) ++{ ++} ++void ++khorosInit(int argc, char* argv[]) ++{ ++ char* eospath; ++ char panepath[1024]; ++ FILE* fpt; ++ ++ eospath = getenv("EOS_HOME"); ++ sprintf(panepath, "%s/src/Tools/Integration/StereoDisplay/src/StereoDisplay.pane", eospath); ++ khoros_initialize(argc, argv, "EOS"); ++ fpt = fopen(panepath, "r"); if(NULL!=fpt) { ++ fclose(fpt); ++ kclui_initialize(panepath, KGEN_NONE, "EOS", "StereoDisplay", ++ func_usage_additions, ++ func_get_args, ++ func_free_args); ++ } ++} ++#endif /* KHOROS */ diff --cc src/Tools/Integration/StereoDisplay/src/usage.c index 0000000000,0000000000..e6b2026530 new file mode 100755 --- /dev/null +++ b/src/Tools/Integration/StereoDisplay/src/usage.c @@@ -1,0 -1,0 +1,38 @@@ ++#include ++#include ++#include "../inc/config.h" ++ ++void ++usage(char* thisProgram) ++{ ++ fprintf(stderr, "Usage: %s\n", thisProgram); ++ fprintf(stderr, "Options:\n"); ++ fprintf(stderr, " [-il[nputl] Inl (NULL )] :Optional :Input: Left\n"); ++ fprintf(stderr, " [-ir[nputr] Inr (NULL )] :Optional :Input: Right\n"); ++ fprintf(stderr, " [-I[nputFileList] In (NULL )] :Optional :Input: Left Right\n"); ++ fprintf(stderr, " [-o[utput] Out (NULL )] :Optional :OutputDataFile\n"); ++ fprintf(stderr, " [-c[onfig] configFile (NULL )] :Optional :ConfigurationFile\n"); ++ fprintf(stderr, " [-m[ode] mode (0 )] :Optional :Mode\n"); ++ additionalUsage(); ++} ++ ++void ++htmlBeforeUsage(char* thisProgram) ++{ ++ fprintf(stderr, "\n"); ++ fprintf(stderr, "\n"); ++ fprintf(stderr, "%s\n", thisProgram); ++ fprintf(stderr, "\n"); ++ fprintf(stderr, "\n"); ++ fprintf(stderr, "

%s

\n", thisProgram); ++ fprintf(stderr, "

Usage

\n"); ++ fprintf(stderr, "
\n");
++}
++
++void
++htmlAfterUsage(char* thisProgram)
++{
++    fprintf(stderr, "
\n"); ++ fprintf(stderr, "\n"); ++ fprintf(stderr, "\n"); ++} diff --cc src/Tools/Integration/StereoDisplay/src/util.c index 0000000000,0000000000..ee5e5f2324 new file mode 100755 --- /dev/null +++ b/src/Tools/Integration/StereoDisplay/src/util.c @@@ -1,0 -1,0 +1,4 @@@ ++#include ++#include ++#include "../inc/config.h" ++ diff --cc src/Tools/eosPoint/Config/Target.inc~FETCH_HEAD index 0000000000,e69de29bb2..e69de29bb2 mode 000000,100755..100755 --- a/src/Tools/eosPoint/Config/Target.inc~FETCH_HEAD +++ b/src/Tools/eosPoint/Config/Target.inc~FETCH_HEAD diff --cc src/Tools/mrcImage/.Source index ad61383949,82b1895621..65216f3aca --- a/src/Tools/mrcImage/.Source +++ b/src/Tools/mrcImage/.Source @@@ -74,15 -81,10 +75,16 @@@ mrcImageCorrelationInFourierSpace mrcImageCorrelationServer \ mrcImageCorrelationWithCTFCompensation \ mrcImageCrystalCreate \ +mrcImageCTFCompensation \ +mrcImageCTFCompensationForTiltImage \ +mrcImageCTFDetermination \ +mrcImageCTFObservation \ +mrcImageCTFSN \ mrcImageCutAndSetInArray \ +mrcImageCVE \ mrcImageCylinderSection \ mrcImageDeadPixelCorrection \ + mrcImageDeconvolution \ mrcImageDensityChangeEstimation \ mrcImageDensityInfo \ mrcImageDensityNormalization \ diff --cc src/Tools/mrcImage/.Source.org index ad61383949,21c3ba4717..84b53cb809 --- a/src/Tools/mrcImage/.Source.org +++ b/src/Tools/mrcImage/.Source.org @@@ -74,15 -80,10 +74,16 @@@ mrcImageCorrelationInFourierSpace mrcImageCorrelationServer \ mrcImageCorrelationWithCTFCompensation \ mrcImageCrystalCreate \ +mrcImageCTFCompensation \ +mrcImageCTFCompensationForTiltImage \ +mrcImageCTFDetermination \ +mrcImageCTFObservation \ +mrcImageCTFSN \ mrcImageCutAndSetInArray \ +mrcImageCVE \ mrcImageCylinderSection \ mrcImageDeadPixelCorrection \ + mrcImageDeconvolution \ mrcImageDensityChangeEstimation \ mrcImageDensityInfo \ mrcImageDensityNormalization \ diff --cc src/Tools/mrcImage/mrc2hdf/src/ALPHALINUX5~HEAD index 0000000000,0000000000..cd9db2514e new file mode 120000 --- /dev/null +++ b/src/Tools/mrcImage/mrc2hdf/src/ALPHALINUX5~HEAD @@@ -1,0 -1,0 +1,1 @@@ ++../../../../../hostdepend/ALPHALINUX5/src/Tools/mrcImage/mrc2hdf/src/ALPHALINUX5 diff --cc src/Tools/mrcImage/mrc2hdf/src/ALPHALINUX~HEAD index 0000000000,0000000000..24e11270b3 new file mode 120000 --- /dev/null +++ b/src/Tools/mrcImage/mrc2hdf/src/ALPHALINUX~HEAD @@@ -1,0 -1,0 +1,1 @@@ ++../../../../../hostdepend/ALPHALINUX/src/Tools/mrcImage/mrc2hdf/src/ALPHALINUX diff --cc src/Tools/mrcImage/mrc2hdf/src/ALPHAOSF1~HEAD index 0000000000,0000000000..8ce30a6293 new file mode 120000 --- /dev/null +++ b/src/Tools/mrcImage/mrc2hdf/src/ALPHAOSF1~HEAD @@@ -1,0 -1,0 +1,1 @@@ ++../../../../../hostdepend/ALPHAOSF1/src/Tools/mrcImage/mrc2hdf/src/ALPHAOSF1 diff --cc src/Tools/mrcImage/mrc2hdf/src/ALPHA~HEAD index 0000000000,0000000000..24701230a8 new file mode 120000 --- /dev/null +++ b/src/Tools/mrcImage/mrc2hdf/src/ALPHA~HEAD @@@ -1,0 -1,0 +1,1 @@@ ++../../../../../hostdepend/ALPHA/src/Tools/mrcImage/mrc2hdf/src/ALPHA diff --cc src/Tools/mrcImage/mrc2hdf/src/HP~HEAD index 0000000000,0000000000..d23117db51 new file mode 120000 --- /dev/null +++ b/src/Tools/mrcImage/mrc2hdf/src/HP~HEAD @@@ -1,0 -1,0 +1,1 @@@ ++../../../../../hostdepend/HP/src/Tools/mrcImage/mrc2hdf/src/HP diff --cc src/Tools/mrcImage/mrc2hdf/src/I386LINUX index 2cdef77d69,0000000000..4ac397f8b4 mode 120000,000000..120000 --- a/src/Tools/mrcImage/mrc2hdf/src/I386LINUX +++ b/src/Tools/mrcImage/mrc2hdf/src/I386LINUX @@@ -1,1 -1,0 +1,1 @@@ - ../../../../../hostdepend/I386LINUX/src/Tools/mrcImage/mrc2hdf/src/I386LINUX ++../../../../../hostdepend/I386LINUX/src/Tools/mrcImage/mrc2hdf/src/I386LINUX/ diff --cc src/Tools/mrcImage/mrc2hdf/src/I386LINUX~HEAD index 0000000000,0000000000..2cdef77d69 new file mode 120000 --- /dev/null +++ b/src/Tools/mrcImage/mrc2hdf/src/I386LINUX~HEAD @@@ -1,0 -1,0 +1,1 @@@ ++../../../../../hostdepend/I386LINUX/src/Tools/mrcImage/mrc2hdf/src/I386LINUX diff --cc src/Tools/mrcImage/mrc2hdf/src/SGI~HEAD index 0000000000,0000000000..0f09cdc526 new file mode 120000 --- /dev/null +++ b/src/Tools/mrcImage/mrc2hdf/src/SGI~HEAD @@@ -1,0 -1,0 +1,1 @@@ ++../../../../../hostdepend/SGI/src/Tools/mrcImage/mrc2hdf/src/SGI diff --cc src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html index 0e610af3cb,63f639e2ee..88d87cb8f7 mode 100755,100755..100644 --- a/src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html +++ b/src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html @@@ -10,7 -10,7 +10,7 @@@ Usage: mrcImageDensityInf Options: [-i[nput] In (NULL )] :Essential :InputDataFile [-o[utput] Out (stdout )] :Optional :OutputDataFile - [-C[ontour] Contour (10 )] :Optional :ContourLevel: 10 8.315236e-308ach - [-C[ontour] Contour (10 )] :Optional :ContourLevel: 10 6.953247e-310ach ++ [-C[ontour] Contour (10 )] :Optional :ContourLevel: 10 2.901940e-307ach [-log Log (NULL )] :Optional :OutputDataFile [-c[onfig] configFile (NULL )] :Optional :ConfigurationFile [-m[ode] mode (0 )] :Optional :Mode diff --cc src/Tools/mrcImage/mrcImageSplit/src/mrcImageSplit.html index 97d174d186,53578ce135..97d174d186 mode 100755,100755..100644 --- a/src/Tools/mrcImage/mrcImageSplit/src/mrcImageSplit.html +++ b/src/Tools/mrcImage/mrcImageSplit/src/mrcImageSplit.html