Skip to content

Commit

Permalink
drop nanoarrow import
Browse files Browse the repository at this point in the history
  • Loading branch information
mdsumner committed Jun 1, 2024
1 parent 3b08c6a commit ba36780
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ LazyData: true
LinkingTo: Rcpp
Imports:
jsonlite,
nanoarrow,
Rcpp,
utils
RoxygenNote: 7.3.1
Expand Down
2 changes: 1 addition & 1 deletion inst/include/gdalapplib/gdalapplib.h
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ inline List gdalwarp_applib(CharacterVector source_filename,
inline CharacterVector gdalbuildvrt_applib(std::vector<std::string> dsn,
std::vector<std::string> options) {
CharacterVector out(1);
int err;

GDALBuildVRTOptions* opt = GDALBuildVRTOptionsNew(string_to_charptr(options).data(), nullptr);
GDALDataset *vrt = (GDALDataset*)GDALBuildVRT("", dsn.size(), nullptr, string_to_charptr(dsn).data(), opt, &err);
out[0] = vrt->GetMetadata("xml:VRT")[0];
Expand Down
4 changes: 2 additions & 2 deletions inst/include/gdallibrary/gdallibrary.h
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ inline List gdal_read_geometry(CharacterVector dsn,
}


int warncount = 0;
//int warncount = 0;
while( (poFeature = poLayer->GetNextFeature()) != NULL )
{

Expand All @@ -543,7 +543,7 @@ inline List gdal_read_geometry(CharacterVector dsn,
OGRGeometry *poGeometry;
poGeometry = poFeature->GetGeometryRef();
if (poGeometry == NULL) {
warncount++;
//warncount++;
feature_xx.push_back(R_NilValue);
//if (warncount == 1) Rcpp::warning("at least one geometry is NULL, perhaps the 'sql' argument excludes the native geometry?\n(use 'SELECT * FROM ..') ");
} else {
Expand Down
2 changes: 1 addition & 1 deletion inst/include/gdalwarpgeneral/gdalwarpgeneral.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ inline List gdal_warp_general(CharacterVector dsn,
auto psOptions = GDALWarpAppOptionsNew(papszArg, nullptr);
CSLDestroy(papszArg);
GDALWarpAppOptionsSetProgress(psOptions, NULL, NULL );

Rprintf("about to warp\n");

GDALDatasetH hRet = GDALWarp(dsn_outname[0], nullptr,
static_cast<int>(dsn.size()), poSrcDS,
Expand Down

0 comments on commit ba36780

Please sign in to comment.