diff options
| author | Christophe Fergeau <teuf@gnome.org> | 2005-10-17 17:38:10 +0000 |
|---|---|---|
| committer | Christophe Fergeau <teuf@gnome.org> | 2005-10-17 17:38:10 +0000 |
| commit | c9541eccb8273860ff556101f9d21b07315c15cb (patch) | |
| tree | c17afbef79b7e58d5531b638c7bac8d71f4d7eb7 /src | |
| parent | 84e9ed7e1247c2d6f5a2185e67a9bf2fd6c0592d (diff) | |
| download | libgpod-c9541eccb8273860ff556101f9d21b07315c15cb.tar.gz libgpod-c9541eccb8273860ff556101f9d21b07315c15cb.tar.xz libgpod-c9541eccb8273860ff556101f9d21b07315c15cb.zip | |
2005-10-17 Christophe Fergeau <teuf@gnome.org>
* src/db-image-parser.c: (get_pixel_data),
(ipod_image_new_from_mhni):
* src/itdb.h:
* src/itdb_itunesdb.c: (get_mhod): Changed type of the various fields
in the ItdbImage structures so that they match what they are in the
database on the iPod.
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1124 f01d2545-417e-4e96-918e-98f8d0dbbcb6
Diffstat (limited to 'src')
| -rw-r--r-- | src/db-image-parser.c | 6 | ||||
| -rw-r--r-- | src/itdb.h | 8 | ||||
| -rw-r--r-- | src/itdb_itunesdb.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/db-image-parser.c b/src/db-image-parser.c index 2d8e8dc..0240654 100644 --- a/src/db-image-parser.c +++ b/src/db-image-parser.c @@ -83,7 +83,7 @@ get_pixel_data (Itdb_Image *image) res = fseek (f, image->offset, SEEK_SET); if (res != 0) { - g_print ("Seek to %lu failed on %s: %s\n", + g_print ("Seek to %d failed on %s: %s\n", image->offset, image->filename, strerror (errno)); goto end; } @@ -154,8 +154,8 @@ ipod_image_new_from_mhni (MhniHeader *mhni, const char *mount_point) } img->filename = ipod_image_get_ithmb_filename (mount_point, GINT_FROM_LE (mhni->correlation_id)); - img->size = GINT32_FROM_LE (mhni->image_size); - img->offset = GINT32_FROM_LE (mhni->ithmb_offset); + img->size = GUINT32_FROM_LE (mhni->image_size); + img->offset = GUINT32_FROM_LE (mhni->ithmb_offset); img->width = GINT16_FROM_LE (mhni->image_width); img->height = GINT16_FROM_LE (mhni->image_height); @@ -320,10 +320,10 @@ enum ItdbImageType { struct _Itdb_Image { enum ItdbImageType type; char *filename; - off_t offset; - size_t size; - unsigned int width; - unsigned int height; + guint32 offset; + guint32 size; + gint16 width; + gint16 height; }; typedef struct _Itdb_Image Itdb_Image; diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c index 1cba8a9..50c269a 100644 --- a/src/itdb_itunesdb.c +++ b/src/itdb_itunesdb.c @@ -966,7 +966,7 @@ static MHODData get_mhod (FContents *cts, glong mhod_seek, guint32 *ml) gulong seek; result.valid = FALSE; - + result.type = -1; g_return_val_if_fail (ml, result); *ml = -1; |