Merge remote-tracking branch 'upstream/main' into update-to-v0.2

Author: jcupitt

include/dicom/dicom.h

@@ -766,7 +766,10 @@ bool dcm_element_set_value_numeric_multi(DcmError **error,
                                          bool steal);
 
 /**
- * Get a floating-point value of a Data Element.
+ * Get a floating-point value from a Data Element.
+ *
+ * The Data Element Value Reepresentation may be either single- or 
+ * double-precision floating point.
  *
  * :param error: Pointer to error object
  * :param element: Pointer to Data Element
@@ -776,10 +779,10 @@ bool dcm_element_set_value_numeric_multi(DcmError **error,
  * :return: true on success
  */
 DCM_EXTERN
-bool dcm_element_get_value_double(DcmError **error,
-                                  const DcmElement *element,
-                                  uint32_t index,
-                                  double *value);
+bool dcm_element_get_value_floatingpoint(DcmError **error,
+                                         const DcmElement *element,
+                                         uint32_t index,
+                                         double *value);
 
 /**
  * Set the value of a Data Element to a floating-point.
@@ -795,9 +798,9 @@ bool dcm_element_get_value_double(DcmError **error,
  * :return: true on success
  */
 DCM_EXTERN
-bool dcm_element_set_value_double(DcmError **error,
-                                  DcmElement *element,
-                                  double value);
+bool dcm_element_set_value_floatingpoint(DcmError **error,
+                                         DcmElement *element,
+                                         double value);
 
 /**
  * Get a binary value from a Data Element.
@@ -1393,7 +1396,7 @@ uint32_t dcm_bot_get_num_frames(const DcmBOT *bot);
  * Get Frame offset in the Basic Offset Table.
  *
  * :param bot: Basic Offset Table
- * :param index: Zero-based index of Frame in the Pixel Data Element
+ * :param index: One-based index of Frame in the Pixel Data Element
  *
  * :return: offset from pixel_data_offset
  */
@@ -1472,8 +1475,8 @@ DcmFilehandle *dcm_filehandle_create_from_file(DcmError **error,
  */
 DCM_EXTERN
 DcmFilehandle *dcm_filehandle_create_from_memory(DcmError **error,
-                                                 char *buffer,
-						 int64_t length);
+                                                 const char *buffer,
+                                                 int64_t length);
 
 /**
  * Read File Meta Information from a File.
@@ -1544,7 +1547,7 @@ DcmBOT *dcm_filehandle_build_bot(DcmError **error, DcmFilehandle *filehandle,
  * :param filehandle: File
  * :param metadata: Metadata
  * :param bot: Basic Offset Table
- * :param index: Zero-based offset of the Frame in the Pixel Data Element
+ * :param index: One-based offset of the Frame in the Pixel Data Element
  *
  * :return: Frame
  */

src/dicom-data.c

@@ -761,10 +761,10 @@ static bool element_check_float(DcmError **error,
 }
 
 
-bool dcm_element_get_value_double(DcmError **error,
-                                  const DcmElement *element,
-                                  uint32_t index,
-                                  double *value)
+bool dcm_element_get_value_floatingpoint(DcmError **error,
+                                         const DcmElement *element,
+                                         uint32_t index,
+                                         double *value)
 {
     if (!element_check_assigned(error, element) ||
         !element_check_numeric(error, element) ||
@@ -787,9 +787,9 @@ bool dcm_element_get_value_double(DcmError **error,
 }
 
 
-bool dcm_element_set_value_double(DcmError **error,
-                                  DcmElement *element,
-                                  double value)
+bool dcm_element_set_value_floatingpoint(DcmError **error,
+                                         DcmElement *element,
+                                         double value)
 {
     if (!element_check_not_assigned(error, element) ||
         !element_check_numeric(error, element) ||
@@ -1108,7 +1108,7 @@ static void element_print_float(const DcmElement *element,
                                 uint32_t index)
 {
     double value;
-    (void) dcm_element_get_value_double(NULL, element, index, &value);
+    (void) dcm_element_get_value_floatingpoint(NULL, element, index, &value);
     printf("%g", value);
 }
 

src/dicom-io.c

@@ -269,7 +269,7 @@ DcmFilehandle *dcm_filehandle_create_from_file(DcmError **error,
 
 
 typedef struct _DcmIOMemory {
-    char *buffer;
+    const char *buffer;
     int64_t length;
     int64_t read_point;
 } DcmIOMemory;
@@ -347,14 +347,15 @@ static int64_t dcm_io_seek_memory(DcmError **error, void *data,
             return -1;
     }
 
-    new_offset = MAX(0, MIN(new_offset, io_memory->length));
+    io_memory->read_point = MAX(0, MIN(new_offset, io_memory->length));
 
-    return new_offset;
+    return io_memory->read_point;
 }
 
 
 DcmFilehandle *dcm_filehandle_create_from_memory(DcmError **error,
-                                                 char *buffer, int64_t length)
+                                                 const char *buffer,
+                                                 int64_t length)
 {
     static DcmIO io = {
         dcm_io_open_memory,