From 63eb35757cc323bb46153c9058aa22e4fd572bf1 Mon Sep 17 00:00:00 2001
From: gforney <gforney@gmail.com>
Date: Wed, 7 Feb 2018 11:14:06 -0500
Subject: [PATCH] smokeview source: corrections to logic coloring boundary file
 data when reloading - addresses FDS issue 5932

---
 Source/smokeview/IOboundary.c | 50 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/Source/smokeview/IOboundary.c b/Source/smokeview/IOboundary.c
index bffa8507bd..a5f72d89a5 100644
--- a/Source/smokeview/IOboundary.c
+++ b/Source/smokeview/IOboundary.c
@@ -1516,7 +1516,7 @@ void ReadBoundaryBndf(int ifile, int flag, int *errorcode){
   one time step at a time rather than for all time steps.
   */
 
-      if(statfile==0&&setpatchmin==1&&setpatchmax==1&&cache_boundarydata==0)loadpatchbysteps=UNCOMPRESSED_BYFRAME;
+      if(statfile==0&&(setpatchmin==1||setpatchmax==1)&&cache_boundarydata==0)loadpatchbysteps=UNCOMPRESSED_BYFRAME;
     }
   }
   else{
@@ -2587,10 +2587,10 @@ void DrawBoundaryTexture(const meshdata *meshi){
 
         for(icol=0;icol<ncol-1;icol++){
           if(*patchblank1==GAS&&*patchblank2==GAS&&*(patchblank1+1)==GAS&&*(patchblank2+1)==GAS){
-            r11 = (float)(*cpatchval1)/255.0;
-            r12 = (float)(*(cpatchval1+1))/255.0;
-            r21 = (float)(*cpatchval2)/255.0;
-            r22 = (float)(*(cpatchval2+1))/255.0;
+            r11 = (float)((unsigned char)(*cpatchval1))/255.0;
+            r12 = (float)((unsigned char)(*(cpatchval1+1)))/255.0;
+            r21 = (float)((unsigned char)(*cpatchval2))/255.0;
+            r22 = (float)((unsigned char)(*(cpatchval2+1)))/255.0;
             if(ABS(r11-r22)<ABS(r12-r21)){
               glTexCoord1f(r11);glVertex3fv(xyzp1);
               glTexCoord1f(r12);glVertex3fv(xyzp1+3);
@@ -2680,10 +2680,10 @@ void DrawBoundaryTexture(const meshdata *meshi){
 
         for(icol=0;icol<ncol-1;icol++){
           if(*patchblank1==GAS&&*patchblank2==GAS&&*(patchblank1+1)==GAS&&*(patchblank2+1)==GAS){
-            r11 = (float)(*cpatchval1)/255.0;
-            r12 = (float)(*(cpatchval1+1))/255.0;
-            r21 = (float)(*cpatchval2)/255.0;
-            r22 = (float)(*(cpatchval2+1))/255.0;
+            r11 = (float)((unsigned char)(*cpatchval1))/255.0;
+            r12 = (float)((unsigned char)(*(cpatchval1+1)))/255.0;
+            r21 = (float)((unsigned char)(*cpatchval2))/255.0;
+            r22 = (float)((unsigned char)(*(cpatchval2+1)))/255.0;
             if(ABS(*cpatchval1-*(cpatchval2+1))<ABS(*(cpatchval1+1)-*cpatchval2)){
               glTexCoord1f(r11);glVertex3fv(xyzp1);
               glTexCoord1f(r12);glVertex3fv(xyzp1+3);
@@ -2770,10 +2770,10 @@ void DrawBoundaryTexture(const meshdata *meshi){
 
         for(icol=0;icol<ncol-1;icol++){
           if(*patchblank1==GAS&&*patchblank2==GAS&&*(patchblank1+1)==GAS&&*(patchblank2+1)==GAS){
-            r11 = (float)(*cpatchval1)/255.0;
-            r12 = (float)(*(cpatchval1+1))/255.0;
-            r21 = (float)(*cpatchval2)/255.0;
-            r22 = (float)(*(cpatchval2+1))/255.0;
+            r11 = (float)((unsigned char)(*cpatchval1))/255.0;
+            r12 = (float)((unsigned char)(*(cpatchval1+1)))/255.0;
+            r21 = (float)((unsigned char)(*cpatchval2))/255.0;
+            r22 = (float)((unsigned char)(*(cpatchval2+1)))/255.0;
             if(ABS(*cpatchval1-*(cpatchval2+1))<ABS(*(cpatchval1+1)-*cpatchval2)){
               glTexCoord1f(r11);glVertex3fv(xyzp1);
               glTexCoord1f(r22);glVertex3fv(xyzp2+3);
@@ -2903,10 +2903,10 @@ void DrawBoundaryTextureThreshold(const meshdata *meshi){
 
         for(icol=0;icol<ncol-1;icol++){
           if(*patchblank1==GAS&&*patchblank2==GAS&&*(patchblank1+1)==GAS&&*(patchblank2+1)==GAS){
-            r11 = (float)(*cpatchval1)/255.0;
-            r12 = (float)(*(cpatchval1+1))/255.0;
-            r21 = (float)(*cpatchval2)/255.0;
-            r22 = (float)(*(cpatchval2+1))/255.0;
+            r11 = (float)((unsigned char)(*cpatchval1))/255.0;
+            r12 = (float)((unsigned char)(*(cpatchval1+1)))/255.0;
+            r21 = (float)((unsigned char)(*cpatchval2))/255.0;
+            r22 = (float)((unsigned char)(*(cpatchval2+1)))/255.0;
             color11=clear_color;
             color12=clear_color;
             color21=clear_color;
@@ -2990,10 +2990,10 @@ void DrawBoundaryTextureThreshold(const meshdata *meshi){
 
         for(icol=0;icol<ncol-1;icol++){
           if(*patchblank1==GAS&&*patchblank2==GAS&&*(patchblank1+1)==GAS&&*(patchblank2+1)==GAS){
-            r11 = (float)(*cpatchval1)/255.0;
-            r12 = (float)(*(cpatchval1+1))/255.0;
-            r21 = (float)(*cpatchval2)/255.0;
-            r22 = (float)(*(cpatchval2+1))/255.0;
+            r11 = (float)((unsigned char)(*cpatchval1))/255.0;
+            r12 = (float)((unsigned char)(*(cpatchval1+1)))/255.0;
+            r21 = (float)((unsigned char)(*cpatchval2))/255.0;
+            r22 = (float)((unsigned char)(*(cpatchval2+1)))/255.0;
             color11=clear_color;
             color12=clear_color;
             color21=clear_color;
@@ -3073,10 +3073,10 @@ void DrawBoundaryTextureThreshold(const meshdata *meshi){
 
         for(icol=0;icol<ncol-1;icol++){
           if(*patchblank1==GAS&&*patchblank2==GAS&&*(patchblank1+1)==GAS&&*(patchblank2+1)==GAS){
-            r11 = (float)(*cpatchval1)/255.0;
-            r12 = (float)(*(cpatchval1+1))/255.0;
-            r21 = (float)(*cpatchval2)/255.0;
-            r22 = (float)(*(cpatchval2+1))/255.0;
+            r11 = (float)((unsigned char)(*cpatchval1))/255.0;
+            r12 = (float)((unsigned char)(*(cpatchval1+1)))/255.0;
+            r21 = (float)((unsigned char)(*cpatchval2))/255.0;
+            r22 = (float)((unsigned char)(*(cpatchval2+1)))/255.0;
             color11=clear_color;
             color12=clear_color;
             color21=clear_color;