summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Reck <jreck@android.com>2014-03-06 02:07:35 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-03-06 02:07:35 +0000
commit6c59af6011c9ba9892fb94bd0df8147cf2c0ec12 (patch)
tree8491209f4c1e065ed96ae7b3ea22dde597bc5355
parent31b17e69a87e4caa50f9c6b1a47c84ef75f79d83 (diff)
parent1608baf918ea483273638d65defe0a9da95cc449 (diff)
downloadjhead-6c59af6011c9ba9892fb94bd0df8147cf2c0ec12.tar.gz
Merge "Fix compilation issue for 64bit"
-rw-r--r--exif.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/exif.c b/exif.c
index bb01453..30cd66d 100644
--- a/exif.c
+++ b/exif.c
@@ -995,13 +995,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,