diff options
| author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-12-03 10:04:47 (GMT) |
|---|---|---|
| committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-12-03 10:04:47 (GMT) |
| commit | f224cb5234ea8d4bbf9dff776847899fc6076c07 (patch) | |
| tree | e28e7e3957b1b025cf72ccd08bbf63bb74e5a924 | |
| parent | f6cba85eb5c0b6910ab29ca944cbccfd897f16fc (diff) | |
Renamed two functions before public usage. POTENTIAL RISK!
Renamed
tng_util_next_frame_present_data_blocks_find() to
tng_util_trajectory_next_frame_present_data_blocks_find()
and
tng_util_compression_current_frame_get() to
tng_util_frame_current_compression_get()
| -rw-r--r-- | include/tng_io.h | 4 | ||||
| -rw-r--r-- | src/lib/tng_io.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/tng_io.h b/include/tng_io.h index c9172cd..62bcef7 100644 --- a/include/tng_io.h +++ b/include/tng_io.h @@ -4610,7 +4610,7 @@ tng_function_status DECLSPECDLLEXPORT tng_util_box_shape_with_time_double_write * has occured (such as invalid mode) or TNG_CRITICAL (2) if a major error * has occured. */ -tng_function_status DECLSPECDLLEXPORT tng_util_compression_current_frame_get +tng_function_status DECLSPECDLLEXPORT tng_util_frame_current_compression_get (tng_trajectory_t tng_data, const int64_t block_id, char *codec_id, @@ -4646,7 +4646,7 @@ tng_function_status DECLSPECDLLEXPORT tng_util_compression_current_frame_get * has occured (such as invalid mode) or TNG_CRITICAL (2) if a major error * has occured. */ -tng_function_status DECLSPECDLLEXPORT tng_util_next_frame_present_data_blocks_find +tng_function_status DECLSPECDLLEXPORT tng_util_trajectory_next_frame_present_data_blocks_find (tng_trajectory_t tng_data, int64_t current_frame, const int64_t n_requested_data_block_ids, diff --git a/src/lib/tng_io.c b/src/lib/tng_io.c index 658e474..b313c83 100644 --- a/src/lib/tng_io.c +++ b/src/lib/tng_io.c @@ -17647,7 +17647,7 @@ tng_function_status DECLSPECDLLEXPORT tng_util_box_shape_with_time_double_write TNG_GZIP_COMPRESSION)); } -tng_function_status DECLSPECDLLEXPORT tng_util_compression_current_frame_get +tng_function_status DECLSPECDLLEXPORT tng_frame_current_compression_get (tng_trajectory_t tng_data, const int64_t block_id, char *codec_id, @@ -17758,7 +17758,7 @@ tng_function_status DECLSPECDLLEXPORT tng_util_compression_current_frame_get return(TNG_SUCCESS); } -tng_function_status DECLSPECDLLEXPORT tng_util_next_frame_present_data_blocks_find +tng_function_status DECLSPECDLLEXPORT tng_util_trajectory_next_frame_present_data_blocks_find (tng_trajectory_t tng_data, int64_t current_frame, const int64_t n_requested_data_block_ids, @@ -17778,7 +17778,7 @@ tng_function_status DECLSPECDLLEXPORT tng_util_next_frame_present_data_blocks_fi TNG_ASSERT(tng_data, "TNG library: Trajectory container not properly setup."); TNG_ASSERT(next_frame, "TNG library: The pointer to the next frame must not be NULL."); TNG_ASSERT(data_block_ids_in_next_frame == 0, "TNG library: The pointer to the list of data block IDs must be NULL."); - + if(n_requested_data_block_ids) { TNG_ASSERT(requested_data_block_ids, "TNG library: If the number of requested data blocks is > 0 then the array of data block IDs must not be NULL."); |