diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2020-03-22 16:45:08 +0100 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2020-03-22 16:45:08 +0100 |
| commit | 09b36a86b2ff750af9d6acae848f368d7e46c540 (patch) | |
| tree | d482bdd7ec3349747d8ffda01b0134b575f02105 /camlibs/spca50x | |
| parent | 48bd51fac24c5369333cf57d2992697add92c301 (diff) | |
| download | libgphoto2-09b36a86b2ff750af9d6acae848f368d7e46c540.tar.gz | |
return error from create_jpeg_from_data
Diffstat (limited to 'camlibs/spca50x')
| -rw-r--r-- | camlibs/spca50x/spca50x.c | 3 | ||||
| -rw-r--r-- | camlibs/spca50x/spca50x.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/camlibs/spca50x/spca50x.c b/camlibs/spca50x/spca50x.c index d5ed92c91..2b6774d64 100644 --- a/camlibs/spca50x/spca50x.c +++ b/camlibs/spca50x/spca50x.c @@ -202,7 +202,7 @@ spca50x_capture (CameraPrivateLibrary * lib) return GP_OK; } -void +int create_jpeg_from_data (uint8_t * dst, uint8_t * src, int qIndex, int w, int h, uint8_t format, int o_size, int *size, int omit_huffman_table, int omit_escape) @@ -261,4 +261,5 @@ create_jpeg_from_data (uint8_t * dst, uint8_t * src, int qIndex, int w, *(dst++) = 0xD9; *size = dst - start; + return GP_OK; } diff --git a/camlibs/spca50x/spca50x.h b/camlibs/spca50x/spca50x.h index 2f7927e3d..8a48dd2fc 100644 --- a/camlibs/spca50x/spca50x.h +++ b/camlibs/spca50x/spca50x.h @@ -86,7 +86,7 @@ int spca50x_detect_storage_type (CameraPrivateLibrary *lib); int spca50x_reset (CameraPrivateLibrary * lib); int spca50x_capture (CameraPrivateLibrary * lib); int yuv2rgb (uint32_t y, uint32_t u, uint32_t v, uint32_t *r, uint32_t *g, uint32_t *b); -void create_jpeg_from_data (uint8_t * dst, uint8_t * src, int qIndex, +int create_jpeg_from_data (uint8_t * dst, uint8_t * src, int qIndex, int w, int h, uint8_t format, int original_size, int *size, int omit_huffman_table, int omit_escape); |