diff --git a/nativeLib/build.native/tools/compile.sh b/nativeLib/build.native/tools/compile.sh
index 6c17e42ce7..fdb5ccc4f2 100755
--- a/nativeLib/build.native/tools/compile.sh
+++ b/nativeLib/build.native/tools/compile.sh
@@ -32,6 +32,8 @@ set -o nounset
# - Add C_COMPILER arguments
# Apr 9, 2009 jelkins - Support lex files
# Oct 1, 2009 jelkins - Support configurable file type "plugins"
+# June 4, 2013 #2021 bkowal - handle the case when there is a space between
+# the -o directive and the name of the output
#
#
# @author: jelkins
@@ -56,6 +58,7 @@ INCLUDE=
OUT_FILE=
IN_FILE=
OPTIONS=
+_out_next=false
# --- Determine the includes, options, input file, and output file
@@ -67,16 +70,24 @@ do
;;
-o*)
OUT_FILE="${section/-o/}"
+ if [ "${OUT_FILE}" = "" ]; then
+ _out_next=true
+ fi
;;
-*)
OPTIONS="$OPTIONS $section"
;;
*)
- IN_FILE="$IN_FILE $section"
-
- # add the IN_FILE_DIRECTORY to the include path
- IN_FILE_DIRECTORY="`dirname $IN_FILE`"
- INCLUDE="-I'$IN_FILE_DIRECTORY' $INCLUDE"
+ if [ ${_out_next} = true ]; then
+ _out_next=false
+ OUT_FILE="${section}"
+ else
+ IN_FILE="$section"
+
+ # add the IN_FILE_DIRECTORY to the include path
+ IN_FILE_DIRECTORY="`dirname $IN_FILE`"
+ INCLUDE="-I'$IN_FILE_DIRECTORY' $INCLUDE"
+ fi
;;
esac
done
diff --git a/nativeLib/rary.ohd.util/.cproject b/nativeLib/rary.ohd.util/.cproject
index 75e98999f9..67e5d1e301 100644
--- a/nativeLib/rary.ohd.util/.cproject
+++ b/nativeLib/rary.ohd.util/.cproject
@@ -2,576 +2,551 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nativeLib/rary.ohd.util/.settings/org.eclipse.cdt.core.prefs b/nativeLib/rary.ohd.util/.settings/org.eclipse.cdt.core.prefs
index 169b3ae4db..6b942ada81 100644
--- a/nativeLib/rary.ohd.util/.settings/org.eclipse.cdt.core.prefs
+++ b/nativeLib/rary.ohd.util/.settings/org.eclipse.cdt.core.prefs
@@ -1,3 +1,13 @@
-#Sun Mar 07 14:21:06 CST 2010
eclipse.preferences.version=1
-environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247=\n\n\n\n\n\n
+environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247=
+environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/HOME/delimiter=;
+environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/HOME/operation=replace
+environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/HOME/value=${env_var\:HOME}
+environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/PATH/delimiter=;
+environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/PATH/operation=replace
+environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/PATH/value=../../build.native/i386-pc-linux-gnu.sysv/bin\:${env_var\:PATH}
+environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/USER/delimiter=;
+environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/USER/operation=replace
+environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/USER/value=${env_var\:USER}
+environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/append=true
+environment/project/cdt.managedbuild.config.gnu.so.debug.417857382.1390008247/appendContributed=false
diff --git a/nativeLib/rary.ohd.util/src/g2libc/TEXT/dec_jpeg2000.c b/nativeLib/rary.ohd.util/src/g2libc/TEXT/dec_jpeg2000.c
index 2f9a2b28e9..0ab6c9c8a0 100644
--- a/nativeLib/rary.ohd.util/src/g2libc/TEXT/dec_jpeg2000.c
+++ b/nativeLib/rary.ohd.util/src/g2libc/TEXT/dec_jpeg2000.c
@@ -2,6 +2,7 @@
#include
#include
#include "g2libc_inc/grib2.h"
+#include "jasper/jas_image.h"
#include
#define JAS_1_700_2
diff --git a/nativeLib/runy.runso/.cproject b/nativeLib/runy.runso/.cproject
index 6c1206252a..9ff0ec550d 100644
--- a/nativeLib/runy.runso/.cproject
+++ b/nativeLib/runy.runso/.cproject
@@ -2,314 +2,317 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+