Skip to content

Commit c540a23

Browse files
committed
Merge branch 'main' of github.com:PDAL/python
2 parents 4f36e7e + 55727d3 commit c540a23

File tree

3 files changed

+49
-3
lines changed

3 files changed

+49
-3
lines changed

src/pdal/PyArray.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
#pragma once
3636

37+
#include "export.hpp"
3738
#include <pdal/PointView.hpp>
3839

3940
#define NPY_TARGET_VERSION NPY_1_22_API_VERSION
@@ -60,7 +61,7 @@ class ArrayIter;
6061

6162
using ArrayStreamHandler = std::function<int64_t()>;
6263

63-
class PDAL_DLL Array
64+
class PDAL_EXPORT Array
6465
{
6566
public:
6667
using Shape = std::array<size_t, 3>;
@@ -89,7 +90,7 @@ class PDAL_DLL Array
8990
};
9091

9192

92-
class PDAL_DLL ArrayIter
93+
class PDAL_EXPORT ArrayIter
9394
{
9495
public:
9596
ArrayIter(const ArrayIter&) = delete;

src/pdal/PyPipeline.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
#pragma once
3636

37+
#include "export.hpp"
3738
#include <pdal/PipelineManager.hpp>
3839

3940
#define NPY_TARGET_VERSION NPY_1_22_API_VERSION
@@ -55,7 +56,7 @@ PyArrayObject* meshToNumpyArray(const TriangularMesh* mesh);
5556

5657
class Array;
5758

58-
class PDAL_DLL PipelineExecutor {
59+
class PDAL_EXPORT PipelineExecutor {
5960
public:
6061
PipelineExecutor(std::string const& json, std::vector<std::shared_ptr<Array>> arrays, int level);
6162
virtual ~PipelineExecutor() = default;

src/pdal/export.hpp

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/******************************************************************************
2+
* Copyright (c) 2025, Hobu Inc. ([email protected])
3+
*
4+
* All rights reserved.
5+
*
6+
* Redistribution and use in source and binary forms, with or without
7+
* modification, are permitted provided that the following
8+
* conditions are met:
9+
*
10+
* * Redistributions of source code must retain the above copyright
11+
* notice, this list of conditions and the following disclaimer.
12+
* * Redistributions in binary form must reproduce the above copyright
13+
* notice, this list of conditions and the following disclaimer in
14+
* the documentation and/or other materials provided
15+
* with the distribution.
16+
* * Neither the name of Hobu, Inc. nor the
17+
* names of its contributors may be used to endorse or promote
18+
* products derived from this software without specific prior
19+
* written permission.
20+
*
21+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
22+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
23+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
24+
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
25+
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
26+
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
27+
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
28+
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
29+
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
30+
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
31+
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
32+
* OF SUCH DAMAGE.
33+
****************************************************************************/
34+
35+
36+
#include <pdal/util/pdal_util_export.hpp>
37+
38+
#ifndef PDAL_EXPORT
39+
# define PDAL_EXPORT PDAL_DLL
40+
#endif
41+
42+
#ifndef PDAL_DLL
43+
# define PDAL_DLL PDAL_EXPORT
44+
#endif

0 commit comments

Comments
 (0)