summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <teuf@gnome.org>2008-10-08 18:43:20 +0000
committerChristophe Fergeau <teuf@gnome.org>2008-10-08 18:43:20 +0000
commit9a276dfdc1cf87d3cae1b27b7d86d35e96613d36 (patch)
tree568cc17e623ed5ff11ed9d83dfd9db6ccb6c64e9
parent9001377df6a178d35646989b7fb093562c4a7f42 (diff)
downloadlibgpod-9a276dfdc1cf87d3cae1b27b7d86d35e96613d36.tar.gz
libgpod-9a276dfdc1cf87d3cae1b27b7d86d35e96613d36.tar.xz
libgpod-9a276dfdc1cf87d3cae1b27b7d86d35e96613d36.zip
Fix data sizes used in Itdb_ArtworkFormat
The mostly automated SysInfoExtended parser expects the fields in the Itdb_ArtworkFormat structure to be of type gint. They used to be of type gin which led to random overwriting of their value since the parser expected the to be bigger than they really are. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@2139 f01d2545-417e-4e96-918e-98f8d0dbbcb6
-rw-r--r--ChangeLog8
-rw-r--r--src/itdb_device.h6
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 65f9632..625e900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2008-10-07 Christophe Fergeau <teuf@gnome.org>
+ * src/itdb_device.h: switch members in Itdb_ArtworkFormat from
+ guint16 to gint since the SysInfoExtended parser will assume
+ they are gint value and will try to write to them through a
+ gint* pointer (ie it will overwrite whatever is around the
+ guint16 value if we don't change it)
+
+2008-10-07 Christophe Fergeau <teuf@gnome.org>
+
* src/itdb_device.c: fix itdb_device_supports_artwork to properly
take into account data from SysInfoExtended if available
diff --git a/src/itdb_device.h b/src/itdb_device.h
index 26226eb..d461994 100644
--- a/src/itdb_device.h
+++ b/src/itdb_device.h
@@ -95,9 +95,9 @@ struct _Itdb_Device
};
struct _Itdb_ArtworkFormat {
- gint16 format_id;
- gint16 width;
- gint16 height;
+ gint format_id;
+ gint width;
+ gint height;
ItdbThumbFormat format;
gint32 padding; /* not found in SysInfoExtended, added
* for compatibility with hardcoded artwork formats */