[Liblas-commits] laszip: consistent (and nicer) looking licensing headers

liblas-commits at liblas.org liblas-commits at liblas.org
Fri Jan 28 09:53:41 EST 2011


details:   http://hg.liblas.orglaszip/rev/b48854422090
changeset: 159:b48854422090
user:      isenburg
date:      Fri Jan 28 06:52:29 2011 -0800
description:
consistent (and nicer) looking licensing headers
Subject: laszip: consistent (and nicer) looking licensing headers

details:   http://hg.liblas.orglaszip/rev/66f59b110640
changeset: 160:66f59b110640
user:      isenburg
date:      Fri Jan 28 06:53:17 2011 -0800
description:
consistent (and nicer) looking licensing headers

diffstat:

 include/laszip/lasunzipper.hpp    |  36 ++++----------
 include/laszip/laszip.hpp         |  70 ++++++++++++------------------
 include/laszip/laszipper.hpp      |  36 ++++----------
 src/arithmeticdecoder.cpp         |  84 +++++++++++++++++++++++------------
 src/arithmeticdecoder.hpp         |  49 ++++++++------------
 src/arithmeticencoder.cpp         |  84 +++++++++++++++++++++++------------
 src/arithmeticencoder.hpp         |  57 +++++++++--------------
 src/arithmeticmodel.cpp           |  84 +++++++++++++++++++++++------------
 src/arithmeticmodel.hpp           |  56 +++++++++--------------
 src/bytestreamin.hpp              |  50 +++++++-------------
 src/bytestreamin_file.hpp         |  54 ++++++++--------------
 src/bytestreamin_istream.hpp      |  50 +++++++-------------
 src/bytestreamout.hpp             |  52 ++++++++--------------
 src/bytestreamout_file.hpp        |  52 ++++++++--------------
 src/bytestreamout_ostream.hpp     |  52 ++++++++--------------
 src/entropydecoder.hpp            |  50 +++++++-------------
 src/entropyencoder.hpp            |  50 +++++++-------------
 src/integercompressor.cpp         |  43 ++++++------------
 src/integercompressor.hpp         |  50 +++++++-------------
 src/lasreaditem.hpp               |  50 +++++++-------------
 src/lasreaditemcompressed_v1.cpp  |  44 ++++++------------
 src/lasreaditemcompressed_v1.hpp  |  50 +++++++-------------
 src/lasreaditemraw.hpp            |  50 +++++++-------------
 src/lasreadpoint.cpp              |  57 ++++++-----------------
 src/lasreadpoint.hpp              |  50 +++++++-------------
 src/lasunzipper.cpp               |  43 ++++++------------
 src/laswriteitem.hpp              |  50 +++++++-------------
 src/laswriteitemcompressed_v1.cpp |  81 ++++++++++++++--------------------
 src/laswriteitemcompressed_v1.hpp |  50 +++++++-------------
 src/laswriteitemraw.hpp           |  50 +++++++-------------
 src/laswritepoint.cpp             |  91 ++++++++++++++------------------------
 src/laswritepoint.hpp             |  52 ++++++++--------------
 src/laszip.cpp                    |  43 ++++++------------
 src/laszipper.cpp                 |  43 ++++++------------
 src/mydefs.hpp                    |  85 +++++++++++++++++++++++-------------
 35 files changed, 796 insertions(+), 1152 deletions(-)

diffs (truncated from 2604 to 300 lines):

