[Liblas-commits] laszip: 4 new changesets

liblas-commits at liblas.org liblas-commits at liblas.org
Thu Jan 14 21:38:53 EST 2010


changeset ef8f6323567e in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=ef8f6323567e
summary: ull for constant

changeset c84afd310afe in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=c84afd310afe
summary: ull for constant

changeset e146f02b4f17 in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=e146f02b4f17
summary: no need for alternate coder right now

changeset 692c74f8ff3a in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=692c74f8ff3a
summary: major overhaul of the compressor

diffstat:

 include/lasdefinitions.h                              |   13 +-
 include/laspointreader.h                              |   11 +-
 include/laspointreader0compressed.h                   |   13 +-
 include/laspointreader0raw.h                          |   11 +-
 include/laspointreader1compressed.h                   |   17 +-
 include/laspointreader1raw.h                          |   11 +-
 include/laspointreader2compressed.h                   |   13 +-
 include/laspointreader2raw.h                          |   11 +-
 include/laspointreader3compressed.h                   |   17 +-
 include/laspointreader3raw.h                          |   11 +-
 include/laspointwriter.h                              |   11 +-
 include/laspointwriter0compressed.h                   |   13 +-
 include/laspointwriter0raw.h                          |   11 +-
 include/laspointwriter1compressed.h                   |   17 +-
 include/laspointwriter1raw.h                          |   11 +-
 include/laspointwriter2compressed.h                   |   13 +-
 include/laspointwriter2raw.h                          |   11 +-
 include/laspointwriter3compressed.h                   |   17 +-
 include/laspointwriter3raw.h                          |   11 +-
 include/lasreader.h                                   |   11 +-
 include/laswriter.h                                   |   13 +-
 src/Makefile.am                                       |    5 +-
 src/alternate_coder_src/arithmeticdecoder.cpp         |   18 +
 src/alternate_coder_src/arithmeticdecoder.h           |   36 +
 src/alternate_coder_src/arithmeticencoder.cpp         |   18 +
 src/alternate_coder_src/arithmeticencoder.h           |   36 +
 src/alternate_coder_src/arithmeticmodel.cpp           |   18 +
 src/alternate_coder_src/arithmeticmodel.h             |   36 +
 src/alternate_coder_src/integercompressor_newest.cpp  |   18 +
 src/alternate_coder_src/integercompressor_newest.h    |   36 +
 src/alternate_coder_src/laspointreader0compressed.cpp |   18 +
 src/alternate_coder_src/laspointreader0compressed.h   |   36 +
 src/alternate_coder_src/laspointreader1compressed.cpp |   18 +
 src/alternate_coder_src/laspointreader1compressed.h   |   36 +
 src/alternate_coder_src/laspointreader2compressed.cpp |   18 +
 src/alternate_coder_src/laspointreader2compressed.h   |   36 +
 src/alternate_coder_src/laspointreader3compressed.cpp |   18 +
 src/alternate_coder_src/laspointreader3compressed.h   |   36 +
 src/alternate_coder_src/laspointwriter0compressed.cpp |   18 +
 src/alternate_coder_src/laspointwriter0compressed.h   |   36 +
 src/alternate_coder_src/laspointwriter1compressed.cpp |   18 +
 src/alternate_coder_src/laspointwriter1compressed.h   |   36 +
 src/alternate_coder_src/laspointwriter2compressed.cpp |   18 +
 src/alternate_coder_src/laspointwriter2compressed.h   |   36 +
 src/alternate_coder_src/laspointwriter3compressed.cpp |   18 +
 src/alternate_coder_src/laspointwriter3compressed.h   |   36 +
 src/integercompressor_context.cpp                     |  553 ++++++++++++++++
 src/integercompressor_context.h                       |  132 +++
 src/integercompressor_newer.cpp                       |  596 ------------------
 src/integercompressor_newer.h                         |  136 ----
 src/laspointreader0compressed.cpp                     |  194 ++---
 src/laspointreader1compressed.cpp                     |  319 ++++----
 src/laspointreader2compressed.cpp                     |  226 +++---
 src/laspointreader3compressed.cpp                     |  327 ++++----
 src/laspointwriter0compressed.cpp                     |  210 ++---
 src/laspointwriter1compressed.cpp                     |  360 +++++-----
 src/laspointwriter2compressed.cpp                     |  236 +++---
 src/laspointwriter3compressed.cpp                     |  363 +++++-----
 src/lasreader.cpp                                     |   11 +-
 src/laswriter.cpp                                     |   44 +-
 src/mydefs.h                                          |   88 +-
 src/rangedecoder.cpp                                  |  109 +-
 src/rangedecoder.h                                    |   54 +-
 src/rangeencoder.cpp                                  |  110 +-
 src/rangeencoder.h                                    |   63 +-
 src/rangemodel.cpp                                    |   23 +-
 src/rangemodel.h                                      |   25 +-
 67 files changed, 2831 insertions(+), 2268 deletions(-)

