Skip to content

[pull] master from OSGeo:master #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 11, 2025
Merged

[pull] master from OSGeo:master #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a9bffb
[cli][gdal_contour] Port gdal_contour to gdal cli (#11923)
elpaso Mar 11, 2025
47d4e19
autotest/conftest.py: be robust to -rcX postfix on Curl version such …
rouault Mar 11, 2025
71f9f1d
autotest/conftest.py: be robust to -rcX postfix on Curl version such …
rouault Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion alg/contour.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ CPLErr GDALContourGenerate(GDALRasterBandH hBand, double dfContourInterval,
* vector layer. Also, a NODATA value may be specified to identify pixels
* that should not be considered in contour line generation.
*
* The gdal/apps/gdal_contour.cpp mainline can be used as an example of
* The gdal/apps/gdal_contour_bin.cpp mainline can be used as an example of
* how to use this function.
*
* [1] see https://en.wikipedia.org/wiki/Marching_squares
Expand Down
6 changes: 5 additions & 1 deletion apps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ add_library(
gdalalg_raster_clip.cpp
gdalalg_raster_convert.cpp
gdalalg_raster_edit.cpp
gdalalg_raster_contour.cpp
gdalalg_raster_mosaic.cpp
gdalalg_raster_pipeline.cpp
gdalalg_raster_overview_add.cpp
Expand All @@ -41,6 +42,7 @@ add_library(
gdal_grid_lib.cpp
gdal_translate_lib.cpp
gdal_rasterize_lib.cpp
gdal_contour_lib.cpp
gdalwarp_lib.cpp
commonutils.cpp
ogrinfo_lib.cpp
Expand Down Expand Up @@ -68,6 +70,8 @@ if (GDAL_ENABLE_DRIVER_GTIFF)
target_compile_definitions(appslib PRIVATE -DHAVE_TIFF)
endif()

target_compile_definitions(appslib PUBLIC $<$<CONFIG:DEBUG>:GDAL_DEBUG>)

if (GDAL_USE_JSONC_INTERNAL)
gdal_add_vendored_lib(appslib libjson)
else ()
Expand All @@ -91,7 +95,7 @@ if (BUILD_APPS)
add_executable(gdal_grid gdal_utils_priv.h commonutils.h gdal_grid_bin.cpp)
add_executable(gdal_translate gdal_utils_priv.h commonutils.h gdal_translate_bin.cpp)
add_executable(gdalwarp commonutils.h gdalwarp_bin.cpp)
add_executable(gdal_contour commonutils.h gdal_contour.cpp)
add_executable(gdal_contour gdal_utils_priv.h commonutils.h gdal_contour_bin.cpp)
add_executable(gdalenhance gdalenhance.cpp)
add_executable(gdallocationinfo gdallocationinfo.cpp)
add_executable(gdalmanage gdalmanage.cpp)
Expand Down
Loading
Loading