diff -r 24f8c5388535 -r 66f59b110640 include/laszip/lasunzipper.hpp
--- a/include/laszip/lasunzipper.hpp	Fri Jan 21 13:29:25 2011 -0600
+++ b/include/laszip/lasunzipper.hpp	Fri Jan 28 06:53:17 2011 -0800
@@ -1,21 +1,3 @@
-/******************************************************************************
- *
- * Project:  integrating laszip into liblas - http://liblas.org -
- * Purpose:
- * Author:   Martin Isenburg
- *           isenburg at cs.unc.edu
- *
- ******************************************************************************
- * Copyright (c) 2010, Martin Isenburg
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Licence as published
- * by the Free Software Foundation.
- *
- * See the COPYING file for more information.
- *
- ****************************************************************************/
-
 /*
 ===============================================================================
 
@@ -27,18 +9,22 @@
 
   PROGRAMMERS:
   
-    martin isenburg at cs.unc.edu
+    martin.isenburg at gmail.com
   
   COPYRIGHT:
-  
-    copyright (C) 2010  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.
+
+    (c) 2010-2011, Martin Isenburg, LASSO - tools to catch reality
+
+    This is free software; you can redistribute and/or modify it under the
+    terms of the GNU Lesser General Licence as published by the Free Software
+    Foundation. See the COPYING file for more information.
+
+    This software is distributed WITHOUT ANY WARRANTY and without even the
+    implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   
   CHANGE HISTORY:
   
+    10 January 2011 -- licensing change for LGPL release and liblas integration
     12 December 2010 -- created from LASwriter/LASreader after Howard got pushy (-;
   
 ===============================================================================
diff -r 24f8c5388535 -r 66f59b110640 include/laszip/laszip.hpp
--- a/include/laszip/laszip.hpp	Fri Jan 21 13:29:25 2011 -0600
+++ b/include/laszip/laszip.hpp	Fri Jan 28 06:53:17 2011 -0800
@@ -1,51 +1,37 @@
-/******************************************************************************
- *
- * Project:  integrating laszip into liblas - http://liblas.org -
- * Purpose:
- * Author:   Martin Isenburg
- *           isenburg at cs.unc.edu
- *
- ******************************************************************************
- * Copyright (c) 2010, Martin Isenburg
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Licence as published
- * by the Free Software Foundation.
- *
- * See the COPYING file for more information.
- *
- ****************************************************************************/
-
-/*
-===============================================================================
-
-  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
-
+    supported entropy coding scheme
+
   PROGRAMMERS:
   
-    martin isenburg at cs.unc.edu
+    martin.isenburg at gmail.com
   
   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.
+
+    (c) 2010-2011, Martin Isenburg, LASSO - tools to catch reality
+
+    This is free software; you can redistribute and/or modify it under the
+    terms of the GNU Lesser General Licence as published by the Free Software
+    Foundation. See the COPYING file for more information.
+
+    This software is distributed WITHOUT ANY WARRANTY and without even the
+    implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   
   CHANGE HISTORY:
   
+    10 January 2011 -- licensing change for LGPL release and liblas integration
     12 December 2010 -- refactored from lasdefinitions after movies with silke
-  
-===============================================================================
-*/
-#ifndef LASZIP_H
-#define LASZIP_H
+  
+===============================================================================
+*/
+#ifndef LASZIP_HPP
+#define LASZIP_HPP
 
 #if defined(_MSC_VER) && (_MSC_VER < 1300)
 #define LZ_WIN32_VC6
@@ -54,11 +40,12 @@
 typedef long long SIGNED_INT64;
 #endif
 
+
 #define LASZIP_VERSION_MAJOR    1
 #define LASZIP_VERSION_MINOR    0
 #define LASZIP_VERSION_REVISION 0
 
-#include "laszipexport.hpp"
+#include "laszipexport.hpp"
 
 class LASZIP_DLL LASitem
 {
@@ -87,7 +74,6 @@
   {
     POINT_BY_POINT_RAW        = 0,
     POINT_BY_POINT_ARITHMETIC = 1,
-    POINT_BY_POINT_RANGE      = 2,
     DEFAULT_COMPRESSION       = POINT_BY_POINT_ARITHMETIC,
     DEFAULT_RAW               = POINT_BY_POINT_RAW
   };
@@ -115,4 +101,4 @@
 }; 
 */
 
