[Liblas-commits] hg-main-tree: update for gdal, oci

liblas-commits at liblas.org liblas-commits at liblas.org
Mon Mar 21 20:57:54 EDT 2011


details:   http://hg.libpc.orghg-main-tree/rev/38329a6c37de
changeset: 374:38329a6c37de
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Mon Mar 21 17:42:33 2011 -0700
description:
update for gdal, oci
Subject: hg-main-tree: remove extra ifdefs

details:   http://hg.libpc.orghg-main-tree/rev/e6d51aa45f71
changeset: 375:e6d51aa45f71
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Mon Mar 21 17:42:49 2011 -0700
description:
remove extra ifdefs
Subject: hg-main-tree: obsolete

details:   http://hg.libpc.orghg-main-tree/rev/735e1991d227
changeset: 376:735e1991d227
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Mon Mar 21 17:49:40 2011 -0700
description:
obsolete
Subject: hg-main-tree: moving to _static

details:   http://hg.libpc.orghg-main-tree/rev/3314f14169be
changeset: 377:3314f14169be
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Mon Mar 21 17:51:01 2011 -0700
description:
moving to _static
Subject: hg-main-tree: archived copies of sprint slides

details:   http://hg.libpc.orghg-main-tree/rev/8a9d50025307
changeset: 378:8a9d50025307
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Mon Mar 21 17:53:47 2011 -0700
description:
archived copies of sprint slides

diffstat:

 apps/pc2pc.cpp                                             |    3 -
 doc/_static/files/2011_Codesprint_libpc_design.pdf         |    0 
 doc/_static/files/2011_Codesprint_libpc_implementation.pdf |    0 
 doc/sprint/libpc-design.pptx                               |    0 
 doc/sprint/libpc-implementation.pptx                       |    0 
 doc/sprint/notes.txt                                       |   59 -------------
 mpg-config.bat                                             |   16 +-
 7 files changed, 8 insertions(+), 70 deletions(-)

diffs (131 lines):

diff -r e76335979a24 -r 8a9d50025307 apps/pc2pc.cpp
--- a/apps/pc2pc.cpp	Fri Mar 18 11:19:49 2011 -0500
+++ b/apps/pc2pc.cpp	Mon Mar 21 17:53:47 2011 -0700
@@ -122,8 +122,6 @@
         writer.write(np);
     }
 
-#ifdef HAVE_ORACLE
-
     else if (hasOption("oracle"))
     {
 #ifdef HAVE_ORACLE
@@ -155,7 +153,6 @@
         throw configuration_error("libPC not compiled with Oracle support");
 #endif
     }    
-#endif
     else
     {
         libpc::drivers::liblas::LiblasReader reader(*ifs);
diff -r e76335979a24 -r 8a9d50025307 doc/_static/files/2011_Codesprint_libpc_design.pdf
Binary file doc/_static/files/2011_Codesprint_libpc_design.pdf has changed
diff -r e76335979a24 -r 8a9d50025307 doc/_static/files/2011_Codesprint_libpc_implementation.pdf
Binary file doc/_static/files/2011_Codesprint_libpc_implementation.pdf has changed
diff -r e76335979a24 -r 8a9d50025307 doc/sprint/libpc-design.pptx
Binary file doc/sprint/libpc-design.pptx has changed
diff -r e76335979a24 -r 8a9d50025307 doc/sprint/libpc-implementation.pptx
Binary file doc/sprint/libpc-implementation.pptx has changed
diff -r e76335979a24 -r 8a9d50025307 doc/sprint/notes.txt
--- a/doc/sprint/notes.txt	Fri Mar 18 11:19:49 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-.. _sprint_notes:
-
-==============================================================================
-Montreal Sprint Notes
-==============================================================================
-
-* website
-
-* documentation format for headers
-
-* unit tests for CL apps
-
-* pcinfo tool - basic support
-
-* CL mssgs to stdout or stderr?  usage/help/error
-
-* platform macros -- LIBPC_OS_WIN32, etc
-
-* dump routines -- every class needs oper<<, dump()
-
-* build swig bindings from CMake
-  
-* typedef boost::uint32_t uint32_t ?
-
-* isolate strings for error messages (anywhere else?)
-
-* implement Signaller support in Stage
-
-* the "Capabilities" issue
-
-* the PointData templating issue
-
-* the sequential-or-random-reads issue
-
-* do we need Header class?
-
-* does Boost give math class support for Range, Vector, Bounds?
-
-* bitfields in Dimensions?
-
-* MG4/Lidar driver support, inc. CMake detection
-
-* Text driver
-
-* BAG driver
-
-* octtree for libpc::Stage
-
-* finish native las and liblas drivers
-
-* implement metadata/VLR support
-
-* implement spatial referencing support
-
-* update Notes to match realities
-
-* discuss funding opportunities
-
-* in-place writer ability, breaks model
diff -r e76335979a24 -r 8a9d50025307 mpg-config.bat
--- a/mpg-config.bat	Fri Mar 18 11:19:49 2011 -0500
+++ b/mpg-config.bat	Mon Mar 21 17:53:47 2011 -0700
@@ -3,13 +3,13 @@
 set COMPILER="Visual Studio 10 Win64"
 set COMPILER="Visual Studio 10"
 
-set LIBPC_DIR=c:\dev\libpc
+set LIBPC_DIR=d:\dev\libpc
 
-set LIBLAS_DIR=c:\dev\liblas
-set LASZIP_DIR=c:\dev\laszip
+set LIBLAS_DIR=d:\dev\liblas
+set LASZIP_DIR=d:\dev\laszip
 set OSGEO4W_DIR=C:\OSGeo4W
 set OSGEO4W_GDAL=C:\OSGeo4W\apps\gdal-17
-set BOOST_DIR="C:\Utils\boost_pro_1_44_win32"
+set BOOST_DIR="C:\Utils\boost_1_45_0-win32"
 set ORACLE_HOME=%OSGEO4W_DIR%
 
 set BUILD_TYPE=Release
@@ -17,9 +17,9 @@
 
 cmake -G %COMPILER% ^
     -DBOOST_INCLUDEDIR=%BOOST_DIR% ^
-    -DWITH_GDAL=OFF ^
-    -DWITH_GEOTIFF=OFF ^
-    -DWITH_ORACLE=OFF ^
+    -DWITH_GDAL=ON ^
+    -DWITH_GEOTIFF=ON ^
+    -DWITH_ORACLE=ON ^
     -DWITH_LASZIP=ON ^
     -DWITH_LIBLAS=ON ^
     -DGDAL_INCLUDE_DIR=%OSGEO4W_GDAL%\include ^
@@ -38,4 +38,4 @@
     -DCMAKE_VERBOSE_MAKEFILE=OFF ^
     %LIBPC_DIR%
 
-set LIBPC_SWIG_BOOST_HOME=C:\Utils\boost_1_44_win32
+set LIBPC_SWIG_BOOST_HOME=C:\Utils\boost_1_45_0-win32


More information about the Liblas-commits mailing list