Changeset 688:94da28639c7f

Timestamp:

05/21/08 16:16:49 (2 years ago)

Author:

Mateusz Loskot <mateusz@…>

Branch:

default

Convert:

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

Message:

Get rid of warning C4127 when building with Visual C++. Removed unreachable code - no need to return from every catch clause of try-catch.

File:

• src/las_c_api.cpp (modified) (6 diffs)

src/las_c_api.cpp

@@ -64 +64 @@
 #include <exception>
 #include <vector>
-
+#include <sstream> // std::stringstream
+#include <fstream>
 #include <iostream>
-#include <fstream>
 using namespace liblas;
 
@@ -95 +95 @@
 static std::stack<LASError > errors;
 
+#ifdef _MSC_VER
+# pragma warning(disable: 4127) // warning C4127: conditional expression is constant
+#endif
+
 #define VALIDATE_POINTER0(ptr, func) \
-   do { if( NULL == ptr ) \
-      { \
+   do { if( NULL == ptr ) { \
         LASErrorEnum const ret = LE_Failure; \
         std::ostringstream msg; \
         msg << "Pointer \'" << #ptr << "\' is NULL in \'" << (func) <<"\'."; \
         std::string message(msg.str()); \
-        LASError_PushError( ret, \
-           message.c_str(), (func)); \
-         return; }} while(0)
+        LASError_PushError( ret, message.c_str(), (func)); \
+        return; \
+   }} while(0)
 
 #define VALIDATE_POINTER1(ptr, func, rc) \
-   do { if( NULL == ptr ) \
-      { \
+   do { if( NULL == ptr ) { \
         LASErrorEnum const ret = LE_Failure; \
         std::ostringstream msg; \
         msg << "Pointer \'" << #ptr << "\' is NULL in \'" << (func) <<"\'."; \
         std::string message(msg.str()); \
-        LASError_PushError( ret, \
-           message.c_str(), (func)); \
-        return (rc); }} while(0)
+        LASError_PushError( ret, message.c_str(), (func)); \
+        return (rc); \
+   }} while(0)
 
 LAS_DLL void LASError_Reset(void) {
@@ -269 +271 @@
     } catch (invalid_point_data const& e /*e */) {
         LASError_PushError(LE_Failure, e.what(), "LASReader_GetNextPoint Invalid Point");
-        return NULL;
     } catch (std::exception const& e)
     {
         LASError_PushError(LE_Failure, e.what(), "LASReader_GetNextPoint");
-        return NULL;
     }
  
     return NULL;
-
 }
 
@@ -293 +292 @@
     } catch (invalid_point_data const& e /*e */) {
         LASError_PushError(LE_Failure, e.what(), "LASReader_GetPointAt Invalid Point");
-        return NULL;
     } catch (std::exception const& e)
     {
         LASError_PushError(LE_Failure, e.what(), "LASReader_GetPointAt");
-        return NULL;
     }
  
@@ -860 +857 @@
 LAS_DLL liblas::uint8_t LASHeader_GetDataFormatId(const LASHeaderH hHeader) {
     VALIDATE_POINTER1(hHeader, "LASHeader_GetDataFormatId", 0);
-
-    unsigned char value = ((LASHeader*) hHeader)->GetDataFormatId();
-    return value;
+    
+    LASHeader::PointFormat id = ((LASHeader*) hHeader)->GetDataFormatId();
+    return static_cast<liblas::uint8_t>(id);
 }
 
@@ -1507 +1504 @@
 LAS_C_END
 
+#ifdef _MSC_VER
+# pragma warning(default: 4127) // enable warning C4127: conditional expression is constant
+#endif