Changeset 1157:d8569269899f

Timestamp:

04/16/09 09:11:33 (16 months ago)

Author:

Mateusz Loskot <mateusz@…>

Branch:

default

Convert:

svn:1766ff46-f334-0410-ab20-d63176f87757/trunk@1222

Message:

• Use const mask in LASClassification.
• Added a couple of new test cases for LASClassification.
• Updated build/msvc90/las2ogr project.

Files:

• build/msvc90/las2ogr/las2ogr.vcproj (modified) (7 diffs)
• build/msvc90/liblas.sln (modified) (2 diffs)
• include/liblas/lasclassification.hpp (modified) (1 diff)
• test/unit/lasclassification_test.cpp (modified) (1 diff)

build/msvc90/las2ogr/las2ogr.vcproj

@@ -2 +2 @@
 <VisualStudioProject
         ProjectType="Visual C++"
-        Version="8.00"
+        Version="9.00"
         Name="las2ogr"
         ProjectGUID="{0CE46FF7-F5B6-4EE2-B8EE-37B5555CAC62}"
         RootNamespace="las2ogr"
         Keyword="Win32Proj"
+        TargetFrameworkVersion="131072"
         >
         <Platforms>
@@ -21 +22 @@
                         IntermediateDirectory="$(ConfigurationName)"
                         ConfigurationType="1"
-                        InheritedPropertySheets="..\liblas.vsprops;.\las2ogr.vsprops"
+                        InheritedPropertySheets="..\liblas.vsprops"
                         CharacterSet="1"
                         >
@@ -66 +67 @@
                                 GenerateDebugInformation="true"
                                 SubSystem="1"
+                                RandomizedBaseAddress="1"
+                                DataExecutionPrevention="0"
                                 TargetMachine="1"
                         />
@@ -87 +90 @@
                         />
                         <Tool
-                                Name="VCWebDeploymentTool"
-                        />
-                        <Tool
                                 Name="VCPostBuildEventTool"
                         />
@@ -98 +98 @@
                         IntermediateDirectory="$(ConfigurationName)"
                         ConfigurationType="1"
-                        InheritedPropertySheets="..\liblas.vsprops;.\las2ogr.vsprops"
+                        InheritedPropertySheets="..\liblas.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
@@ -142 +142 @@
                                 OptimizeReferences="2"
                                 EnableCOMDATFolding="2"
+                                RandomizedBaseAddress="1"
+                                DataExecutionPrevention="0"
                                 TargetMachine="1"
                         />
@@ -163 +165 @@
                         />
                         <Tool
-                                Name="VCWebDeploymentTool"
-                        />
-                        <Tool
                                 Name="VCPostBuildEventTool"
                         />

build/msvc90/liblas.sln

@@ -62 +62 @@
         EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "las2ogr", "las2ogr\las2ogr.vcproj", "{0CE46FF7-F5B6-4EE2-B8EE-37B5555CAC62}"
+        ProjectSection(ProjectDependencies) = postProject
+                {208417AE-D08E-4938-AC26-A16ABD55AA5B} = {208417AE-D08E-4938-AC26-A16ABD55AA5B}
+        EndProjectSection
+EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -104 +109 @@
                 {C78B8A0D-12CE-49D6-8615-96B9735564D5}.Release|Win32.ActiveCfg = Release|Win32
                 {C78B8A0D-12CE-49D6-8615-96B9735564D5}.Release|Win32.Build.0 = Release|Win32
+                {0CE46FF7-F5B6-4EE2-B8EE-37B5555CAC62}.Debug|Win32.ActiveCfg = Debug|Win32
+                {0CE46FF7-F5B6-4EE2-B8EE-37B5555CAC62}.Debug|Win32.Build.0 = Debug|Win32
+                {0CE46FF7-F5B6-4EE2-B8EE-37B5555CAC62}.Release|Win32.ActiveCfg = Release|Win32
+                {0CE46FF7-F5B6-4EE2-B8EE-37B5555CAC62}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

include/liblas/lasclassification.hpp

@@ -131 +131 @@
     {
         bitset_type bits(m_flags);
-        bitset_type const mask(class_table_size - 1);
+        bitset_type const mask(static_cast<unsigned long>(class_table_size) - 1);
         bits &= mask;
 

test/unit/lasclassification_test.cpp

@@ -378 +378 @@
         ensure_equals(m_default.GetClassName(), cn);
     }
+
+    template<>
+    template<>
+    void to::test<21>()
+    {
+        std::string const cn("Low Point (noise)");
+        m_default.SetClass(7);
+        ensure_equals(m_default.GetClassName(), cn);
+    }
+
+    template<>
+    template<>
+    void to::test<22>()
+    {
+        std::string const cn("Reserved for ASPRS Definition");
+        m_default.SetClass(31);
+        ensure_equals(m_default.GetClassName(), cn);
+    }
+
+    template<>
+    template<>
+    void to::test<23>()
+    {
+        try
+        {
+            m_default.SetClass(32);
+            fail("std::out_of_range not thrown but expected");
+        }
+        catch (std::out_of_range const& e)
+        {
+            ensure(e.what(), true);
+        }
+        catch (...)
+        {
+            fail("unhandled exception expected");
+        }
+    }
 }