[Liblas-commits] r998 - in trunk: include/liblas test/unit

[liblas-commits at liblas.org]

Author: hobu
Date: Wed Feb  4 21:48:50 2009
New Revision: 998
URL: http://liblas.org/changeset/998

Log:
increment max VersionMinor to 2 for 1.2 support #91

Modified:
   trunk/include/liblas/lasheader.hpp
   trunk/test/unit/lasheader_test.cpp

Modified: trunk/include/liblas/lasheader.hpp
==============================================================================
--- trunk/include/liblas/lasheader.hpp	(original)
+++ trunk/include/liblas/lasheader.hpp	Wed Feb  4 21:48:50 2009
@@ -71,7 +71,7 @@
         eVersionMajorMin = 1, ///< Minimum of major component
         eVersionMajorMax = 1, ///< Maximum of major component
         eVersionMinorMin = 0, ///< Minimum of minor component
-        eVersionMinorMax = 1 ///< Maximum of minor component
+        eVersionMinorMax = 2 ///< Maximum of minor component
     };
 
     /// Versions of point record format.

Modified: trunk/test/unit/lasheader_test.cpp
==============================================================================
--- trunk/test/unit/lasheader_test.cpp	(original)
+++ trunk/test/unit/lasheader_test.cpp	Wed Feb  4 21:48:50 2009
@@ -115,18 +115,18 @@
         h1.SetFileSourceId(id2);
         ensure_equals(h1.GetFileSourceId(), id2);
 
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable: 4305) //  truncation from 'int' to 'liblas::uint16_t'
-# pragma warning(disable: 4309) // conditional expression is constant.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable: 4305) //  truncation from 'int' to 'liblas::uint16_t'
+# pragma warning(disable: 4309) // conditional expression is constant.
 #endif
         // Unsigned overflow
         // Likely compiler warning: truncation from int to liblas::uint16_t
         h1.SetFileSourceId(id2 + 1);
         ensure_equals(h1.GetFileSourceId(), overflowed);
-
-#ifdef _MSC_VER
-# pragma warning(push)
+
+#ifdef _MSC_VER
+# pragma warning(push)
 #endif
     }
 
@@ -183,7 +183,7 @@
 
         try
         {
-            h.SetVersionMinor(2);
+            h.SetVersionMinor(3);
             ensure("std::out_of_range not thrown", false);
         }
         catch (std::out_of_range const& e)