[Igarden-commit] Garden/source/SourceMaterialDB Length.cpp, 1.9.2.5, 1.9.2.6

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/SourceMaterialDB
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15802/source/SourceMaterialDB

Modified Files:
      Tag: Release_branch_v1
	Length.cpp 
Log Message:
Fix rounding issues which could display 4'12"

Index: Length.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/Length.cpp,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -C2 -d -r1.9.2.5 -r1.9.2.6
*** Length.cpp	19 Mar 2008 01:26:00 -0000	1.9.2.5
--- Length.cpp	4 May 2008 11:41:12 -0000	1.9.2.6
***************
*** 167,178 ****
  		if(rounding == kNearestInch)
  		{
  			if(truncFoot != 0)
  			{
- 				inch = (long)(floatInch+0.5);
- 				if(inch == 12)
- 				{
- 					truncFoot++;
- 					inch = 0;
- 				}
  				if(inch != 0)
  					sprintf(buf, "%ld' %ld\"", truncFoot, inch);
--- 167,179 ----
  		if(rounding == kNearestInch)
  		{
+ 			inch = (long)(floatInch+0.5);
+ 			if(inch == 12)
+ 			{
+ 				truncFoot++;
+ 				inch = 0;
+ 			}
+ 
  			if(truncFoot != 0)
  			{
  				if(inch != 0)
  					sprintf(buf, "%ld' %ld\"", truncFoot, inch);
***************
*** 216,219 ****
--- 217,226 ----
  			}
  			
+ 			if(inch == 12)
+ 			{
+ 				truncFoot++;
+ 				inch = 0;
+ 			}
+ 
  			if(truncFoot != 0)
  			{