[svn-r24701] merge from trunk to 24700.

fix return type for H5T_committed in H5Tget_create_plist.

6 files changed, 20 insertions, 21 deletions

diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 5d8c2d5..b040fd1 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -284,9 +284,10 @@ ENDIF (WIN32 AND NOT CYGWIN)
 # Add Target(s) to CMake Install for import into other projects
 #-----------------------------------------------------------------------------
 IF (HDF5_EXPORTED_TARGETS)
-
-  INSTALL_TARGET_PDB (${HDF5_F90_C_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} fortlibraries)
-  #INSTALL_TARGET_PDB (${HDF5_F90_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} fortlibraries)
+  IF (BUILD_SHARED_LIBS)
+    INSTALL_TARGET_PDB (${HDF5_F90_C_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} fortlibraries)
+    #INSTALL_TARGET_PDB (${HDF5_F90_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} fortlibraries)
+  ENDIF (BUILD_SHARED_LIBS)
 
   INSTALL (
       TARGETS
diff --git a/fortran/src/H5Fff_F03.f90 b/fortran/src/H5Fff_F03.f90
index 1ccd39a..83d46be 100644
--- a/fortran/src/H5Fff_F03.f90
+++ b/fortran/src/H5Fff_F03.f90
@@ -46,16 +46,17 @@ CONTAINS
 ! PURPOSE
 !  Retrieves a copy of the image of an existing, open file. 
 !
-! Inputs:
+! INPUTS
 !  file_id    - Target file identifier.
 !  buf_ptr    - Pointer to the buffer into which the image of the HDF5 file is to be copied.
 !  buf_len    - Size of the supplied buffer.
 !
-! Outputs:
+! OUTPUTS
 !  hdferr     - error code:
 !                 0 on success and -1 on failure
-! Optional:  
-!  buf_size   - The size in bytes of the buffer required to store the file image.
+! OPTIONAL PARAMETERS  
+!  buf_size   - Returns the size in bytes of the buffer required to store the file image,
+!               no data will be copied.
 !
 ! AUTHOR
 !  M. Scot Breitenfeld
@@ -65,11 +66,11 @@ CONTAINS
   SUBROUTINE h5fget_file_image_f(file_id, buf_ptr, buf_len, hdferr, buf_size)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
-    INTEGER(HID_T)  , INTENT(IN)    :: file_id
-    TYPE(C_PTR)     , INTENT(INOUT) :: buf_ptr
-    INTEGER(SIZE_T) , INTENT(IN)    :: buf_len
-    INTEGER(SIZE_T) , INTENT(OUT), OPTIONAL :: buf_size
-    INTEGER         , INTENT(OUT)   :: hdferr
+    INTEGER(HID_T) , INTENT(IN)              :: file_id
+    TYPE(C_PTR)    , INTENT(INOUT)           :: buf_ptr
+    INTEGER(SIZE_T), INTENT(IN)              :: buf_len
+    INTEGER        , INTENT(OUT)             :: hdferr
+    INTEGER(SIZE_T), INTENT(OUT)  , OPTIONAL :: buf_size
 !*****
 
     INTEGER(SIZE_T) :: buf_size_default
diff --git a/fortran/src/H5Sff.f90 b/fortran/src/H5Sff.f90
index 1bae584..c493d46 100644
--- a/fortran/src/H5Sff.f90
+++ b/fortran/src/H5Sff.f90
@@ -1323,8 +1323,8 @@ CONTAINS
               INTEGER, INTENT(IN) :: operator
               INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: start
               INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count
-              INTEGER(HSIZE_T), DIMENSION(*), OPTIONAL, INTENT(IN) :: stride
-              INTEGER(HSIZE_T), DIMENSION(*), OPTIONAL, INTENT(IN) :: block
+              INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: stride
+              INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: block
               END FUNCTION h5sselect_hyperslab_c
             END INTERFACE
 
diff --git a/fortran/src/HDF5mpio.f90 b/fortran/src/HDF5mpio.f90
index ac4d2b1..b8fb645 100644
--- a/fortran/src/HDF5mpio.f90
+++ b/fortran/src/HDF5mpio.f90
@@ -28,6 +28,7 @@
 MODULE HDF5
   USE H5GLOBAL
   USE H5F
+  USE H5F_PROVISIONAL
   USE H5G
   USE H5E
   USE H5E_PROVISIONAL
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 61f729d..0a2f8c5 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -520,7 +520,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 160
+LT_VERS_REVISION = 162
 LT_VERS_AGE = 0
 
 # Include src directory in both Fortran and C flags (C compiler is used
diff --git a/fortran/test/tH5F_F03.f90 b/fortran/test/tH5F_F03.f90
index dea9a5d..79b0458 100644
--- a/fortran/test/tH5F_F03.f90
+++ b/fortran/test/tH5F_F03.f90
@@ -62,10 +62,6 @@ SUBROUTINE test_get_file_image(total_error)
   INTEGER(hid_t) :: fapl          ! File access property
   INTEGER :: error                ! Error flag
 
-
-  RETURN ! DEBUG, PGI COMPILERS seem to have a bug in the INQUIRE functions,
-         ! waiting for an answer from PGI how to resolve the problem.
-
   ! Create new properties for file access
   CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
   CALL check("h5pcreate_f", error, total_error)
@@ -151,9 +147,9 @@ SUBROUTINE test_get_file_image(total_error)
   ALLOCATE(file_image_ptr(1:image_size))
 
   ! Open the test file using standard I/O calls 
-  OPEN(UNIT=10,FILE='tget_file_image.h5', ACCESS='STREAM')
+  OPEN(UNIT=10,FILE='tget_file_image.h5', FORM='UNFORMATTED', ACCESS='STREAM')
 
-  ! Read the test file from disk into the buffer 
+  ! Read the test file from disk into the buffer
   DO i = 1, image_size
      READ(10) file_image_ptr(i)
   ENDDO