Skip to content

Commit

Permalink
Review changes for 1.7.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
abellgithub committed May 8, 2018
1 parent 20ff571 commit d813327
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 27 deletions.
2 changes: 1 addition & 1 deletion filters/FerryFilter.cpp
Expand Up @@ -90,7 +90,7 @@ void FerryFilter::addDimensions(PointLayoutPtr layout)
for (auto& info : m_dims)
{
const Dimension::Id fromId = layout->findDim(info.m_fromName);
// Dimensions being created with the "=>Dim" syntax won't have
// Dimensions being created with the "=>Dim" syntax won't
// be in the layout, so we have to assign a default type.
Dimension::Type fromType = layout->dimType(fromId);
if (fromType == Dimension::Type::None)
Expand Down
2 changes: 1 addition & 1 deletion filters/GreedyProjection.hpp
Expand Up @@ -39,7 +39,7 @@

#pragma once

// This is for M_PI on Windows. cmath
// This is for M_PI on Windows.
#define _USE_MATH_DEFINES
#include <math.h>

Expand Down
2 changes: 0 additions & 2 deletions io/LasWriter.cpp
Expand Up @@ -789,8 +789,6 @@ bool LasWriter::processOne(PointRef& point)
// called we know we're in stream mode.
bool LasWriter::processPoint(PointRef& point)
{
//ABELL - Need to do something about auto offset.

if (m_compression == LasCompression::LasZip)
{
if (!writeLasZipBuf(point))
Expand Down
15 changes: 0 additions & 15 deletions scripts/appveyor/config.cmd
Expand Up @@ -5,21 +5,6 @@ REM and install it to C:\pdalbin before letting AppVeyor upload it as
REM an artifact to S3.

SET PDAL_INSTALL_PREFIX="C:/OSGeo4W64/"

REM if "%OSGEO4W_BUILD%"=="ON" (
REM
REM SET PDAL_OPTIONAL_COMPONENTS=ON
REM SET PDAL_PLUGIN_INSTALL_PATH="C:/OSGeo4W64/bin"
REM set PDAL_BUILD_TESTS=OFF
REM
REM ) ELSE (
REM
REM mkdir C:\pdalbin
REM SET PDAL_PLUGIN_INSTALL_PATH="C:\pdalbin"
REM set PDAL_BUILD_TESTS=ON
REM
REM )

SET PDAL_PLUGIN_INSTALL_PATH="C:/OSGeo4W64/bin"
set PDAL_BUILD_TESTS=ON

Expand Down
8 changes: 0 additions & 8 deletions scripts/appveyor/install.cmd
@@ -1,13 +1,5 @@
@echo off


REM if "%OSGEO4W_BUILD%" NEQ "ON" (
REM REM only bother with this for OSGEO4W_BUILD situation
REM echo "Not building OSGeo4W package"
REM exit /b 0
REM )


call %OSGEO4W_ROOT%\bin\o4w_env.bat
call %OSGEO4W_ROOT%\bin\py3_env.bat
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
Expand Down
1 change: 1 addition & 0 deletions test/unit/io/LasWriterTest.cpp
Expand Up @@ -1118,6 +1118,7 @@ TEST(LasWriterTest, oversize_vlr)
}


// Test auto scale/offset for streaming mode.
TEST(LasWriterTest, issue1940)
{
StageFactory f;
Expand Down
1 change: 1 addition & 0 deletions test/unit/io/TextReaderTest.cpp
Expand Up @@ -212,6 +212,7 @@ TEST(TextReaderTest, strip_whitespace_from_dimension_names)
}
}

// Check that space-delimited files work with a CR/LF terminated file.
TEST(TextReaderTest, issue1939)
{
TextReader reader;
Expand Down

0 comments on commit d813327

Please sign in to comment.