diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/db-image-parser.c | 6 | ||||
| -rw-r--r-- | src/itdb.h | 8 | ||||
| -rw-r--r-- | src/itdb_itunesdb.c | 2 |
4 files changed, 17 insertions, 8 deletions
@@ -1,3 +1,12 @@ +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. + 2005-10-15 Jorg Schuler <jcsjcs at users.sourceforge.net> * src/itdb_itunesdb.c,itdb_private.h: fixes for 64 bit systems 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; |