Modified: Add usage related to -M

	modified:   src/Objects/DataManip/bmpFile/inc/bmpFile.h
	modified:   src/Objects/DataManip/bmpFile/src/lbmp2mrc.c

diff --git a/hostdepend/X86MAC64/bin/X86MAC64/bmp2mrc b/hostdepend/X86MAC64/bin/X86MAC64/bmp2mrc
index b57f64c..af8a5de 100755 (executable)
Binary files a/hostdepend/X86MAC64/bin/X86MAC64/bmp2mrc and b/hostdepend/X86MAC64/bin/X86MAC64/bmp2mrc differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a
index 807c928..31bafd7 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a and b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libbmpFile.a b/hostdepend/X86MAC64/lib/X86MAC64/libbmpFile.a
index a5e8285..6fb8c83 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libbmpFile.a and b/hostdepend/X86MAC64/lib/X86MAC64/libbmpFile.a differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/lbmp2mrc.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/lbmp2mrc.sharedo
index 8290181..cb42663 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lbmp2mrc.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lbmp2mrc.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/lbmp2mrc.sharedo b/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/lbmp2mrc.sharedo
index 8290181..cb42663 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/lbmp2mrc.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/lbmp2mrc.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.a b/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.a
index a5e8285..6fb8c83 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.a and b/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.a differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.debug.a b/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.debug.a
index c7dc9f5..3dc6e2f 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.debug.a and b/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.debug.a differ

diff --git a/hostdepend/X86MAC64/src/Tools/filter/bmp2mrc/src/X86MAC64/bmp2mrc b/hostdepend/X86MAC64/src/Tools/filter/bmp2mrc/src/X86MAC64/bmp2mrc
index b57f64c..af8a5de 100755 (executable)
Binary files a/hostdepend/X86MAC64/src/Tools/filter/bmp2mrc/src/X86MAC64/bmp2mrc and b/hostdepend/X86MAC64/src/Tools/filter/bmp2mrc/src/X86MAC64/bmp2mrc differ

diff --git a/include/bmpFile.h b/include/bmpFile.h
index e3ae0be..e98864d 100644 (file)
--- a/include/bmpFile.h
+++ b/include/bmpFile.h
@@ -93,6 +93,7 @@ extern void bmpFileRead(bmpFile* in, FILE* fpt, int mode);
 
 /* lbmp2mrc.c */
 extern void lbmp2mrc(mrcImage* out, bmpFile* in, lbmp2mrcInfo linfo, int mode);
+extern void lbmp2mrcUsage(FILE* fpt);
 
 /* bmpFileInfo.c */
 extern void bmpFileInfo(FILE* fpt, bmpFile* in, int mode);

diff --git a/src/Objects/DataManip/bmpFile/doc/bmpFile.html b/src/Objects/DataManip/bmpFile/doc/bmpFile.html
index 3683d20..e1e7f48 100644 (file)
--- a/src/Objects/DataManip/bmpFile/doc/bmpFile.html
+++ b/src/Objects/DataManip/bmpFile/doc/bmpFile.html
@@ -104,6 +104,7 @@ extern void bmpFileRead(bmpFile* in, FILE* fpt, int mode);
 
 /* lbmp2mrc.c */
 extern void lbmp2mrc(mrcImage* out, bmpFile* in, lbmp2mrcInfo linfo, int mode);
+extern void lbmp2mrcUsage(FILE* fpt);
 
 /* bmpFileInfo.c */
 extern void bmpFileInfo(FILE* fpt, bmpFile* in, int mode);

diff --git a/src/Objects/DataManip/bmpFile/inc/bmpFile.h b/src/Objects/DataManip/bmpFile/inc/bmpFile.h
index e3ae0be..e98864d 100644 (file)
--- a/src/Objects/DataManip/bmpFile/inc/bmpFile.h
+++ b/src/Objects/DataManip/bmpFile/inc/bmpFile.h
@@ -93,6 +93,7 @@ extern void bmpFileRead(bmpFile* in, FILE* fpt, int mode);
 
 /* lbmp2mrc.c */
 extern void lbmp2mrc(mrcImage* out, bmpFile* in, lbmp2mrcInfo linfo, int mode);
+extern void lbmp2mrcUsage(FILE* fpt);
 
 /* bmpFileInfo.c */
 extern void bmpFileInfo(FILE* fpt, bmpFile* in, int mode);

diff --git a/src/Objects/DataManip/bmpFile/src/lbmp2mrc.c b/src/Objects/DataManip/bmpFile/src/lbmp2mrc.c
index 2567ef9..bfea410 100644 (file)
--- a/src/Objects/DataManip/bmpFile/src/lbmp2mrc.c
+++ b/src/Objects/DataManip/bmpFile/src/lbmp2mrc.c
@@ -81,3 +81,12 @@ lbmp2mrc(mrcImage* mrc, bmpFile* bmp, lbmp2mrcInfo linfo, int mode)
        }
        }       
 }
+
+void
+lbmp2mrcUsage(FILE* fpt)
+{
+       fprintf(fpt, "%d: Y to mono\n", lbmp2mrcInfoModeY);
+       fprintf(fpt, "%d: R to mono\n", lbmp2mrcInfoModeR);
+       fprintf(fpt, "%d: G to mono\n", lbmp2mrcInfoModeG);
+       fprintf(fpt, "%d: B to mono\n", lbmp2mrcInfoModeB);
+}

diff --git a/src/Tools/Makefile b/src/Tools/Makefile
deleted file mode 120000 (symlink)
index 80a2401a7dc3d8e1cdc121c22208bd28b6887cf3..0000000000000000000000000000000000000000
--- a/src/Tools/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-/Users/tacyas/Eos/src/Config/Template/ToolsHomeTemplate.Dir/Makefile
\ No newline at end of file

diff --git a/src/Tools/Makefile b/src/Tools/Makefile
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..ad841104b1b4aa83ce554496adb2d2476544f988
--- /dev/null
+++ b/src/Tools/Makefile
@@ -0,0 +1,5 @@
+include ../Config/Define.inc
+include Config/Define.inc
+include .Source
+
+include Config/Target.inc

diff --git a/src/Tools/filter/bmp2mrc/src/bmp2mrc.c b/src/Tools/filter/bmp2mrc/src/bmp2mrc.c
index 1538263..c418681 100755 (executable)
--- a/src/Tools/filter/bmp2mrc/src/bmp2mrc.c
+++ b/src/Tools/filter/bmp2mrc/src/bmp2mrc.c
@@ -66,4 +66,6 @@ void
 additionalUsage()
 {
        fprintf(stderr, "----- Additional Usage -----\n");
+       fprintf(stderr, "-M \n");
+       lbmp2mrcUsage(stderr);
 }

diff --git a/src/Tools/filter/bmp2mrc/src/bmp2mrc.html b/src/Tools/filter/bmp2mrc/src/bmp2mrc.html
index e85d288..ea98e9d 100755 (executable)
--- a/src/Tools/filter/bmp2mrc/src/bmp2mrc.html
+++ b/src/Tools/filter/bmp2mrc/src/bmp2mrc.html
@@ -16,6 +16,11 @@ Options:
     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
     [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
 ----- Additional Usage -----
+-M 
+0: Y to mono
+1: R to mono
+2: G to mono
+3: B to mono
 </PRE>
 </BODY>
 </HTML>