From ada018f3b883d40b7836adc3393d2c9c6ea84f51 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Mon, 23 Nov 2015 16:03:44 +0000 Subject: [PATCH] #1137. Updated manpage to document -m- and -pV and Added regression detector for both new options to test suite. --- src/exiv2.1 | 6 ++++-- test/bugfixes-test.sh | 9 +++++++++ test/data/bugfixes-test.out | Bin 1843444 -> 1843966 bytes test/data/exiv2-bug1137.jpg | Bin 0 -> 8779 bytes 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 test/data/exiv2-bug1137.jpg diff --git a/src/exiv2.1 b/src/exiv2.1 index eef9f5dd..02d8c8ad 100644 --- a/src/exiv2.1 +++ b/src/exiv2.1 @@ -3,7 +3,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH EXIV2 1 "Nov 12, 2015" +.TH EXIV2 1 "Nov 23, 2015" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -345,6 +345,8 @@ s : size in bytes .br v : plain data value .br +V : plain data value AND the word 'set ' at the start of line (for use with exiv2 -m-) +.br t : interpreted (translated) data .br h : hexdump of the data @@ -413,7 +415,7 @@ Default filename format is %Y%m%d_%H%M%S. .B \-c \fItxt\fP JPEG comment string to set in the image ('modify' action). This option can also be used with the 'extract' and 'insert' actions to modify -metadata on-the-fly. +metadata on-the-fly. -m- represents standard-input. .TP .B \-m \fIfile\fP Command file for the 'modify' action. This option can also be used diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh index 921e4c73..3d035835 100755 --- a/test/bugfixes-test.sh +++ b/test/bugfixes-test.sh @@ -430,6 +430,15 @@ source ./functions.source copyTestFile $filename runTest exiv2 -pv -g Lens $filename runTest exiv2 -pa -g Lens $filename + + num=1137 + filename=exiv2-bug$num.jpg + copyTestFile $filename + exiv2 -PkV --grep GPSL http://dev.exiv2.org/attachments/download/805/DSC_7154.jpg + exiv2 -pa $filename + exiv2 -PkV --grep GPSL http://dev.exiv2.org/attachments/download/805/DSC_7154.jpg | exiv2 -m- $filename + exiv2 -pa $filename + ) 3>&1 > $results 2>&1 diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out index 7f73839b57e191057091df320919e084754818c5..28f356e6f969a690bafced9c87215d625302eb48 100644 GIT binary patch delta 322 zcmYMtu}Z^G6b4{gQ?04mY8$II;8`SFb8kqC8FbNBCoxlTyqIeYR2wvw?t(tR-FyZI z2f^7v*S*IZBCqZy{>0-h9PG2-%dlFrKU!M zzwnfr2IXbf>v+5Fe_1)RJ+<8{tJlvueq2;LJdh!7w)3ORQvGzlIFRZgJ*>E1J6~oN F=|8gnc4Pnm delta 250 zcmex&wBXCZf(>PX^_~GC&I)OnsW~adRtg4OC|pAm6LWJ@F3%t*g{0E7wA3O6D+Q34 zg$0*$er`cxQD$Dc0$4|4UWx)pS#f4ns-B*nLVh+b6)A}&iBJ`~K+wE4uzhVHBM>tI zF*6Xe05K~NvjH(X5OV-AClGT1F*gwN05LBR^8qnG5DNgYAP@@yu`m#e0I?_#ivh7X S5K92DBoIq&UmGa>{~Q3Tuvstw diff --git a/test/data/exiv2-bug1137.jpg b/test/data/exiv2-bug1137.jpg new file mode 100644 index 0000000000000000000000000000000000000000..97ed37ee098261f87f45187f0b0317bbff06dc48 GIT binary patch literal 8779 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 a5AO$7TxfC6sI`ynez&Jhza4zJ{{H~