[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:47:22 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=013771b
The following commit has been merged in the master branch:
commit 013771b4c1ecfc6a510783010ac807d6f94a26ce
Author: Robin Mills <robin at clanmills.com>
Date: Sat Mar 4 10:50:54 2017 +0000
#1272 Supplement to r4715
---
test/data/stdin-test.out | 137 +++++++++--------------------------------------
test/stdin-test.sh | 12 ++---
2 files changed, 32 insertions(+), 117 deletions(-)
diff --git a/test/data/stdin-test.out b/test/data/stdin-test.out
index 940915e..a554d36 100644
--- a/test/data/stdin-test.out
+++ b/test/data/stdin-test.out
@@ -149,37 +149,6 @@ STRUCTURE OF JPEG FILE: girl.jpg
372 | 0xffe1 APP1 | 4613 | http://ns.adobe.com/xap/1.0/.<?x
4987 | 0xffe1 APP1 | 4602 | http://ns.adobe.com/xap/1.0/.<?x
9591 | 0xffda SOS
-Warning: Exif tag Exif.Image.InterColorProfile not encoded
-STRUCTURE OF JPEG FILE: girl.jpg
- address | marker | length | data
- 0 | 0xffd8 SOI
- 2 | 0xffe0 APP0 | 16 | JFIF............
- 20 | 0xffe1 APP1 | 1880 | Exif..II*......................
- 1902 | 0xffe1 APP1 | 6767 | http://ns.adobe.com/xap/1.0/.<?x
- 8671 | 0xffed APP13 | 794 | Photoshop 3.0.8BIM..........Z...
- 9467 | 0xffdb DQT | 67
- 9536 | 0xffdb DQT | 67
- 9605 | 0xffc0 SOF0 | 17
- 9624 | 0xffc4 DHT | 28
- 9654 | 0xffc4 DHT | 74
- 9730 | 0xffc4 DHT | 28
- 9760 | 0xffc4 DHT | 57
- 9819 | 0xffe1 APP1 | 4602 | http://ns.adobe.com/xap/1.0/.<?x
- 14423 | 0xffda SOS
-STRUCTURE OF JPEG FILE: girl.jpg
- address | marker | length | data
- 0 | 0xffd8 SOI
- 2 | 0xffe0 APP0 | 16 | JFIF............
- 20 | 0xffdb DQT | 67
- 89 | 0xffdb DQT | 67
- 158 | 0xffc0 SOF0 | 17
- 177 | 0xffc4 DHT | 28
- 207 | 0xffc4 DHT | 74
- 283 | 0xffc4 DHT | 28
- 313 | 0xffc4 DHT | 57
- 372 | 0xffe1 APP1 | 4613 | http://ns.adobe.com/xap/1.0/.<?x
- 4987 | 0xffe1 APP1 | 4602 | http://ns.adobe.com/xap/1.0/.<?x
- 9591 | 0xffda SOS
STRUCTURE OF JPEG FILE: girl.jpg
address | marker | length | data
0 | 0xffd8 SOI
@@ -201,91 +170,37 @@ STRUCTURE OF JPEG FILE: Reagan.jpg
0 | 0xffd8 SOI
2 | 0xffe1 APP1 | 5704 | Exif..MM.*......................
5708 | 0xffe1 APP1 | 5287 | http://ns.adobe.com/xap/1.0/.<?x
- 10997 | 0xffe2 APP2 | 65512 | ICC_PROFILE...... APPL....prtrRG chunk 1/25
- 76511 | 0xffe2 APP2 | 65512 | ICC_PROFILE...X..Ih.V...j.U..4mV chunk 2/25
- 142025 | 0xffe2 APP2 | 65512 | ICC_PROFILE...}.f...~mcx....`... chunk 3/25
- 207539 | 0xffe2 APP2 | 65512 | ICC_PROFILE....|...S...^...v.... chunk 4/25
- 273053 | 0xffe2 APP2 | 65512 | ICC_PROFILE.....bXf2..`Og...^0g. chunk 5/25
- 338567 | 0xffe2 APP2 | 65512 | ICC_PROFILE.....~.|...{.}P..y.}. chunk 6/25
- 404081 | 0xffe2 APP2 | 65512 | ICC_PROFILE......b.....:...?.... chunk 7/25
- 469595 | 0xffe2 APP2 | 65512 | ICC_PROFILE...Q8yq].R.wW].S.uJ]e chunk 8/25
- 535109 | 0xffe2 APP2 | 65512 | ICC_PROFILE...i.T'..RA.Y..P,.... chunk 9/25
- 600623 | 0xffe2 APP2 | 65512 | ICC_PROFILE...i.}/..key...l.v..c chunk 10/25
- 666137 | 0xffe2 APP2 | 65512 | ICC_PROFILE...{....O{.....|..c.. chunk 11/25
- 731651 | 0xffe2 APP2 | 65512 | ICC_PROFILE...E.;.O-F.-.R>J...a. chunk 12/25
- 797165 | 0xffe2 APP2 | 65512 | ICC_PROFILE....X..up............ chunk 13/25
- 862679 | 0xffe2 APP2 | 65512 | ICC_PROFILE........<............ chunk 14/25
- 928193 | 0xffe2 APP2 | 65512 | ICC_PROFILE..............,...'.. chunk 15/25
- 993707 | 0xffe2 APP2 | 65512 | ICC_PROFILE.......g.....m%....qw chunk 16/25
- 1059221 | 0xffe2 APP2 | 65512 | ICC_PROFILE......s....xX.M..n... chunk 17/25
- 1124735 | 0xffe2 APP2 | 65512 | ICC_PROFILE............0......E. chunk 18/25
- 1190249 | 0xffe2 APP2 | 65512 | ICC_PROFILE........(.n.B........ chunk 19/25
- 1255763 | 0xffe2 APP2 | 65512 | ICC_PROFILE...0.0.282.0.282.0.28 chunk 20/25
- 1321277 | 0xffe2 APP2 | 65512 | ICC_PROFILE...175.0.176.0.175.0. chunk 21/25
- 1386791 | 0xffe2 APP2 | 65512 | ICC_PROFILE...103.0.114.0.126.0. chunk 22/25
- 1452305 | 0xffe2 APP2 | 65512 | ICC_PROFILE...6.0.049.0.053.0.05 chunk 23/25
- 1517819 | 0xffe2 APP2 | 65512 | ICC_PROFILE....0.670.0.653.0.634 chunk 24/25
- 1583333 | 0xffe2 APP2 | 41712 | ICC_PROFILE...09.0.584.0.555.0.5 chunk 25/25
- 1625047 | 0xffed APP13 | 3030 | Photoshop 3.0.8BIM..........Z...
- 1628079 | 0xffee APP14 | 14 | Adobe.d at ......
- 1628095 | 0xffdb DQT | 132
- 1628229 | 0xffc0 SOF0 | 17
- 1628248 | 0xffdd DRI | 4
- 1628254 | 0xffc4 DHT | 418
- 1628674 | 0xffda SOS
-STRUCTURE OF TIFF FILE (MM): Reagan.tiff
- address | tag | type | count | offset | value
- 10 | 0x0100 ImageWidth | SHORT | 1 | 13107200 | 200
- 22 | 0x0101 ImageLength | SHORT | 1 | 8519680 | 130
- 34 | 0x0102 BitsPerSample | SHORT | 4 | 338 | 8 8 8 8
- 46 | 0x0103 Compression | SHORT | 1 | 65536 | 1
- 58 | 0x0106 PhotometricInterpretation | SHORT | 1 | 131072 | 2
- 70 | 0x010e ImageDescription | ASCII | 403 | 346 | 040621-N-6536T-062.USS Ronald Re ...
- 82 | 0x010f Make | ASCII | 18 | 750 | NIKON CORPORATION
- 94 | 0x0110 Model | ASCII | 10 | 768 | NIKON D1X
- 106 | 0x0111 StripOffsets | LONG | 1 | 1620922 | 1620922
- 118 | 0x0112 Orientation | SHORT | 1 | 65536 | 1
- 130 | 0x0115 SamplesPerPixel | SHORT | 1 | 262144 | 4
- 142 | 0x0116 RowsPerStrip | SHORT | 1 | 8519680 | 130
- 154 | 0x0117 StripByteCounts | LONG | 1 | 104000 | 104000
- 166 | 0x011a XResolution | RATIONAL | 1 | 778 | 300/1
- 178 | 0x011b YResolution | RATIONAL | 1 | 786 | 300/1
- 190 | 0x011c PlanarConfiguration | SHORT | 1 | 65536 | 1
- 202 | 0x0128 ResolutionUnit | SHORT | 1 | 131072 | 2
- 214 | 0x0131 Software | ASCII | 29 | 794 | Adobe Photoshop CS Macintosh
- 226 | 0x0132 DateTime | ASCII | 20 | 824 | 2012:04:07 16:11:27
- 238 | 0x013b Artist | ASCII | 34 | 844 | Photographer..s Mate 3rd Class ( ...
- 250 | 0x0152 ExtraSamples | SHORT | 1 | 65536 | 1
- 262 | 0x0153 SampleFormat | SHORT | 4 | 878 | 1 1 1 1
- 274 | 0x02bc XMLPacket | BYTE | 4917 | 886 | <?xpacket begin="..." id="W5M0Mp ...
- 286 | 0x83bb IPTCNAA | LONG | 233 | 5804 | 469850624 52110663 469893120 33554972 39125013 ...
- 298 | 0x8769 ExifTag | LONG | 1 | 1620336 | 1620336
- 310 | 0x8773 InterColorProfile | UNDEFINED | 1613600 | 6736 | ... APPL....prtrRGB Lab ........ ...
- 322 | 0x8825 GPSTag | LONG | 1 | 1620904 | 1620904
-END Reagan.tiff
+ 10997 | 0xffe2 APP2 | 3160 | ICC_PROFILE......HLino....mntrRG chunk 1/1
+ 14159 | 0xffed APP13 | 3030 | Photoshop 3.0.8BIM..........Z...
+ 17191 | 0xffee APP14 | 14 | Adobe.d at ......
+ 17207 | 0xffdb DQT | 132
+ 17341 | 0xffc0 SOF0 | 17
+ 17360 | 0xffdd DRI | 4
+ 17366 | 0xffc4 DHT | 418
+ 17786 | 0xffda SOS
STRUCTURE OF PNG FILE: ReaganSmallPng.png
address | chunk | length | data | checksum
8 | IHDR | 13 | ............ | 0x8cf910c3
33 | zTXt | 8648 | Raw profile type exif..x...Wv$ | 0xca41f34d
8693 | zTXt | 632 | Raw profile type iptc..x..T[.. | 0xa2860459
- 9337 | iCCP | 1159185 | ICC PROFILE..x...uP.[..9 at .HB.D | 0x4a90a7d7
- 1168534 | iTXt | 7117 | XML:com.adobe.xmp.....<?xpacke | 0x2ff025b8
- 1175663 | gAMA | 4 | .... | 0x0bfc6105
- 1175679 | bKGD | 6 | ...... | 0xa0bda793
- 1175697 | pHYs | 9 | ...#...#. | 0x78a53f76
- 1175718 | tIME | 7 | ......# | 0xdf7f5bbd
- 1175737 | zTXt | 278 | Comment..x.}..n. at ....O..5..h.. | 0xdb1dfff5
- 1176027 | IDAT | 8192 | x...i.$.u%v....Gdd...U..X.`0.9 | 0x96dc2ed9
- 1184231 | IDAT | 8192 | df.."..1L...0...j....`F.&.yf.. | 0xbfeb3575
- 1192435 | IDAT | 8192 | K-N.t.ENL.R..q](jm...sN..U.+.. | 0xe249a922
- 1200639 | IDAT | 8192 | >..?.Nw..iN......xE....z..[..} | 0x054b9d1e
- 1208843 | IDAT | 7066 | ...q.B...2*@..#....T....h..v.. | 0x327f1e3e
- 1215921 | IEND | 0 | | 0xae426082
+ 9337 | iCCP | 2609 | ICC PROFILE..x...wTS.....7.P.. | 0x9dbb65a0
+ 11958 | iTXt | 7117 | XML:com.adobe.xmp.....<?xpacke | 0x2ff025b8
+ 19087 | gAMA | 4 | .... | 0x0bfc6105
+ 19103 | bKGD | 6 | ...... | 0xa0bda793
+ 19121 | pHYs | 9 | ...#...#. | 0x78a53f76
+ 19142 | tIME | 7 | ......# | 0xdf7f5bbd
+ 19161 | zTXt | 278 | Comment..x.}..n. at ....O..5..h.. | 0xdb1dfff5
+ 19451 | IDAT | 8192 | x...i.$.u%v....Gdd...U..X.`0.9 | 0x96dc2ed9
+ 27655 | IDAT | 8192 | df.."..1L...0...j....`F.&.yf.. | 0xbfeb3575
+ 35859 | IDAT | 8192 | K-N.t.ENL.R..q](jm...sN..U.+.. | 0xe249a922
+ 44063 | IDAT | 8192 | >..?.Nw..iN......xE....z..[..} | 0x054b9d1e
+ 52267 | IDAT | 7066 | ...q.B...2*@..#....T....h..v.. | 0x327f1e3e
+ 59345 | IEND | 0 | | 0xae426082
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
Chunk | Length | Offset | Payload
- RIFF | 1800566 | 0 | WEBP
+ RIFF | 190110 | 0 | WEBP
VP8X | 10 | 12 | ,........
- ICCP | 1613600 | 30 | ... APPL....prtrRGB Lab ........
- VP8 | 172008 | 1613638 | .G...*.. .>1..B.!..o.. ......]..
- EXIF | 12040 | 1785654 | II*........................... .
- XMP | 2864 | 1797702 | <?xpacket begin="..." id="W5M0Mp
+ ICCP | 3144 | 30 | ...HLino....mntrRGB XYZ ........
+ VP8 | 172008 | 3182 | .G...*.. .>1..B.!..o.. ......]..
+ EXIF | 12040 | 175198 | II*........................... .
+ XMP | 2864 | 187246 | <?xpacket begin="..." id="W5M0Mp
diff --git a/test/stdin-test.sh b/test/stdin-test.sh
index 81fb0e4..a016fe1 100755
--- a/test/stdin-test.sh
+++ b/test/stdin-test.sh
@@ -29,7 +29,7 @@ source ./functions.source
done
printf "a (exiv2, xmp, iptc) " >&3
- for f in Reagan.jpg ReaganLargeTiff.tiff ReaganSmallPng.png; do
+ for f in Reagan.jpg ReaganSmallPng.png; do
copyTestFile $f
copyTestFile exiv2-bug1229.jpg girl.jpg
runTest exiv2 -pS girl.jpg
@@ -38,11 +38,11 @@ source ./functions.source
done
printf "ICC " >&3
- copyTestFile ReaganLargeTiff.tiff
- for f in Reagan.jpg Reagan.tiff ReaganSmallPng.png exiv2-bug1199.webp ; do
- copyTestFile $f
- runTest exiv2 -eC- ReaganLargeTiff.tiff | runTest exiv2 -iC- $f
- runTest exiv2 -pS $f
+ copyTestFile Reagan.tiff # 1272 ReaganLargeTiff.tiff
+ for f in Reagan.jpg ReaganSmallPng.png exiv2-bug1199.webp ; do
+ copyTestFile $f
+ runTest exiv2 -eC- Reagan.tiff | runTest exiv2 -iC- $f
+ runTest exiv2 -pS $f
done
) 3>&1 > $results 2>&1
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list