diffs (truncated from 7166 to 300 lines):

diff -r f77c6eb550d7 -r 692c74f8ff3a include/lasdefinitions.h
--- a/include/lasdefinitions.h	Tue Jan 12 10:05:53 2010 -0600
+++ b/include/lasdefinitions.h	Thu Jan 14 20:19:32 2010 -0500
@@ -1,22 +1,21 @@
 /******************************************************************************
  *
- * Project:  laszip - http://liblas.org - 
- * Purpose:  
+ * Project:  laszip - http://liblas.org -
+ * Purpose:
  * Author:   Martin Isenburg
- *           martin.isenburg at gmail.com
+ *           isenburg at cs.unc.edu
  *
  ******************************************************************************
  * Copyright (c) 2009, 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. 
+ * by the Free Software Foundation.
  *
  * See the COPYING file for more information.
  *
  ****************************************************************************/
 
-
 /*
 ===============================================================================
 
@@ -166,7 +165,7 @@
 
   LASheader()
   {
-    for (int i = 0; i < sizeof(LASheader); i++) ((char*)this)[i] = 0;
+    for (unsigned int i = 0; i < sizeof(LASheader); i++) ((char*)this)[i] = 0;
     file_signature[0] = 'L'; file_signature[1] = 'A'; file_signature[2] = 'S'; file_signature[3] = 'F';
     version_major = 1;
     version_minor = 1;
diff -r f77c6eb550d7 -r 692c74f8ff3a include/laspointreader.h
--- a/include/laspointreader.h	Tue Jan 12 10:05:53 2010 -0600
+++ b/include/laspointreader.h	Thu Jan 14 20:19:32 2010 -0500
@@ -1,22 +1,21 @@
 /******************************************************************************
  *
- * Project:  laszip - http://liblas.org - 
- * Purpose:  
+ * Project:  laszip - http://liblas.org -
+ * Purpose:
  * Author:   Martin Isenburg
- *           martin.isenburg at gmail.com
+ *           isenburg at cs.unc.edu
  *
  ******************************************************************************
  * Copyright (c) 2009, 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. 
+ * by the Free Software Foundation.
  *
  * See the COPYING file for more information.
  *
  ****************************************************************************/
 
-
 /*
 ===============================================================================
 
diff -r f77c6eb550d7 -r 692c74f8ff3a include/laspointreader0compressed.h
--- a/include/laspointreader0compressed.h	Tue Jan 12 10:05:53 2010 -0600
+++ b/include/laspointreader0compressed.h	Thu Jan 14 20:19:32 2010 -0500
@@ -1,22 +1,21 @@
 /******************************************************************************
  *
- * Project:  laszip - http://liblas.org - 
- * Purpose:  
+ * Project:  laszip - http://liblas.org -
+ * Purpose:
  * Author:   Martin Isenburg
- *           martin.isenburg at gmail.com
+ *           isenburg at cs.unc.edu
  *
  ******************************************************************************
  * Copyright (c) 2009, 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. 
+ * by the Free Software Foundation.
  *
  * See the COPYING file for more information.
  *
  ****************************************************************************/
 
-
 /*
 ===============================================================================
 
@@ -52,7 +51,7 @@
 
 #include "rangemodel.h"
 #include "rangedecoder.h"
-#include "integercompressor_newer.h"
+#include "integercompressor_context.h"
 
 #include <stdio.h>
 
diff -r f77c6eb550d7 -r 692c74f8ff3a include/laspointreader0raw.h
--- a/include/laspointreader0raw.h	Tue Jan 12 10:05:53 2010 -0600
+++ b/include/laspointreader0raw.h	Thu Jan 14 20:19:32 2010 -0500
@@ -1,22 +1,21 @@
 /******************************************************************************
  *
- * Project:  laszip - http://liblas.org - 
- * Purpose:  
+ * Project:  laszip - http://liblas.org -
+ * Purpose:
  * Author:   Martin Isenburg
- *           martin.isenburg at gmail.com
+ *           isenburg at cs.unc.edu
  *
  ******************************************************************************
  * Copyright (c) 2009, 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. 
+ * by the Free Software Foundation.
  *
  * See the COPYING file for more information.
  *
  ****************************************************************************/
 
