[brlcad-commits] SF.net SVN: brlcad:[55688] brlcad/trunk/src/sig

[carlmoore]

Revision: 55688
          http://sourceforge.net/p/brlcad/code/55688
Author:   carlmoore
Date:     2013-06-07 14:54:36 +0000 (Fri, 07 Jun 2013)
Log Message:
-----------
changes (preset of scale =1.0 and implementing -h and -?) for bw-d.c and d-bw.c

Modified Paths:
--------------
    brlcad/trunk/src/sig/bw-d.c
    brlcad/trunk/src/sig/d-bw.c

Modified: brlcad/trunk/src/sig/bw-d.c
===================================================================
--- brlcad/trunk/src/sig/bw-d.c 2013-06-07 14:34:50 UTC (rev 55687)
+++ brlcad/trunk/src/sig/bw-d.c 2013-06-07 14:54:36 UTC (rev 55688)
@@ -46,18 +46,15 @@
     bu_exit(1, "Usage: bw-d [-n || scale] < unsigned_chars > doubles\n");
 }
 
-
 int main(int argc, char **argv)
 {
     int i, num;
-    double scale;
+    double scale = 1.0;
     size_t ret;
 
     if (BU_STR_EQUAL(argv[1], "-h") || BU_STR_EQUAL(argv[1], "-?"))
        printusage();
 
-    scale = 1.0;
-
     if (argc > 1) {
        if (BU_STR_EQUAL(argv[1], "-n"))
            scale = 1.0/255.0;
@@ -79,6 +76,7 @@
            for (i = 0; i < num; i++)
                obuf[i] = (double)ibuf[i] * scale;
        }
+
        ret = fwrite(&obuf[0], sizeof(obuf[0]), num, stdout);
        if (ret != (size_t)num)
            perror("fwrite");

Modified: brlcad/trunk/src/sig/d-bw.c
===================================================================
--- brlcad/trunk/src/sig/d-bw.c 2013-06-07 14:34:50 UTC (rev 55687)
+++ brlcad/trunk/src/sig/d-bw.c 2013-06-07 14:54:36 UTC (rev 55688)
@@ -37,10 +37,14 @@
 #include "bu.h"
 #include "vmath.h"
 
-
 double ibuf[512];
 unsigned char obuf[512];
 
+void
+printusage(void)
+{
+    bu_exit(1, "Usage: d-bw [-n || scale] < doubles > unsigned_chars\n");
+}
 
 int main(int argc, char **argv)
 {
@@ -50,6 +54,9 @@
     int clip_high, clip_low;
     size_t ret;
 
+    if (BU_STR_EQUAL(argv[1], "-h") || BU_STR_EQUAL(argv[1], "-?"))
+       printusage();
+
     if (argc > 1) {
        if (BU_STR_EQUAL(argv[1], "-n"))
            scale = 255.0;
@@ -59,7 +66,8 @@
     }
 
     if (argc > 1 || ZERO(scale) || isatty(fileno(stdin))) {
-       bu_exit(1, "Usage: d-bw [-n || scale] < doubles > unsigned_chars\n");
+       fprintf(stderr, "bad argument\n");
+       printusage();
     }
 
     clip_high = clip_low = 0;

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits