diff options
| author | Thomas White <taw@physics.org> | 2020-06-08 14:16:51 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-07-29 18:53:44 +0200 |
| commit | 9aac978cbe89adc784aeb049f80bb465b80dfbc0 (patch) | |
| tree | 140ba0023b7692c78147c121f20d95c066029640 /src/process_image.c | |
| parent | dff86d3c650e0b117a10be9d2c2c6f788b97629e (diff) | |
Move MessagePack stuff to separate file
Note the nicer separation: ZMQ is in indexamajig only, whereas
MessagePack becomes something generally accessible through libcrystfel.
Diffstat (limited to 'src/process_image.c')
| -rw-r--r-- | src/process_image.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/process_image.c b/src/process_image.c index 2c4ec61c..5cc89d1b 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -193,9 +193,9 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, if ( pargs->msgpack_obj != NULL ) { set_last_task(last_task, "unpacking messagepack object"); - image = unpack_msgpack_data(pargs->msgpack_obj, - iargs->dtempl, - iargs->no_image_data); + image = image_msgpack_read(iargs->dtempl, + pargs->msgpack_obj, + iargs->no_image_data); if ( image == NULL ) return; } else { image = file_wait_open_read(pargs->filename, pargs->event, @@ -298,9 +298,9 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, break; case PEAK_MSGPACK: - image->features = get_peaks_msgpack(pargs->msgpack_obj, - iargs->dtempl, - iargs->half_pixel_shift); + image->features = image_msgpack_read_peaks(iargs->dtempl, + pargs->msgpack_obj, + iargs->half_pixel_shift); break; case PEAK_NONE: |