diff options
| author | Dominik Kuhlen <kinimod@users.sourceforge.net> | 2003-06-02 19:13:39 +0000 |
|---|---|---|
| committer | Dominik Kuhlen <kinimod@users.sourceforge.net> | 2003-06-02 19:13:39 +0000 |
| commit | 8a39b37999530094f7c89db3f525e823cf677605 (patch) | |
| tree | b7b03e5b2d32203dd99efea8b4f1bfd25d1c94e0 /camlibs/sx330z | |
| parent | c0944d92d67377157b6f663df7da7710b54ad541 (diff) | |
| download | libgphoto2-8a39b37999530094f7c89db3f525e823cf677605.tar.gz | |
again endianness....
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6462 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/sx330z')
| -rw-r--r-- | camlibs/sx330z/sx330z.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/camlibs/sx330z/sx330z.c b/camlibs/sx330z/sx330z.c index dd6dfae31..bf17e1cb7 100644 --- a/camlibs/sx330z/sx330z.c +++ b/camlibs/sx330z/sx330z.c @@ -51,7 +51,7 @@ sx330z_fill_ack(int8_t *buf, struct traveler_ack *ack) { ack->always3 = le32toh(*(int32_t*)buf); buf += 4; ack->timestamp = le32toh(*(int32_t*)buf); buf += 4; - ack->size = le32toh(*(int32_t*)buf); buf += 4; + ack->size = le32toh(*(uint32_t*)buf); buf += 4; ack->dontknow = le32toh(*(int32_t*)buf); buf += 4; return(GP_OK); } /* sx330z_fill_ack */ @@ -118,7 +118,7 @@ sx330z_read_block(Camera *camera, GPContext *context, struct traveler_req *req, * Get TOC size */ int -sx330z_get_toc_num_pages(Camera *camera, GPContext *context, unsigned int *pages) +sx330z_get_toc_num_pages(Camera *camera, GPContext *context, uint32_t *pages) { struct traveler_ack ack; uint8_t trxbuf[0x10]; @@ -130,7 +130,7 @@ sx330z_get_toc_num_pages(Camera *camera, GPContext *context, unsigned int *pages sx330z_fill_ack(trxbuf, &ack); /* convert endianness */ - *pages = le32toh(ack.size / 0x200 + 1); /* TOC Pages */ + *pages = ack.size / 0x200 + 1; /* TOC Pages */ /* bug in camera ??*/ if (ack.size == 0x200) (*pages)--; |