[Liblas-commits] laszip: put LASZIP_DLL back. Martin, please let me know your er...

liblas-commits at liblas.org liblas-commits at liblas.org
Wed Jan 5 22:08:51 EST 2011


details:   http://hg.liblas.orglaszip/rev/057be33cd6db
changeset: 117:057be33cd6db
user:      Howard Butler <hobu.inc at gmail.com>
date:      Wed Jan 05 21:08:32 2011 -0600
description:
put LASZIP_DLL back.  Martin, please let me know your error message(s) instead of removing this as I need it for the OSGeo4W windows deployment

diffstat:

 include/laszip/export.hpp    |  20 ++++++------
 include/laszip/laszip.hpp    |  65 +++++++++++++++++++++----------------------
 include/laszip/laszipper.hpp |   2 +-
 3 files changed, 43 insertions(+), 44 deletions(-)

diffs (139 lines):

diff -r daac63e565cf -r 057be33cd6db include/laszip/export.hpp
--- a/include/laszip/export.hpp	Wed Jan 05 09:56:48 2011 -0800
+++ b/include/laszip/export.hpp	Wed Jan 05 21:08:32 2011 -0600
@@ -5,17 +5,17 @@
 
 #ifndef LASZIP_DLL
 #if (defined(_MSC_VER) || defined __CYGWIN__) && !defined(LAS_DISABLE_DLL)
-#if defined(LASZIP_DLL_EXPORT)
-#   define LASZIP_DLL   __declspec(dllexport)
-#elif defined(LASZIP_DLL_IMPORT)
-#   define LASZIP_DLL   __declspec(dllimport)
-#endif
+    #if defined(LASZIP_DLL_EXPORT)
+    #   define LASZIP_DLL   __declspec(dllexport)
+    #elif defined(LASZIP_DLL_IMPORT)
+    #   define LASZIP_DLL   __declspec(dllimport)
+    #endif
 #else
-#  if defined(USE_GCC_VISIBILITY_FLAG)
-#    define LASZIP_DLL     __attribute__ ((visibility("default")))
-#  else
-#    define LASZIP_DLL
-#  endif
+    #  if defined(USE_GCC_VISIBILITY_FLAG)
+    #    define LASZIP_DLL     __attribute__ ((visibility("default")))
+    #  else
+    #    define LASZIP_DLL
+    #  endif
 #endif
 #endif
 
diff -r daac63e565cf -r 057be33cd6db include/laszip/laszip.hpp
--- a/include/laszip/laszip.hpp	Wed Jan 05 09:56:48 2011 -0800
+++ b/include/laszip/laszip.hpp	Wed Jan 05 21:08:32 2011 -0600
@@ -16,36 +16,36 @@
  *
  ****************************************************************************/
 
-/*
-===============================================================================
-
-  FILE:  laszip.hpp
-  
-  CONTENTS:
-  
+/*
+===============================================================================
+
+  FILE:  laszip.hpp
+  
+  CONTENTS:
+  
     Contains LASitem and LASchunk structs as well as the IDs of the currently
-    supported entropy coding scheme
-
-  PROGRAMMERS:
-  
-    martin isenburg at cs.unc.edu
-  
-  COPYRIGHT:
-  
-    copyright (C) 2007  martin isenburg at cs.unc.edu
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  
-  CHANGE HISTORY:
-  
+    supported entropy coding scheme
+
+  PROGRAMMERS:
+  
+    martin isenburg at cs.unc.edu
+  
+  COPYRIGHT:
+  
+    copyright (C) 2007  martin isenburg at cs.unc.edu
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  
+  CHANGE HISTORY:
+  
     12 December 2010 -- refactored from lasdefinitions after movies with silke
-  
-===============================================================================
-*/
-#ifndef LASZIP_H
-#define LASZIP_H
+  
+===============================================================================
+*/
+#ifndef LASZIP_H
+#define LASZIP_H
 
 #if defined(_MSC_VER) && (_MSC_VER < 1300)
 #define LZ_WIN32_VC6
@@ -58,10 +58,9 @@
 #define LASZIP_VERSION_MINOR    0
 #define LASZIP_VERSION_REVISION 0
 
-//#include "export.hpp"
-#define LAS_ZIP_DLL
+#include "export.hpp"
 
-class LAS_ZIP_DLL LASitem
+class LASZIP_DLL LASitem
 {
 public:
   enum Type { BYTE = 0, SHORT, INT, LONG, FLOAT, DOUBLE, POINT10, GPSTIME11, RGB12, WAVEPACKET13 } type;
@@ -80,7 +79,7 @@
   unsigned short version;
 };
 
-class LAS_ZIP_DLL LASzip
+class LASZIP_DLL LASzip
 {
 public:
 
@@ -116,4 +115,4 @@
 }; 
 */
 
-#endif
+#endif
diff -r daac63e565cf -r 057be33cd6db include/laszip/laszipper.hpp
--- a/include/laszip/laszipper.hpp	Wed Jan 05 09:56:48 2011 -0800
+++ b/include/laszip/laszipper.hpp	Wed Jan 05 21:08:32 2011 -0600
@@ -61,7 +61,7 @@
 class ByteStreamOut;
 class LASwritePoint;
 
-class LASzipper
+class LASZIP_DLL LASzipper
 {
 public:
   unsigned int open(FILE* outfile, unsigned int num_items, LASitem items[], LASzip::Algorithm algorithm);


More information about the Liblas-commits mailing list