-
 /*
 ===============================================================================
 
diff -r f77c6eb550d7 -r 692c74f8ff3a include/laspointreader1compressed.h
--- a/include/laspointreader1compressed.h	Tue Jan 12 10:05:53 2010 -0600
+++ b/include/laspointreader1compressed.h	Thu Jan 14 20:19:32 2010 -0500
@@ -1,22 +1,21 @@
 /******************************************************************************
  *
- * Project:  laszip - http://liblas.org - 
- * Purpose:  
+ * Project:  laszip - http://liblas.org -
+ * Purpose:
  * Author:   Martin Isenburg
- *           martin.isenburg at gmail.com
+ *           isenburg at cs.unc.edu
  *
  ******************************************************************************
  * Copyright (c) 2009, 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. 
+ * by the Free Software Foundation.
  *
  * See the COPYING file for more information.
  *
  ****************************************************************************/
 
-
 /*
 ===============================================================================
 
@@ -52,7 +51,7 @@
 
 #include "rangemodel.h"
 #include "rangedecoder.h"
-#include "integercompressor_newer.h"
+#include "integercompressor_context.h"
 
 #include <stdio.h>
 
@@ -70,8 +69,8 @@
   int last_x_diff[2][3];
   int last_y_diff[2][3];
   int last_incr[2];
-  double last_gps_time;
-  int last_gps_time_diff;
+  I64F64 last_gps_time;
+  I32 last_gps_time_diff;
   void init_decoder();
   RangeDecoder* rd;
   IntegerCompressorContext* ic_dx;
diff -r f77c6eb550d7 -r 692c74f8ff3a include/laspointreader1raw.h
--- a/include/laspointreader1raw.h	Tue Jan 12 10:05:53 2010 -0600
+++ b/include/laspointreader1raw.h	Thu Jan 14 20:19:32 2010 -0500
@@ -1,22 +1,21 @@
 /******************************************************************************
  *
- * Project:  laszip - http://liblas.org - 
- * Purpose:  
+ * Project:  laszip - http://liblas.org -
+ * Purpose:
  * Author:   Martin Isenburg
- *           martin.isenburg at gmail.com
+ *           isenburg at cs.unc.edu
  *
  ******************************************************************************
  * Copyright (c) 2009, 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. 
+ * by the Free Software Foundation.
  *
  * See the COPYING file for more information.
  *
  ****************************************************************************/
 
-
 /*
 ===============================================================================
 
diff -r f77c6eb550d7 -r 692c74f8ff3a include/laspointreader2compressed.h
--- a/include/laspointreader2compressed.h	Tue Jan 12 10:05:53 2010 -0600
+++ b/include/laspointreader2compressed.h	Thu Jan 14 20:19:32 2010 -0500
@@ -1,22 +1,21 @@
 /******************************************************************************
  *
- * Project:  laszip - http://liblas.org - 
- * Purpose:  
+ * Project:  laszip - http://liblas.org -
+ * Purpose:
  * Author:   Martin Isenburg
- *           martin.isenburg at gmail.com
+ *           isenburg at cs.unc.edu
  *
  ******************************************************************************
  * Copyright (c) 2009, 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. 
+ * by the Free Software Foundation.
  *
  * See the COPYING file for more information.
  *
  ****************************************************************************/
 
-
 /*
 ===============================================================================
 
@@ -51,7 +50,7 @@
 
 #include "rangemodel.h"
 #include "rangedecoder.h"
-#include "integercompressor_newer.h"
+#include "integercompressor_context.h"
 
 #include <stdio.h>
 
diff -r f77c6eb550d7 -r 692c74f8ff3a include/laspointreader2raw.h
--- a/include/laspointreader2raw.h	Tue Jan 12 10:05:53 2010 -0600
+++ b/include/laspointreader2raw.h	Thu Jan 14 20:19:32 2010 -0500
@@ -1,22 +1,21 @@
 /******************************************************************************
  *
- * Project:  laszip - http://liblas.org - 
- * Purpose:  
+ * Project:  laszip - http://liblas.org -
+ * Purpose:
  * Author:   Martin Isenburg
- *           martin.isenburg at gmail.com
+ *           isenburg at cs.unc.edu
  *
  ******************************************************************************
  * Copyright (c) 2009, 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. 
+ * by the Free Software Foundation.
  *
  * See the COPYING file for more information.
  *
  ****************************************************************************/
 
-
 /*
 ===============================================================================
 
diff -r f77c6eb550d7 -r 692c74f8ff3a include/laspointreader3compressed.h
--- a/include/laspointreader3compressed.h	Tue Jan 12 10:05:53 2010 -0600
+++ b/include/laspointreader3compressed.h	Thu Jan 14 20:19:32 2010 -0500
@@ -1,22 +1,21 @@
 /******************************************************************************


More information about the Liblas-commits mailing list