Revision: 70073
http://sourceforge.net/p/brlcad/code/70073
Author: starseeker
Date: 2017-08-10 21:40:14 +0000 (Thu, 10 Aug 2017)
Log Message:
-----------
Let's see if we can avoid using private GDAL headers.
Modified Paths:
--------------
brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp
Modified: brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp
===================================================================
--- brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp 2017-08-10 17:57:37 UTC
(rev 70072)
+++ brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp 2017-08-10 21:40:14 UTC
(rev 70073)
@@ -43,7 +43,7 @@
/* GDAL headers */
#include <gdal.h>
-#include <gdal_priv.h> // GDALDataset
+#include <gdal_utils.h>
#include <cpl_conv.h>
#include <ogr_spatialref.h>
@@ -51,9 +51,21 @@
#include "gcv/api.h"
#include "gcv/util.h"
-struct gdal_state {
+struct gdal_read_options
+{
+ const char *t_srs;
+ const char *fmt;
+};
+
+struct conversion_state {
+ const struct gcv_opts *gcv_options;
+ const struct gdal_read_options *ops;
+ const char *input_file;
+ struct rt_wdb *wdbp;
+
+ /* GDAL state */
OGRSpatialReference *sp;
- GDALDataset *dataset;
+ GDALDatasetH hDataset;
bool info;
bool debug;
int scalex;
@@ -66,12 +78,17 @@
};
HIDDEN void
-gdal_state_init(struct gdal_state *gs)
+gdal_state_init(struct conversion_state *gs)
{
int i = 0;
if(!gs) return;
+ gs->gcv_options = NULL;
+ gs->ops = NULL;
+ gs->input_file = NULL;
+ gs->wdbp = RT_WDB_NULL;
+
gs->sp = NULL;
- gs->dataset = NULL;
+ gs->hDataset = NULL;
gs->info = false;
gs->debug = false;
gs->scalex = 1;
@@ -83,186 +100,37 @@
gs->pixsize = 512 * 3;
}
-std::string
-_gdal_get_spaces(const int n)
+HIDDEN int
+get_dataset_info(struct conversion_state *gs)
{
- std::string s("");
- for (int i = 0; i < n; ++i) s += " ";
- return s;
+ char *gdal_info = GDALInfo(gs->hDataset, NULL);
+ if(gdal_info) bu_log("%s", gdal_info);
+ CPLFree(gdal_info);
+ return 0;
}
-void
-_gdal_show_node_and_children(const OGRSpatialReference* sp,
- const OGR_SRSNode* parent, const char* pname, const int level)
-{
- std::string spaces = _gdal_get_spaces(level);
- int nc = parent->GetChildCount();
- printf(" %s%s [%d children]:\n", spaces.c_str(), pname, nc);
- for (int j = 0; j < nc; ++j) {
- const char* cname = sp->GetAttrValue(pname, j);
- // the child may be a parent
- const OGR_SRSNode* cnode = sp->GetAttrNode(cname);
- if (cnode) {
- _gdal_show_node_and_children(sp, cnode, cname, level+1);
- } else {
- bu_log(" %d: '%s'\n", j, cname);
- }
- }
-}
-
HIDDEN int
-get_dataset_info(struct gdal_state *gs)
+gdal_read(struct gcv_context *context, const struct gcv_opts *gcv_options,
+ const void *options_data, const char *source_path)
{
- // Getting Dataset Information
- // ---------------------------
- //
- // As described in the GDAL Data Model, a GDALDataset contains a
- // list of raster bands, all pertaining to the same area, and having
- // the same resolution. It also has metadata, a coordinate system, a
- // georeferencing transform, size of raster and various other
- // information.
+ struct conversion_state *state;
+ BU_GET(state, struct conversion_state);
+ gdal_state_init(state);
+ state->gcv_options = gcv_options;
+ state->ops = (struct gdal_read_options *)options_data;
+ state->input_file = source_path;
+ state->wdbp = context->dbip->dbi_wdbp;
- // adfGeoTransform[0] /* top left x */
- // adfGeoTransform[1] /* w-e pixel resolution */
- // adfGeoTransform[2] /* rotation, 0 if image is "north up" */
- // adfGeoTransform[3] /* top left y */
- // adfGeoTransform[4] /* rotation, 0 if image is "north up" */
- // adfGeoTransform[5] /* n-s pixel resolution */
-
- // If we wanted to print some general information about the dataset
- // we might do the following:
-
- if (gs->dataset->GetGeoTransform(gs->adfGeoTransform) == CE_None) {
- if (gs->info) {
- printf("Origin = (%.6f,%.6f)\n", gs->adfGeoTransform[0],
gs->adfGeoTransform[3]);
- printf("Pixel Size = (%.6f,%.6f)\n", gs->adfGeoTransform[1],
gs->adfGeoTransform[5]);
- }
- }
-
- gs->scalex = static_cast<int>(floor(gs->adfGeoTransform[1]));
- gs->scaley = static_cast<int>(floor(gs->adfGeoTransform[5]));
- // use negative of scaley since we reverse the output
- gs->scaley *= -1;
-
- if (!gs->info && (gs->scalex != gs->scaley)) {
- bu_log("FATAL: cell scale x (%d) != cell scale y (%d)\n", gs->scalex,
gs->scaley);
+ state->hDataset = GDALOpenEx(source_path, GDAL_OF_READONLY |
GDAL_OF_VERBOSE_ERROR, NULL, NULL, NULL);
+ if (!state->hDataset) {
+ bu_log("GDAL Reader: error opening input file %s\n", source_path);
+ BU_PUT(state, struct conversion_state);
return -1;
}
- gs->scalez = 1;
- // check scalez
- if (gs->dataset->GetProjectionRef()) {
- const char* s = gs->dataset->GetProjectionRef();
- if (!gs->sp) gs->sp = new OGRSpatialReference(s);
- std::string unit(gs->sp->GetAttrValue("UNIT", 0));
- if (unit != "Meter") {
- bu_log("FATAL: Cell unit is '%s' instead of 'Meter'.\n",
unit.c_str());
- return -1;
- }
- else {
- int val = 0;
- const char *uval = gs->sp->GetAttrValue("UNIT", 1);
- (void)bu_opt_int(NULL, 1, &uval, (void *)(&val));
- if (val != 1) {
- bu_log("FATAL: Cell z scale is '%d' instead of '1'.\n", val);
- return -1;
- }
- }
- }
+ GDALClose(state->hDataset);
- if (gs->info) {
- char** flist2 = gs->dataset->GetFileList();
- CPLStringList flist(flist2, false);
- int nf = flist.size();
- if (nf) {
- bu_log("Data set files:\n");
- for (int i = 0; i < nf; ++i) {
- const CPLString& s = flist[i];
- bu_log(" %s\n", s.c_str());
- }
- }
- CSLDestroy(flist2);
-
- char** dlist2 = gs->dataset->GetMetadata();
- CPLStringList dlist(dlist2, false);
- int nd = dlist.size();
- if (nd) {
- bu_log("Dataset Metadata:\n");
- for (int i = 0; i < nd; ++i) {
- const CPLString& d = dlist[i];
- bu_log(" %s\n", d.c_str());
- }
- }
-
- GDALDriver* driver = gs->dataset->GetDriver();
-
- char** mlist2 = driver->GetMetadata();
- CPLStringList mlist(mlist2, false);
- int nm = mlist.size();
- if (nm) {
- bu_log("Driver Metadata:\n");
- for (int i = 0; i < nm; ++i) {
- const CPLString& m = mlist[i];
- bu_log(" %s\n", m.c_str());
- }
- }
-
- bu_log("Driver: %s/%s\n", driver->GetDescription(),
driver->GetMetadataItem(GDAL_DMD_LONGNAME));
- bu_log("Size is %dx%dx%d\n", gs->dataset->GetRasterXSize(),
gs->dataset->GetRasterYSize(), gs->dataset->GetRasterCount());
-
- if (gs->dataset->GetProjectionRef()) {
- const char* s = gs->dataset->GetProjectionRef();
- if (!gs->sp)
- gs->sp = new OGRSpatialReference(s);
-
- std::vector<std::string> nodes;
- nodes.push_back("PROJCS");
- nodes.push_back("GEOGCS");
- nodes.push_back("DATUM");
- nodes.push_back("SPHEROID");
- nodes.push_back("PROJECTION");
-
- bu_log("Projection is:\n");
-
- for (unsigned i = 0; i < nodes.size(); ++i) {
- const char* name = nodes[i].c_str();
- const OGR_SRSNode* node = gs->sp->GetAttrNode(name);
- if (!node) {
- bu_log(" %s (NULL)\n", name);
- continue;
- }
- int level = 0;
- _gdal_show_node_and_children(gs->sp, node, name, level); //
recursive
- }
-
- /*
- const char* projcs = sp.GetAttrNode("PROJCS");
-
- const char* geogcs = sp.GetAttrValue("GEOGCS");
- const char* datum = sp.GetAttrValue("DATUM");
- const char* spheroid = sp.GetAttrValue("SPHEROID");
- const char* project = sp.GetAttrValue("PROJECTION");
-
- printf(" %s\n", projcs);
- printf(" %s\n", geogcs);
- printf(" %s\n", datum);
- printf(" %s\n", spheroid);
- printf(" %s\n", project);
-
- */
- //printf("Projection is '%s'\n", dataset->GetProjectionRef());
- }
-
- }
- return 0;
-}
-
-
-HIDDEN int
-gdal_read(struct gcv_context *UNUSED(context), const struct gcv_opts
*UNUSED(gcv_options),
- const void *UNUSED(options_data), const char
*UNUSED(dest_path))
-{
return 1;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
