summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Reck <jreck@android.com>2014-03-11 18:36:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-11 18:36:02 +0000
commit64af6148cfd55ad55ea491473ed42c168299c94e (patch)
tree9b4b2cbfdd69357b51dd28a4c6c4db5b54630cf4
parentacbfc9c1c7e1a84b0db4dc5bc3d5346b6c55c473 (diff)
parent6c59af6011c9ba9892fb94bd0df8147cf2c0ec12 (diff)
downloadjhead-64af6148cfd55ad55ea491473ed42c168299c94e.tar.gz
am 6c59af60: Merge "Fix compilation issue for 64bit"
* commit '6c59af6011c9ba9892fb94bd0df8147cf2c0ec12': 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,