[hdf4] 02/10: Merge tag 'upstream/4.2.12'
Bas Couwenberg
sebastic at debian.org
Thu Jun 30 23:23:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository hdf4.
commit e3df6f846e7e6d51fdef9b2dbc2dd2aef3104b40
Merge: 63f1bc8 61cb233
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Jun 30 19:38:22 2016 +0200
Merge tag 'upstream/4.2.12'
Upstream version 4.2.12
CMakeFilters.cmake | 45 +-
CMakeInstallation.cmake | 257 +-
CMakeLists.txt | 197 +-
COPYING | 2 +-
CTestConfig.cmake | 4 +-
MANIFEST | 119 +-
Makefile.am | 8 +-
Makefile.in | 39 +-
README.txt | 59 +-
aclocal.m4 | 13 +
bin/chkmanifest | 48 +-
bin/cmakehdf4 | 4 +-
bin/h4_release_check.sh | 231 ++
bin/h4vers | 2 +-
config/apple | 14 +-
config/cmake/CPack.Info.plist.in | 26 +
config/cmake/ConfigureChecks.cmake | 1 -
config/cmake/FindJNI.cmake | 342 +++
config/cmake/HDF4Macros.cmake | 16 +-
config/cmake/HDF4UseFortran.cmake | 97 +-
config/cmake/HDF4_Examples.cmake.in | 157 +-
config/cmake/README.txt.cmake.in | 29 +-
config/cmake/UseJava.cmake | 1350 +++++++++
config/cmake/UseJavaClassFilelist.cmake | 58 +
config/cmake/UseJavaSymlinks.cmake | 38 +
config/cmake/cacheinit.cmake | 8 +-
config/cmake/h4config.h.in | 6 -
config/cmake/hdf4-config-version.cmake.in | 52 +-
config/cmake/hdf4-config.cmake.build.in | 61 -
config/cmake/hdf4-config.cmake.in | 148 +
config/cmake/hdf4-config.cmake.install.in | 71 -
.../runTest.cmake => cmake/jrunTest.cmake} | 199 +-
config/cmake/libhdf4.settings.cmake.in | 5 +-
config/cmake/patch.xml | 11 +
config/cmake_ext_mod/CPack.Info.plist.in | 32 -
config/cmake_ext_mod/ConfigureChecks.cmake | 152 +-
config/cmake_ext_mod/FindSZIP.cmake | 7 -
config/cmake_ext_mod/HDFLibMacros.cmake | 145 +-
config/cmake_ext_mod/HDFMacros.cmake | 133 +-
config/cmake_ext_mod/HDFTests.c | 44 +-
config/cmake_ext_mod/HDFUseFortran.cmake | 36 +-
config/cmake_ext_mod/grepTest.cmake | 12 +-
config/cmake_ext_mod/prunTest.cmake | 34 +-
config/cmake_ext_mod/runTest.cmake | 86 +-
configure | 1156 ++++++-
configure.ac | 98 +-
hdf/CMakeLists.txt | 2 +-
hdf/Makefile.in | 33 +-
hdf/examples/CMakeLists.txt | 14 +-
hdf/examples/CMakeTests.cmake | 16 +-
hdf/examples/Makefile.am | 4 +-
hdf/examples/Makefile.in | 37 +-
hdf/fortran/CMakeLists.txt | 135 +-
hdf/fortran/CMakeTests.cmake | 18 +-
hdf/fortran/Makefile.in | 33 +-
hdf/fortran/examples/CMakeLists.txt | 40 +-
hdf/fortran/examples/Makefile.am | 2 +-
hdf/fortran/examples/Makefile.in | 35 +-
hdf/src/CMakeLists.txt | 50 +-
hdf/src/H4api_adpt.h | 113 +-
hdf/src/Makefile.in | 33 +-
hdf/src/atom.c | 7 +-
hdf/src/bitvect.c | 6 +-
hdf/src/cdeflate.c | 6 +-
hdf/src/cnbit.c | 6 +-
hdf/src/cnone.c | 6 +-
hdf/src/crle.c | 6 +-
hdf/src/cskphuff.c | 6 +-
hdf/src/cszip.c | 6 +-
hdf/src/df24.c | 6 +-
hdf/src/df24f.c | 6 +-
hdf/src/dfan.c | 6 +-
hdf/src/dfanf.c | 6 +-
hdf/src/dfcomp.c | 6 +-
hdf/src/dfconv.c | 6 +-
hdf/src/dff.c | 6 +-
hdf/src/dfgr.c | 6 +-
hdf/src/dfgroup.c | 6 +-
hdf/src/dfimcomp.c | 6 +-
hdf/src/dfjpeg.c | 6 +-
hdf/src/dfknat.c | 6 +-
hdf/src/dfkswap.c | 7 +-
hdf/src/dfp.c | 6 +-
hdf/src/dfpf.c | 6 +-
hdf/src/dfr8.c | 6 +-
hdf/src/dfr8f.c | 6 +-
hdf/src/dfrle.c | 6 +-
hdf/src/dfsd.c | 6 +-
hdf/src/dfsdf.c | 6 +-
hdf/src/dfstubs.c | 6 +-
hdf/src/dfufp2i.c | 6 +-
hdf/src/dfufp2i.h | 6 +-
hdf/src/dfunjpeg.c | 6 +-
hdf/src/dfutil.c | 6 +-
hdf/src/dfutilf.c | 6 +-
hdf/src/dynarray.c | 6 +-
hdf/src/glist.c | 4 -
hdf/src/hbitio.c | 6 +-
hdf/src/hblocks.c | 6 +-
hdf/src/hbuffer.c | 6 +-
hdf/src/hchunks.c | 6 +-
hdf/src/hcomp.c | 10 +-
hdf/src/hcompri.c | 6 +-
hdf/src/hdfalloc.c | 20 +-
hdf/src/hdfi.h | 10 +-
hdf/src/herr.c | 6 +-
hdf/src/herr.h | 72 +-
hdf/src/herrf.c | 6 +-
hdf/src/hextelt.c | 97 +-
hdf/src/hfile.c | 6 +-
hdf/src/hfile.h | 6 +-
hdf/src/hfiledd.c | 6 +-
hdf/src/hfilef.c | 6 +-
hdf/src/hkit.c | 6 +-
hdf/src/hproto.h | 5 +-
hdf/src/linklist.c | 6 +-
hdf/src/maldebug.c | 6 +-
hdf/src/mcache.c | 6 +-
hdf/src/mfan.c | 6 +-
hdf/src/mfanf.c | 6 +-
hdf/src/mfgr.c | 1430 +++++----
hdf/src/mfgrf.c | 6 +-
hdf/src/mstdio.c | 6 +-
hdf/src/tbbt.c | 6 +-
hdf/src/vattr.c | 6 +-
hdf/src/vattr.h | 6 +-
hdf/src/vattrf.c | 6 +-
hdf/src/vconv.c | 6 +-
hdf/src/vg.c | 4 -
hdf/src/vgf.c | 6 +-
hdf/src/vhi.c | 6 +-
hdf/src/vio.c | 6 +-
hdf/src/vparse.c | 5 -
hdf/src/vrw.c | 6 +-
hdf/src/vsfld.c | 6 +-
hdf/test/CMakeLists.txt | 34 +-
hdf/test/CMakeTests.cmake | 337 ++-
hdf/test/Makefile.in | 33 +-
hdf/test/an.c | 6 +-
hdf/test/anfile.c | 6 +-
hdf/test/bitio.c | 6 +-
hdf/test/blocks.c | 6 +-
hdf/test/buffer.c | 16 +-
hdf/test/chunks.c | 6 +-
hdf/test/comp.c | 6 +-
hdf/test/conv.c | 6 +-
hdf/test/extelt.c | 6 +-
hdf/test/file.c | 6 +-
hdf/test/file1.c | 6 +-
hdf/test/forsupf.c | 6 +-
hdf/test/fortest.c | 7 +-
hdf/test/gentest.c | 6 +-
hdf/test/litend.c | 6 +-
hdf/test/man.c | 6 +-
hdf/test/mgr.c | 6 +-
hdf/test/nbit.c | 6 +-
hdf/test/rig.c | 6 +-
hdf/test/sdmms.c | 6 +-
hdf/test/sdnmms.c | 6 +-
hdf/test/sdstr.c | 6 +-
hdf/test/slab.c | 4 -
hdf/test/tbv.c | 6 +-
hdf/test/testhdf.c | 6 +-
hdf/test/tree.c | 6 +-
hdf/test/tvattr.c | 6 +-
hdf/test/tvset.c | 6 +-
hdf/test/vers.c | 6 +-
hdf/util/CMakeLists.txt | 130 +-
hdf/util/CMakeTests.cmake | 22 +-
hdf/util/Makefile.in | 33 +-
hdf/util/gif2hdf.c | 14 +-
hdf/util/gif2mem.c | 2 +-
hdf/util/h4cc.in | 2 +-
hdf/util/h4fc.in | 2 +-
hdf/util/hdf24to8.c | 6 +-
hdf/util/hdf2jpeg.c | 6 +-
hdf/util/hdf8to24.c | 6 +-
hdf/util/hdfcomp.c | 6 +-
hdf/util/hdfls.c | 6 +-
hdf/util/hdfpack.c | 6 +-
hdf/util/hdftopal.c | 6 +-
hdf/util/hdftor8.c | 6 +-
hdf/util/hdfunpac.c | 6 +-
hdf/util/he_cntrl.c | 6 +-
hdf/util/he_disp.c | 6 +-
hdf/util/he_file.c | 6 +-
hdf/util/he_main.c | 6 +-
hdf/util/jpeg2hdf.c | 6 +-
hdf/util/paltohdf.c | 6 +-
hdf/util/r8tohdf.c | 6 +-
hdf/util/ristosds.c | 6 +-
hdf/util/vmake.c | 6 +-
hdf/util/vshow.c | 6 +-
hdf/util/writehdf.c | 4 +-
java/CMakeLists.txt | 75 +
java/Makefile.am | 16 +
{mfhdf/fortran => java}/Makefile.in | 343 +--
java/examples/CMakeLists.txt | 89 +
java/examples/HDF4DatasetCreate.java | 203 ++
java/examples/HDF4FileCreate.java | 52 +
java/examples/HDF4GroupCreate.java | 108 +
java/examples/Makefile.am | 48 +
{mfhdf/nctest => java/examples}/Makefile.in | 358 +--
java/lib/ext/slf4j-nop-1.7.5.jar | Bin 0 -> 4091 bytes
java/lib/ext/slf4j-simple-1.7.5.jar | Bin 0 -> 10680 bytes
java/lib/hamcrest-core.jar | Bin 0 -> 45024 bytes
java/lib/junit.jar | Bin 0 -> 245039 bytes
java/lib/simplelogger.properties | 36 +
java/lib/slf4j-api-1.7.5.jar | Bin 0 -> 26084 bytes
java/src/CMakeLists.txt | 8 +
java/src/Makefile.am | 73 +
{hdf => java/src}/Makefile.in | 235 +-
java/src/hdf/CMakeLists.txt | 4 +
java/src/hdf/hdflib/CMakeLists.txt | 74 +
java/src/hdf/hdflib/HDFArray.java | 854 ++++++
java/src/hdf/hdflib/HDFChunkInfo.java | 52 +
java/src/hdf/hdflib/HDFCompInfo.java | 33 +
java/src/hdf/hdflib/HDFConstants.java | 419 +++
java/src/hdf/hdflib/HDFDeflateCompInfo.java | 39 +
java/src/hdf/hdflib/HDFException.java | 67 +
java/src/hdf/hdflib/HDFIMCOMPCompInfo.java | 29 +
java/src/hdf/hdflib/HDFJPEGCompInfo.java | 49 +
java/src/hdf/hdflib/HDFJavaException.java | 40 +
java/src/hdf/hdflib/HDFLibrary.java | 3172 ++++++++++++++++++++
java/src/hdf/hdflib/HDFLibraryException.java | 108 +
java/src/hdf/hdflib/HDFNBITChunkInfo.java | 47 +
java/src/hdf/hdflib/HDFNBITCompInfo.java | 47 +
java/src/hdf/hdflib/HDFNativeData.java | 166 +
java/src/hdf/hdflib/HDFNewCompInfo.java | 33 +
.../src/hdf/hdflib/HDFNotImplementedException.java | 44 +
java/src/hdf/hdflib/HDFOldCompInfo.java | 33 +
java/src/hdf/hdflib/HDFOldRLECompInfo.java | 30 +
java/src/hdf/hdflib/HDFRLECompInfo.java | 29 +
java/src/hdf/hdflib/HDFSKPHUFFCompInfo.java | 32 +
java/src/hdf/hdflib/HDFSZIPCompInfo.java | 53 +
java/src/hdf/overview.html | 94 +
java/src/jni/CMakeLists.txt | 68 +
java/src/jni/Makefile.am | 32 +
{mfhdf/xdr => java/src/jni}/Makefile.in | 215 +-
java/src/jni/h4jni.h | 176 ++
java/src/jni/hdfImp.c | 430 +++
java/src/jni/hdfanImp.c | 393 +++
java/src/jni/hdfdfpalImp.c | 221 ++
java/src/jni/hdfdfuImp.c | 44 +
java/src/jni/hdfexceptionImp.c | 186 ++
java/src/jni/hdfgrImp.c | 1044 +++++++
java/src/jni/hdfheImp.c | 52 +
java/src/jni/hdfhxImp.c | 88 +
java/src/jni/hdfnativeImp.c | 1200 ++++++++
java/src/jni/hdfr24Imp.c | 360 +++
java/src/jni/hdfr8Imp.c | 426 +++
java/src/jni/hdfsdsImp.c | 1980 ++++++++++++
java/src/jni/hdfstructsutil.c | 639 ++++
java/src/jni/hdfvdataImp.c | 1077 +++++++
java/src/jni/hdfvfImp.c | 115 +
java/src/jni/hdfvgroupImp.c | 893 ++++++
java/src/jni/hdfvhImp.c | 151 +
java/src/jni/hdfvqImp.c | 58 +
java/src/jni/hdfvsqImp.c | 282 ++
java/test/CMakeLists.txt | 100 +
java/test/JUnit-interface.ert | 2 +
java/test/JUnit-interface.txt | 367 +++
java/test/Makefile.am | 62 +
{mfhdf/nctest => java/test}/Makefile.in | 373 +--
java/test/TestAll.java | 32 +
java/test/TestH4.java | 268 ++
java/test/TestH4ANparams.java | 195 ++
java/test/TestH4DFPparams.java | 110 +
java/test/TestH4DFRparams.java | 139 +
java/test/TestH4DFparams.java | 130 +
java/test/TestH4GRparams.java | 535 ++++
java/test/TestH4HCparams.java | 52 +
java/test/TestH4SDparams.java | 746 +++++
java/test/TestH4VSparams.java | 476 +++
java/test/TestH4Vparams.java | 404 +++
java/test/junit.sh.in | 260 ++
libhdf4.settings.in | 3 +
m4/ax_check_class.m4 | 144 +
m4/ax_check_classpath.m4 | 60 +
m4/ax_check_java_home.m4 | 80 +
m4/ax_check_junit.m4 | 70 +
m4/ax_check_rqrd_class.m4 | 62 +
m4/ax_java_check_class.m4 | 85 +
m4/ax_java_options.m4 | 48 +
m4/ax_jni_include_dir.m4 | 132 +
m4/ax_prog_jar.m4 | 49 +
m4/ax_prog_java.m4 | 115 +
m4/ax_prog_java_cc.m4 | 104 +
m4/ax_prog_java_works.m4 | 134 +
m4/ax_prog_javac.m4 | 79 +
m4/ax_prog_javac_works.m4 | 72 +
m4/ax_prog_javadoc.m4 | 50 +
m4/ax_prog_javah.m4 | 64 +
m4/ax_try_compile_java.m4 | 55 +
m4/ax_try_run_java.m4 | 56 +
man/Makefile.in | 33 +-
man/hdf.1 | 6 +-
mfhdf/CMakeLists.txt | 2 +-
mfhdf/Makefile.in | 33 +-
mfhdf/dumper/CMakeLists.txt | 17 +-
mfhdf/dumper/Makefile.in | 33 +-
mfhdf/dumper/hdp.c | 6 +-
mfhdf/dumper/hdp.h | 6 +-
mfhdf/dumper/hdp_dump.c | 6 +-
mfhdf/dumper/hdp_gr.c | 6 +-
mfhdf/dumper/hdp_list.c | 6 +-
mfhdf/dumper/hdp_rig.c | 6 +-
mfhdf/dumper/hdp_sds.c | 13 +-
mfhdf/dumper/hdp_util.c | 4 -
mfhdf/dumper/hdp_vd.c | 6 +-
mfhdf/dumper/hdp_vg.c | 6 +-
mfhdf/dumper/show.c | 4 -
mfhdf/dumper/testfiles/Roy-64.nc | Bin 0 -> 4021 bytes
mfhdf/dumper/testfiles/dumpsds-19.out | 1 +
mfhdf/dumper/testhdp.sh.in | 5 +-
mfhdf/examples/CMakeLists.txt | 10 +-
mfhdf/examples/CMakeTests.cmake | 8 +-
mfhdf/examples/Makefile.am | 2 +-
mfhdf/examples/Makefile.in | 35 +-
mfhdf/examples/SD_chunking_example.c | 24 +-
mfhdf/examples/SD_find_sds_by_name.c | 2 +-
mfhdf/examples/SD_get_attr.c | 3 +-
mfhdf/examples/SD_mv_sds_to_external.c | 2 +-
mfhdf/examples/SD_read_from_sds.c | 2 +-
mfhdf/fortran/CMakeLists.txt | 131 +-
mfhdf/fortran/CMakeTests.cmake | 32 +-
mfhdf/fortran/Makefile.in | 33 +-
mfhdf/fortran/examples/CMakeLists.txt | 30 +-
mfhdf/fortran/examples/Makefile.am | 2 +-
mfhdf/fortran/examples/Makefile.in | 35 +-
mfhdf/fortran/mfsdf.c | 5 +-
mfhdf/hdfimport/CMakeLists.txt | 17 +-
mfhdf/hdfimport/CMakeTests.cmake | 208 +-
mfhdf/hdfimport/Makefile.in | 33 +-
mfhdf/hdiff/CMakeLists.txt | 17 +-
mfhdf/hdiff/CMakeTests.cmake | 26 +-
mfhdf/hdiff/Makefile.in | 33 +-
mfhdf/hdiff/hdiff_dim.c | 36 +-
mfhdf/hdiff/hdiff_gr.c | 8 +-
mfhdf/hdiff/hdiff_list.c | 76 +-
mfhdf/hdiff/hdiff_mattbl.c | 18 +-
mfhdf/hdiff/hdiff_sds.c | 22 +-
mfhdf/hdiff/hdiff_vs.c | 10 +-
mfhdf/hrepack/CMakeLists.txt | 23 +-
mfhdf/hrepack/CMakeTests.cmake | 165 +-
mfhdf/hrepack/Makefile.in | 33 +-
mfhdf/hrepack/hrepack.c | 12 +-
mfhdf/hrepack/hrepack_an.c | 12 +-
mfhdf/hrepack/hrepack_dim.c | 40 +-
mfhdf/hrepack/hrepack_gr.c | 14 +-
mfhdf/hrepack/hrepack_list.c | 54 +-
mfhdf/hrepack/hrepack_lsttable.c | 14 +-
mfhdf/hrepack/hrepack_opttable.c | 32 +-
mfhdf/hrepack/hrepack_parse.c | 16 +-
mfhdf/hrepack/hrepack_sds.c | 20 +-
mfhdf/hrepack/hrepack_vg.c | 6 +-
mfhdf/hrepack/hrepack_vs.c | 26 +-
mfhdf/hrepack/hrepacktst.c | 32 +-
mfhdf/libsrc/CMakeLists.txt | 67 +-
mfhdf/libsrc/Makefile.in | 33 +-
mfhdf/libsrc/array.c | 25 +-
mfhdf/libsrc/cdf.c | 196 +-
mfhdf/libsrc/hdfnctest.c | 4 -
mfhdf/libsrc/hdfsds.c | 422 ++-
mfhdf/libsrc/local_nc.h | 484 +--
mfhdf/libsrc/mfsd.c | 1070 +++----
mfhdf/libsrc/string.c | 4 +-
mfhdf/libsrc/var.c | 8 +-
mfhdf/ncdump/CMakeLists.txt | 17 +-
mfhdf/ncdump/Makefile.in | 33 +-
mfhdf/ncgen/CMakeLists.txt | 17 +-
mfhdf/ncgen/Makefile.in | 33 +-
mfhdf/nctest/CMakeLists.txt | 12 +-
mfhdf/nctest/Makefile.in | 33 +-
mfhdf/test/CMakeLists.txt | 91 +-
mfhdf/test/CMakeTests.cmake | 269 +-
mfhdf/test/Makefile.am | 2 +-
mfhdf/test/Makefile.in | 44 +-
mfhdf/test/Roy-64.nc | Bin 0 -> 4021 bytes
mfhdf/test/Roy.nc | Bin 0 -> 4020 bytes
mfhdf/test/hdfnctest.c | 4 -
mfhdf/test/hdftest.c | 235 +-
mfhdf/test/hdftest.h | 29 +
mfhdf/test/tcoordvar.c | 2 +-
mfhdf/test/texternal.c | 814 +++++
mfhdf/test/tfile.c | 327 +-
mfhdf/test/tsdsprops.c | 2 +-
mfhdf/test/tunlim.c | 2 +-
mfhdf/test/tutils.c | 315 +-
mfhdf/xdr/CMakeLists.txt | 58 +-
mfhdf/xdr/Makefile.in | 33 +-
release_notes/HISTORY.txt | 352 +++
release_notes/INSTALL | 4 +-
release_notes/INSTALL_CMake.txt | 346 +--
release_notes/INSTALL_CYGWIN.txt | 4 +-
release_notes/RELEASE.txt | 344 +--
release_notes/USING_CMake_Examples.txt | 84 +-
release_notes/USING_HDF4_CMake.txt | 172 +-
release_notes/USING_HDF4_VS.txt | 4 +-
release_notes/misc_docs.txt | 12 +-
400 files changed, 33114 insertions(+), 6656 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf4.git
More information about the Pkg-grass-devel
mailing list