diff options
author | John Reck <jreck@android.com> | 2014-03-06 02:57:14 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 02:57:14 +0000 |
commit | 36b08ec9c543de24e0be24c299ade1ecc44da3d1 (patch) | |
tree | 30ef2e0cf4155cdec38df9749c59ff766d8b3d55 | |
parent | f78ba588d5cc05b62ba7e181359ba739d1e18878 (diff) | |
parent | 6c59af6011c9ba9892fb94bd0df8147cf2c0ec12 (diff) | |
download | jhead-36b08ec9c543de24e0be24c299ade1ecc44da3d1.tar.gz |
am 6c59af60: Merge "Fix compilation issue for 64bit"
* commit '6c59af6011c9ba9892fb94bd0df8147cf2c0ec12':
Fix compilation issue for 64bit
-rw-r--r-- | exif.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1020,13 +1020,13 @@ static void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned Offset; if (DIR_ENTRY_ADDR(DirStart, NumDirEntries) + 4 <= OffsetBase+ExifLength){ - printf("DirStart %d offset from dirstart %d", (int)DirStart, 2+12*NumDirEntries); + printf("DirStart %p offset from dirstart %d", DirStart, 2+12*NumDirEntries); Offset = Get32u(DirStart+2+12*NumDirEntries); if (Offset){ SubdirStart = OffsetBase + Offset; if (SubdirStart > OffsetBase+ExifLength || SubdirStart < OffsetBase){ - printf("SubdirStart %d OffsetBase %d ExifLength %d Offset %d", - (int)SubdirStart, (int)OffsetBase, ExifLength, Offset); + printf("SubdirStart %p OffsetBase %p ExifLength %d Offset %d", + SubdirStart, OffsetBase, ExifLength, Offset); if (SubdirStart > OffsetBase && SubdirStart < OffsetBase+ExifLength+20){ // Jhead 1.3 or earlier would crop the whole directory! // As Jhead produces this form of format incorrectness, |