Changeset: f0b9b7250964 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0b9b7250964
Modified Files:
sql/backends/monet5/vaults/geotiff/geotiff.c
Branch: SciQL-2
Log Message:
commented the lines that were giving compilation errors. GEOTIFF does not work
anymore
diffs (86 lines):
diff --git a/sql/backends/monet5/vaults/geotiff/geotiff.c
b/sql/backends/monet5/vaults/geotiff/geotiff.c
--- a/sql/backends/monet5/vaults/geotiff/geotiff.c
+++ b/sql/backends/monet5/vaults/geotiff/geotiff.c
@@ -70,9 +70,11 @@ GTIFFattach(Client cntxt, MalBlkPtr mb,
str msg = MAL_SUCCEED;
str fname = *(str*)getArgReference(stk, pci, 1);
TIFF *tif = (TIFF*)0; /* TIFF-level descriptor */
- char buf[BUFSIZ], *s= buf;
+//FOT: char buf[BUFSIZ];
+//FOT: char *s= buf;
int wid = 0, len = 0;
- oid fid, imid, rid = oid_nil;
+//FOT: oid fid, imid;
+ oid rid = oid_nil;
sht bps;
msg = getSQLContext(cntxt, mb, &m, NULL);
@@ -102,23 +104,23 @@ GTIFFattach(Client cntxt, MalBlkPtr mb,
/* add row in the rs.files catalog table */
col = mvc_bind_column(m, fls, "fileid");
- fid = store_funcs.count_col(col, 1) + 1;
+//FOT: fid = store_funcs.count_col(col, 1) + 1;
- snprintf(buf, BUFSIZ, INSFILE, (int)fid, fname, 0);
- if ( ( msg = SQLstatementIntern(cntxt,&s,"geotiff.attach",TRUE,FALSE))
!= MAL_SUCCEED)
- goto finish;
+//FOT: snprintf(buf, BUFSIZ, INSFILE, (int)fid, fname, 0);
+//FOT: if ( ( msg = SQLstatementIntern(cntxt,&s,"geotiff.attach",TRUE,FALSE))
!= MAL_SUCCEED)
+//FOT: goto finish;
/* add row in the rs.catalog catalog table */
col = mvc_bind_column(m, cat, "imageid");
- imid = store_funcs.count_col(col, 1) + 1;
+//FOT: imid = store_funcs.count_col(col, 1) + 1;
TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &wid);
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &len);
TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &bps);
- snprintf(buf, BUFSIZ, INSCAT, (int)imid, (int)fid, wid, len, bps);
- msg = SQLstatementIntern(cntxt,&s,"geotiff.attach",TRUE,FALSE);
+//FOT: snprintf(buf, BUFSIZ, INSCAT, (int)imid, (int)fid, wid, len, bps);
+//FOT: msg = SQLstatementIntern(cntxt,&s,"geotiff.attach",TRUE,FALSE);
-finish:
+//FOT: finish:
/* if (msg != MAL_SUCCEED){
snprintf(buf, BUFSIZ,"ROLLBACK;");
SQLstatementIntern(cntxt,&s,"geotiff.attach",TRUE,FALSE));
@@ -189,7 +191,7 @@ GTIFFloadGreyscaleImage(bat *x, bat *y,
{
sht *data_sht = NULL;
- MALLOC_CHECK(sht, wid);
+//FOT: MALLOC_CHECK(sht, wid);
data_sht = (sht *)Tloc(resI, BUNfirst(resI));
/* Read image line-wise and turn GeoTIFF's row-major order
@@ -209,7 +211,7 @@ GTIFFloadGreyscaleImage(bat *x, bat *y,
{
int *data_int = NULL;
- MALLOC_CHECK(int, wid*2);
+//FOT: MALLOC_CHECK(int, wid*2);
data_int = (int *)Tloc(resI, BUNfirst(resI));
/* Read image line-wise and turn GeoTIFF's row-major order
@@ -296,7 +298,8 @@ GTIFFimportImage(Client cntxt, MalBlkPtr
int imageid = *(int*)getArgReference(stk, pci, 1);
int wid = 0, len = 0, fid;
sht bps;
- char aname[20], buf[BUFSIZ], *s = buf;
+ char aname[20], buf[BUFSIZ];
+//FOT: char *s = buf;
bte stat = 0;
bat x, y, intensity;
BAT *bx, *by, *bi;
@@ -367,7 +370,7 @@ GTIFFimportImage(Client cntxt, MalBlkPtr
dimtype = "INT";
}
snprintf(buf, BUFSIZ, CRT_GREYSCALE_IMAGE, sch->base.name, aname,
dimtype, wid, dimtype, len, (bps == 8)? "SMALLINT" : "INT");
- msg = SQLstatementIntern(cntxt,&s,"geotiff.import",TRUE,FALSE);
+//FOT: msg = SQLstatementIntern(cntxt,&s,"geotiff.import",TRUE,FALSE);
if (msg != MAL_SUCCEED)
return msg;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
