[GRASS-SVN] r54879 - grass/branches/develbranch_6/lib/ogsf

[svn_grass at osgeo.org]

Author: mmetz
Date: 2013-02-03 11:48:29 -0800 (Sun, 03 Feb 2013)
New Revision: 54879

Modified:
   grass/branches/develbranch_6/lib/ogsf/gvl_calc.c
Log:
ogsf lib: disable gvl_align_data()

Modified: grass/branches/develbranch_6/lib/ogsf/gvl_calc.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/gvl_calc.c	2013-02-03 19:45:47 UTC (rev 54878)
+++ grass/branches/develbranch_6/lib/ogsf/gvl_calc.c	2013-02-03 19:48:29 UTC (rev 54879)
@@ -681,7 +681,7 @@
 			       dbuff[i].num_zero);
 
 	    G_free(isosurf->data);
-	    gvl_align_data(dbuff[i].ndx_new, dbuff[i].new);
+	    /* gvl_align_data(dbuff[i].ndx_new, dbuff[i].new); */
 	    isosurf->data = dbuff[i].new;
 	    isosurf->data_desc = 0;
 	}
@@ -770,6 +770,12 @@
  */
 void gvl_align_data(int pos, unsigned char *data)
 {
+    /* WARNING: wrong pointer usage
+     * this function needs **data, not *data,
+     * and if pos == 0, data must be set to NULL,
+     * thus: */
+    return;
+
     /* realloc memory to fit in data length */
     data = (char *)G_realloc(data, sizeof(char) * pos);	/* G_fatal_error */
     if (!data) {
@@ -1006,7 +1012,7 @@
 
     /* end reading volume file */
     gvl_file_end_read(vf);
-    gvl_align_data(pos, slice->data);
+    /* gvl_align_data(pos, slice->data); */
 
     return (1);
 }