-#endif
+#endif
diff -r 24f8c5388535 -r 66f59b110640 include/laszip/laszipper.hpp
--- a/include/laszip/laszipper.hpp	Fri Jan 21 13:29:25 2011 -0600
+++ b/include/laszip/laszipper.hpp	Fri Jan 28 06:53:17 2011 -0800
@@ -1,21 +1,3 @@
-/******************************************************************************
- *
- * Project:  integrating laszip into liblas - http://liblas.org -
- * Purpose:
- * Author:   Martin Isenburg
- *           isenburg at cs.unc.edu
- *
- ******************************************************************************
- * Copyright (c) 2010, Martin Isenburg
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Licence as published
- * by the Free Software Foundation.
- *
- * See the COPYING file for more information.
- *
- ****************************************************************************/
-
 /*
 ===============================================================================
 
@@ -27,18 +9,22 @@
 
   PROGRAMMERS:
   
-    martin isenburg at cs.unc.edu
+    martin.isenburg at gmail.com
   
   COPYRIGHT:
-  
-    copyright (C) 2010  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.
+
+    (c) 2010-2011, Martin Isenburg, LASSO - tools to catch reality
+
+    This is free software; you can redistribute and/or modify it under the
+    terms of the GNU Lesser General Licence as published by the Free Software
+    Foundation. See the COPYING file for more information.
+
+    This software is distributed WITHOUT ANY WARRANTY and without even the
+    implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   
   CHANGE HISTORY:
   
+    10 January 2011 -- licensing change for LGPL release and liblas integration
     12 December 2010 -- created from LASwriter/LASreader after Howard got pushy (-;
   
 ===============================================================================
diff -r 24f8c5388535 -r 66f59b110640 src/arithmeticdecoder.cpp
--- a/src/arithmeticdecoder.cpp	Fri Jan 21 13:29:25 2011 -0600
+++ b/src/arithmeticdecoder.cpp	Fri Jan 28 06:53:17 2011 -0800
@@ -1,21 +1,3 @@
-/******************************************************************************
- *
- * Project:  integrating laszip into liblas - http://liblas.org -
- * Purpose:
- * Author:   Martin Isenburg
- *           isenburg at cs.unc.edu
- *
- ******************************************************************************
- * Copyright (c) 2010, Martin Isenburg
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Licence as published
- * by the Free Software Foundation.
- *
- * See the COPYING file for more information.
- *
- ****************************************************************************/
-
 /*
 ===============================================================================
 
@@ -23,19 +5,23 @@
   
   CONTENTS:
       
-    see header file
+    A modular C++ wrapper for an adapted version of Amir Said's FastAC Code.
+    see: http://www.cipr.rpi.edu/~said/FastAC.html
 
-  PROGRAMMERS:
-  
-    martin isenburg at cs.unc.edu
-  
-  COPYRIGHT:
-  
-    copyright (C) 2009 martin isenburg (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.
+  PROGRAMMERS:
+
+    martin.isenburg at gmail.com
+
+  COPYRIGHT:
+
+    (c) 2011, Martin Isenburg, LASSO - tools to catch reality
+
+    This is free software; you can redistribute and/or modify it under the
+    terms of the GNU Lesser General Licence as published by the Free Software
+    Foundation. See the COPYING file for more information.
+
+    This software is distributed WITHOUT ANY WARRANTY and without even the
+    implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   
   CHANGE HISTORY:
   
@@ -43,6 +29,44 @@
   
 ===============================================================================
 */
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+//                                                                           -
+// Fast arithmetic coding implementation                                     -
+// -> 32-bit variables, 32-bit product, periodic updates, table decoding     -
+//                                                                           -
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+//                                                                           -
+// Version 1.00  -  April 25, 2004                                           -
+//                                                                           -
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+//                                                                           -
+//                                  WARNING                                  -
+//                                 =========                                 -
+//                                                                           -
+// The only purpose of this program is to demonstrate the basic principles   -
+// of arithmetic coding. It is provided as is, without any express or        -


More information about the Liblas-commits mailing list