Revision: 55573
http://sourceforge.net/p/brlcad/code/55573
Author: carlmoore
Date: 2013-05-28 19:53:02 +0000 (Tue, 28 May 2013)
Log Message:
-----------
remove -h (high-res) option so it can be used for help
Modified Paths:
--------------
brlcad/trunk/doc/docbook/system/man1/en/bw-rle.xml
brlcad/trunk/doc/docbook/system/man1/en/pix-rle.xml
brlcad/trunk/src/util/bw-rle.c
brlcad/trunk/src/util/pix-rle.c
brlcad/trunk/src/util/rle_args.c
Modified: brlcad/trunk/doc/docbook/system/man1/en/bw-rle.xml
===================================================================
--- brlcad/trunk/doc/docbook/system/man1/en/bw-rle.xml 2013-05-27 10:49:38 UTC
(rev 55572)
+++ brlcad/trunk/doc/docbook/system/man1/en/bw-rle.xml 2013-05-28 19:53:02 UTC
(rev 55573)
@@ -17,7 +17,6 @@
<refsynopsisdiv xml:id='synopsis'>
<cmdsynopsis>
<command>bw-rle</command>
- <arg choice='opt'>-h </arg>
<arg choice='opt'>-C <replaceable>bg_val</replaceable></arg>
<arg choice='opt'>-s <replaceable>square_file_size</replaceable></arg>
<arg choice='opt'>-w <replaceable>file_width</replaceable></arg>
Modified: brlcad/trunk/doc/docbook/system/man1/en/pix-rle.xml
===================================================================
--- brlcad/trunk/doc/docbook/system/man1/en/pix-rle.xml 2013-05-27 10:49:38 UTC
(rev 55572)
+++ brlcad/trunk/doc/docbook/system/man1/en/pix-rle.xml 2013-05-28 19:53:02 UTC
(rev 55573)
@@ -17,7 +17,6 @@
<refsynopsisdiv xml:id='synopsis'>
<cmdsynopsis>
<command>pix-rle</command>
- <arg choice='opt'>-h </arg>
<arg choice='opt'>-C <replaceable>r/g/b</replaceable></arg>
<arg choice='opt'>-s <replaceable>square_file_size</replaceable></arg>
<arg choice='opt'>-w <replaceable>file_width</replaceable></arg>
Modified: brlcad/trunk/src/util/bw-rle.c
===================================================================
--- brlcad/trunk/src/util/bw-rle.c 2013-05-27 10:49:38 UTC (rev 55572)
+++ brlcad/trunk/src/util/bw-rle.c 2013-05-28 19:53:02 UTC (rev 55573)
@@ -60,7 +60,7 @@
static size_t file_height = 512;
static char usage[] = "\
-Usage: bw-rle [-h] [-s squarefilesize] [-C bg]\n\
+Usage: bw-rle [-s squarefilesize] [-C bg]\n\
[-w file_width] [-n file_height] [file.bw] [file.rle]\n\
\n\
If omitted, the .bw file is taken from stdin\n\
@@ -111,11 +111,11 @@
rle_putcom(strdup(comment), &outrle);
}
}
-# if HAVE_GETHOSTNAME
+#if HAVE_GETHOSTNAME
gethostname(host, sizeof(host));
snprintf(comment, 128, "converted_host=%s", host);
rle_putcom(strdup(comment), &outrle);
-# endif
+#endif
rle_put_setup(&outrle);
rle_row_alloc(&outrle, &rows);
Modified: brlcad/trunk/src/util/pix-rle.c
===================================================================
--- brlcad/trunk/src/util/pix-rle.c 2013-05-27 10:49:38 UTC (rev 55572)
+++ brlcad/trunk/src/util/pix-rle.c 2013-05-28 19:53:02 UTC (rev 55573)
@@ -60,7 +60,7 @@
static size_t file_height = 512;
static char usage[] = "\
-Usage: pix-rle [-h] [-s squarefilesize] [-C r/g/b]\n\
+Usage: pix-rle [-s squarefilesize] [-C r/g/b]\n\
[-w file_width] [-n file_height] [file.pix] [file.rle]\n\
\n\
If omitted, the .pix file is taken from stdin\n\
Modified: brlcad/trunk/src/util/rle_args.c
===================================================================
--- brlcad/trunk/src/util/rle_args.c 2013-05-27 10:49:38 UTC (rev 55572)
+++ brlcad/trunk/src/util/rle_args.c 2013-05-28 19:53:02 UTC (rev 55573)
@@ -29,12 +29,10 @@
{
int c;
- while ((c = bu_getopt(argc, argv, "hs:w:n:C:")) != -1) {
+ while ((c = bu_getopt(argc, argv, "s:w:n:C:h?")) != -1) {
switch (c) {
- case 'h':
- /* high-res */
- *file_height = *file_width = 1024;
- break;
+/* 'h' was removed, because 's 1024' can be used in its place.
+ */
case 's':
/* square file size */
*file_height = *file_width = atoi(bu_optarg);
@@ -59,7 +57,6 @@
}
break;
default:
- case '?':
return 0;
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
