vapor/vapor.patch

   1 --- include/vapor/MyBase.h~     2009-06-05 23:19:28.000000000 +0600
   2 +++ include/vapor/MyBase.h      2009-11-12 15:59:20.299151873 +0500
   3 @@ -38,6 +38,7 @@
   4  #include <string>
   5  #include <cstring>
   6  #include <vector>
   7 +#include <cstdarg>
   8  #include "vaporinternal/common.h"
   9
  10  #ifdef WIN32
  11 --- lib/vdf/WRF.cpp~    2009-11-12 16:03:55.572457807 +0500
  12 +++ lib/vdf/WRF.cpp     2009-11-12 16:04:17.365791593 +0500
  13 @@ -7,6 +7,7 @@
  14  #include <sstream>
  15  #include <ctime>
  16  #include <netcdf.h>
  17 +#include <cstdio>
  18  #include "assert.h"
  19
  20  #include <vapor/CFuncs.h>
  21 --- apps/vaporversion/vaporversion.cpp~ 2009-11-12 16:13:26.613164858 +0500
  22 +++ apps/vaporversion/vaporversion.cpp  2009-11-12 16:14:00.329065292 +0500
  23 @@ -26,6 +26,7 @@
  24  #include <vector>
  25  #include <sstream>
  26  #include <cerrno>
  27 +#include <cstdio>
  28
  29  #include <vapor/CFuncs.h>
  30  #include <vapor/OptionParser.h>
  31 --- apps/wrfvdfcreate/wrfvdfcreate.cpp~ 2009-11-12 16:23:54.515671981 +0500
  32 +++ apps/wrfvdfcreate/wrfvdfcreate.cpp  2009-11-12 16:25:06.102332762 +0500
  33 @@ -4,6 +4,7 @@
  34  #include <sstream>
  35  #include <algorithm>
  36  #include <netcdf.h>
  37 +#include <cstdio>
  38  #include "proj_api.h"
  39  #include <vapor/CFuncs.h>
  40  #include <vapor/OptionParser.h>
  41 --- apps/vdfedit/vdfedit.cpp~   2009-11-12 16:33:42.272279155 +0500
  42 +++ apps/vdfedit/vdfedit.cpp    2009-11-12 16:33:56.772281223 +0500
  43 @@ -26,6 +26,7 @@
  44  #include <sstream>
  45  #include <algorithm>
  46  #include <netcdf.h>
  47 +#include <cstdio>
  48
  49  #include <vapor/CFuncs.h>
  50  #include <vapor/OptionParser.h>
  51 --- apps/tiff2geotiff/tiff2geotiff.cpp~ 2009-11-12 16:40:59.735569530 +0500
  52 +++ apps/tiff2geotiff/tiff2geotiff.cpp  2009-11-12 16:41:04.282236044 +0500
  53 @@ -519,7 +519,7 @@
  54      else if (streq(opt, "packbits"))
  55          defcompression = COMPRESSION_PACKBITS;
  56      else if (strneq(opt, "jpeg", 4)) {
  57 -        char* cp = strchr(opt, ':');
  58 +        const char* cp = strchr(opt, ':');
  59          if (cp && isdigit(cp[1]))
  60              quality = atoi(cp+1);
  61          if (cp && strchr(cp, 'r'))
  62 @@ -531,12 +531,12 @@
  63      } else if (streq(opt, "g4"))
  64          defcompression = COMPRESSION_CCITTFAX4;
  65      else if (strneq(opt, "lzw", 3)) {
  66 -        char* cp = strchr(opt, ':');
  67 +        const char* cp = strchr(opt, ':');
  68          if (cp)
  69              defpredictor = atoi(cp+1);
  70          defcompression = COMPRESSION_LZW;
  71      } else if (strneq(opt, "zip", 3)) {
  72 -        char* cp = strchr(opt, ':');
  73 +        const char* cp = strchr(opt, ':');
  74          if (cp)
  75              defpredictor = atoi(cp+1);
  76          defcompression = COMPRESSION_DEFLATE;
  77 --- apps/tiff2geotiff/getopt.cpp~       2009-11-12 16:47:16.578865102 +0500
  78 +++ apps/tiff2geotiff/getopt.cpp        2009-11-12 16:50:57.935509746 +0500
  79 @@ -55,7 +55,7 @@
  80  getopt(int nargc, char** nargv, const char* ostr)
  81  {
  82         const static char *place = EMSG;                /* option letter processing */
  83 -       register char *oli;                     /* option letter list index */
  84 +       const register char *oli;                       /* option letter list index */
  85         char *p;
  86
  87         if (!*place) {                          /* update scanning pointer */
  88 --- apps/flashamr2vdf/flashhdf5.cpp     2009-11-12 16:59:30.645458489 +0500
  89 +++ apps/flashamr2vdf/flashhdf5.cpp~    2009-11-12 16:53:47.738825775 +0500
  90 @@ -141,7 +141,7 @@
  91      memspace = H5Screate_simple(rank, &dimens_1d, NULL);
  92         if (memspace < 0) return(-1);
  93
  94 -    dataset = H5Dopen(_datasetId, "gid");
  95 +    dataset = H5Dopen(_datasetId, "gid", 0);
  96         if (dataset < 0) return(-1);
  97      herr_t status  = H5Dread(dataset, H5T_NATIVE_INT, memspace, dataspace,
  98                       H5P_DEFAULT, gids);
  99 @@ -196,7 +196,7 @@
 100      memspace = H5Screate_simple(rank, &dimens_1d, NULL);
 101         if (memspace < 0) return(-1);
 102
 103 -    dataset = H5Dopen(_datasetId, "gid");
 104 +    dataset = H5Dopen(_datasetId, "gid", 0);
 105         if (dataset < 0) return(-1);
 106      herr_t status  = H5Dread(dataset, H5T_NATIVE_INT, memspace, dataspace,
 107                       H5P_DEFAULT, gids);
 108 @@ -254,7 +254,7 @@
 109      memspace = H5Screate_simple(rank, &dimens_1d, NULL);
 110         if (memspace < 0) return(-1);
 111
 112 -    dataset = H5Dopen(_datasetId, "bounding box");
 113 +    dataset = H5Dopen(_datasetId, "bounding box", 0);
 114         if (dataset < 0) return(-1);
 115      herr_t status  = H5Dread(dataset, H5T_NATIVE_FLOAT, memspace, dataspace,
 116                       H5P_DEFAULT, bboxes);
 117 @@ -333,7 +333,7 @@
 118      memspace = H5Screate_simple(rank, &dimens_1d, NULL);
 119
 120      /* create the dataset from scratch only if this is our first time */
 121 -    dataset = H5Dopen(_datasetId, "node type");
 122 +    dataset = H5Dopen(_datasetId, "node type", 0);
 123         if (dataset <  0) return(-1);
 124      herr_t status  = H5Dread(dataset, H5T_NATIVE_INT, memspace, dataspace,
 125                       H5P_DEFAULT, (void *)&ntype);
 126 @@ -382,7 +382,7 @@
 127         if (memspace < 0) return(-1);
 128
 129      /* create the dataset from scratch only if this is our first time */
 130 -    dataset = H5Dopen(_datasetId, "refine level");
 131 +    dataset = H5Dopen(_datasetId, "refine level", 0);
 132         if (dataset < 0) return(-1);
 133      herr_t status  = H5Dread(dataset, H5T_NATIVE_INT, memspace, dataspace,
 134                       H5P_DEFAULT, (void *)refine_levels);
 135 @@ -431,7 +431,7 @@
 136         if (memspace < 0) return(-1);
 137
 138      /* create the dataset from scratch only if this is our first time */
 139 -    dataset = H5Dopen(_datasetId, "refine level");
 140 +    dataset = H5Dopen(_datasetId, "refine level", 0);
 141         if (dataset < 0) return(-1);
 142      herr_t status  = H5Dread(dataset, H5T_NATIVE_INT, memspace, dataspace,
 143                       H5P_DEFAULT, (void *)&refinelevel);
 144 @@ -548,7 +548,7 @@
 145                                start_4d, stride_4d, count_4d, NULL);
 146         if (ierr < 0) return(-1);
 147
 148 -    dataset = H5Dopen(_datasetId,flash_var_name);
 149 +    dataset = H5Dopen(_datasetId,flash_var_name, 0);
 150         if (dataset < 0) return(-1);
 151      herr_t status  = H5Dread(dataset, H5T_NATIVE_FLOAT, memspace, dataspace,
 152                       H5P_DEFAULT, variable);
 153 @@ -679,7 +679,7 @@
 154      memspace = H5Screate_simple(rank, &dimens_1d, NULL);
 155         if (memspace < 0) return(-1);
 156
 157 -    dataset = H5Dopen(_datasetId, "coordinates");
 158 +    dataset = H5Dopen(_datasetId, "coordinates", 0);
 159         if (dataset < 0) return(-1);
 160      herr_t status  = H5Dread(dataset, H5T_NATIVE_DOUBLE, memspace, dataspace,
 161                       H5P_DEFAULT, coord);
 162 @@ -740,7 +740,7 @@
 163      memspace = H5Screate_simple(rank, &dimens_1d, NULL);
 164         if (memspace < 0) return(-1);
 165
 166 -    dataset = H5Dopen(_datasetId, "block size");
 167 +    dataset = H5Dopen(_datasetId, "block size", 0);
 168         if (dataset < 0) return(-1);
 169      herr_t status  = H5Dread(dataset, H5T_NATIVE_DOUBLE, memspace, dataspace,
 170                       H5P_DEFAULT, size);
 171 @@ -768,7 +768,7 @@
 172
 173      /* manually set the string size */
 174
 175 -    hid_t dataset = H5Dopen(_datasetId, "unknown names");
 176 +    hid_t dataset = H5Dopen(_datasetId, "unknown names", 0);
 177         if (dataset < 0) return(-1);
 178      hid_t dataspace = H5Dget_space(dataset);
 179         if (dataspace < 0) return(-1);
 180 @@ -824,7 +824,7 @@
 181
 182         hid_t sp_type;
 183
 184 -       hid_t dataset = H5Dopen(_datasetId, "simulation parameters");
 185 +       hid_t dataset = H5Dopen(_datasetId, "simulation parameters", 0);
 186         if (dataset < 0) return(-1);
 187
 188         /* create the HDF 5 compound data type to describe the record */
 189 @@ -893,7 +893,7 @@
 190
 191         int_scalars_t *int_scalars = NULL;
 192
 193 -       hid_t dataset = H5Dopen(_datasetId, "integer scalars");
 194 +       hid_t dataset = H5Dopen(_datasetId, "integer scalars", 0);
 195         if (dataset < 0) return(-1);
 196
 197      hid_t dataspace = H5Dget_space(dataset);
 198 @@ -964,7 +964,7 @@
 199
 200         real_scalars_t *real_scalars = NULL;
 201
 202 -       dataset = H5Dopen(_datasetId, "real scalars");
 203 +       dataset = H5Dopen(_datasetId, "real scalars", 0);
 204         if (dataset < 0) return(-1);
 205
 206      dataspace = H5Dget_space(dataset);
 207 @@ -1035,7 +1035,7 @@
 208
 209         run_params_t *run_params = NULL;
 210
 211 -       hid_t dataset = H5Dopen(_datasetId, "integer runtime parameters");
 212 +       hid_t dataset = H5Dopen(_datasetId, "integer runtime parameters", 0);
 213         if (dataset < 0) return(-1);
 214
 215      hid_t dataspace = H5Dget_space(dataset);
 216 @@ -1114,7 +1114,7 @@
 217
 218         run_params_t *run_params = NULL;
 219
 220 -       hid_t dataset = H5Dopen(_datasetId, "real runtime parameters");
 221 +       hid_t dataset = H5Dopen(_datasetId, "real runtime parameters", 0);
 222         if (dataset < 0) return(-1);
 223
 224      hid_t dataspace = H5Dget_space(dataset);
 225 @@ -1194,7 +1194,7 @@
 226
 227         run_params_t *run_params = NULL;
 228
 229 -       hid_t dataset = H5Dopen(_datasetId, "string runtime parameters");
 230 +       hid_t dataset = H5Dopen(_datasetId, "string runtime parameters", 0);
 231         if (dataset < 0) return(-1);
 232
 233      hid_t dataspace = H5Dget_space(dataset);