[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:37:18 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=fc93a62

The following commit has been merged in the master branch:
commit fc93a620ee84eb9e336f7a783fb80933fccfcb49
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Nov 12 17:13:49 2005 +0000

    Improved bugfix regression test script
---
 test/Makefile                                    |   6 +-
 test/bugfixes-test.sh                            |  35 ++++++++--
 test/data/bugfixes-test.out                      |  78 +++++++++++++++++++++++
 test/data/{exiv2-empty.jpg => exiv2-bug426.jpg}  | Bin 4745 -> 6441 bytes
 test/data/exiv2-bug440.jpg                       | Bin 5249 -> 5243 bytes
 test/data/exiv2-bug443.jpg                       | Bin 0 -> 40162 bytes
 test/data/{exiv2-bug441.jpg => exiv2-bug444.jpg} | Bin 39732 -> 39736 bytes
 7 files changed, 109 insertions(+), 10 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 749535d..1124cf5 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -15,9 +15,9 @@ SHELL = /bin/sh
 .PHONY: all test clean distclean maintainer-clean
 
 # Add test drivers to this list
-TESTS = addmoddel.sh exifdata-test.sh exiv2-test.sh ifd-test.sh imagetest.sh \
-	iotest.sh iptctest.sh makernote-test.sh modify-test.sh path-test.sh \
-	write-test.sh write2-test.sh
+TESTS = addmoddel.sh bugfixes-test.sh exifdata-test.sh exiv2-test.sh ifd-test.sh \
+	imagetest.sh iotest.sh iptctest.sh makernote-test.sh modify-test.sh \
+	path-test.sh write-test.sh write2-test.sh
 
 test:
 	@list='$(TESTS)'; for p in $$list; do \
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 865e70d..0faba43 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -9,18 +9,39 @@ diff -q $diffargs $tmpfile $tmpfile 2>/dev/null
 if [ $? -ne 0 ] ; then
     diffargs=""
 fi
+
+prep_file()
+{
+    gf_num=$1
+    gf_filename=exiv2-bug$gf_num.jpg
+    echo '------>' Bug $gf_num '<-------' >&2
+    cp -f ../data/$gf_filename .
+    echo $gf_filename
+}
+
 (
 LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 binpath="../../src"
 cd ./tmp
-# bug 440
-cp -f ../data/exiv2-bug440.jpg .
-$binpath/exiv2 -pi exiv2-bug440.jpg
-# bug 441
-cp -f ../data/exiv2-bug441.jpg .
-$binpath/exiv2 -pi exiv2-bug441.jpg
-) > $results
+
+num=426
+filename=`prep_file $num`
+$binpath/exiv2 -pi $filename
+
+num=440
+filename=`prep_file $num`
+$binpath/exiv2 -pi $filename
+
+num=443
+filename=`prep_file $num`
+$binpath/exiv2 -pt $filename
+
+num=444
+filename=`prep_file $num`
+$binpath/exiv2 -pi $filename
+
+) > $results 2>&1
 
 diff -q $diffargs $results $good
 rc=$?
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
new file mode 100644
index 0000000..ce3a27a
--- /dev/null
+++ b/test/data/bugfixes-test.out
@@ -0,0 +1,78 @@
+------> Bug 426 <-------
+Iptc.Application2.RecordVersion              Short       1  2
+Iptc.Application2.FixtureId                  String     22  2005 Oregon Coast Tour
+Iptc.Application2.Byline                     String     14  Julie V. Early
+Iptc.Application2.City                       String     21  159 km SW of Portland
+Iptc.Application2.ProvinceState              String      6  Oregon
+Iptc.Application2.CountryName                String     13  United States
+Iptc.Application2.Contact                    String     16  Jeffrey J. Early
+------> Bug 440 <-------
+Iptc.Application2.RecordVersion              Short       1  1
+Iptc.Application2.ObjectName                 String     16  WHITE SOX TIGERS
+Iptc.Application2.Category                   String      1  S
+Iptc.Application2.SuppCategory               String      3  BBA
+Iptc.Application2.DateCreated                Date        8  2005-09-29
+Iptc.Application2.TimeCreated                Time       11  16:51:00+00:00
+Iptc.Application2.Byline                     String     11  PAUL SANCYA
+Iptc.Application2.BylineTitle                String      3  STF
+Iptc.Application2.City                       String      7  DETROIT
+Iptc.Application2.ProvinceState              String      2  MI
+Iptc.Application2.CountryName                String      3  USA
+Iptc.Application2.TransmissionReference      String      6  DTS112
+Iptc.Application2.Headline                   String     14  GARCIA GARLAND
+Iptc.Application2.Credit                     String      2  AP
+Iptc.Application2.Source                     String      2  AP
+Iptc.Application2.Caption                    String    282  Chicago White Sox pitcher John Garland, left, pours champagne on Freddy Garcia in the locker room after their 4-2 win against the Detroit Tigers in Detroit, Thursday, Sept. 29, 2005. With the win the White Sox clinched their first AL Central title since 2000. (AP Photo/Paul Sancya)
+Iptc.Application2.Writer                     String     15  DD PCS DD**NY**
+------> Bug 443 <-------
+Error: Iop entry 2796 lies outside of the IFD memory buffer.
+Exif.Image.Make                              Ascii      22  EASTMAN KODAK COMPANY
+Exif.Image.Model                             Ascii      28  KODAK DX3600 DIGITAL CAMERA
+Exif.Image.Orientation                       Short       1  top, left
+Exif.Image.XResolution                       Rational    1  170
+Exif.Image.YResolution                       Rational    1  170
+Exif.Image.ResolutionUnit                    Short       1  inch
+Exif.Image.DateTime                          Ascii      20  2003:07:27 13:08:24
+Exif.Image.YCbCrPositioning                  Short       1  Centered
+Exif.Image.ExifTag                           Long        1  208
+Exif.Photo.ExposureTime                      Rational    1  1/500 s
+Exif.Photo.FNumber                           Rational    1  F3.4
+Exif.Photo.ExposureProgram                   Short       1  Auto
+Exif.Photo.ExifVersion                       Undefined   4  48 50 48 48 
+Exif.Photo.DateTimeOriginal                  Ascii      20  2003:07:27 16:22:28
+Exif.Photo.DateTimeDigitized                 Ascii      20  2003:07:27 16:22:28
+Exif.Photo.ComponentsConfiguration           Undefined   4  YCbCr
+Exif.Photo.ShutterSpeedValue                 SRational   1  1/512 s
+Exif.Photo.ApertureValue                     Rational    1  F3.4
+Exif.Photo.ExposureBiasValue                 SRational   1  0
+Exif.Photo.MaxApertureValue                  Rational    1  F3.2
+Exif.Photo.SubjectDistance                   Rational    1  1.10 m
+Exif.Photo.MeteringMode                      Short       1  Average
+Exif.Photo.LightSource                       Short       1  Unknown
+Exif.Photo.Flash                             Short       1  No
+Exif.Photo.FocalLength                       Rational    1  5.6 mm
+Exif.Photo.MakerNote                         Undefined 872  75 68 75 48 48 48 49 73 68 88 51 54 48 48 32 32 3 1 0 0 8 7 176 4 211 7 7 27 16 22 28 37 0 0 0 0 0 0 75 1 173 0 0 0 0 0 0 3 89 49 0 0 89 49 0 0 176 48 0 0 218 48 0 0 0 2 0 0 110 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 96 126 1 0 0 0 1 0 128 52 1 0 0 0 0 0 100 0 100 0 0 0 32 0 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 166 165 166 173 138 113 169 170 194 108 58 12 167 171 177 186 101 73 84 106 181 163 83 20 171 170 177 179 43 26 52 81 172 195 86 26 167 171 173 175 76 12 52 165 165 104 69 76 113 106 85 141 11 16 48 141 125 116 114 103 19 22 72 69 8 65 125 107 110 104 104 96 22 53 76 31 32 100 120 85 95 94 91 89 66 76 69 43 45 81 57 85 85 77 75 74 193 181 193 189 157 124 186 200 219 130 91 15 198 189 192 210 104 100 104 131 196 180 108 42 190 191 189 187 55 34 65 84 197 209 113 73 188 197 190 203 70 18 58 187 199 123 86 107 147 113 121 148 11 26 65 162 145 137 136 137 32 32 109 59 9 96 119 126 129 126 132 125 35 83 97 34 38 142 143 100 110 119 116 121 83 101 97 44 56 94 76 108 108 104 103 102 0 0 0 0 0 0 0 0 96 126 1 0 0 0 1 0 128 52 1 0 195 132 1 0 0 0 1 0 184 44 1 0 0 0 0 0 0 0 0 0 0 0 0 0 96 126 1 0 0 0 1 0 128 52 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 96 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 147 0 25 26 0 0 82 124 254 255 0 0 141 0 0 0 0 0 0 0 0 0 0 176 77 0 0 0 0 0 0 0 0 0 192 7 0 0 0 0 0 0 128 0 0 0 192 17 0 0 96 4 0 0 0 0 0 0 51 179 0 0 124 3 0 0 0 0 0 0 0 0 0 0 0 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 244 50 0 0 6 0 0 0 72 250 164 1 230 253 129 255 221 0 16 0 177 3 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 0 176 48 1 0 0 0 2 1 0 0 27 24 0 0 175 1 0 0 232 0 0 0 0 0 0 0 55 0 0 0 218 48 0 0 0 0 0 0 0 0 0 0 100 0 89 49 1 0 0 0 2 0 0 0 200 6 0 0 175 1 0 0 134 0 0 0 81 2 0 0 55 0 0 0 89 49 0 0 0 0 0 0 0 0 0 0 9 61 129 37 0 0 0 0 60 1 0 0 0 0 0 0 1 0 1 0 29 0 33 0 0 0 100 20 40 255 29 47 195 49 227 48 38 49 51 48 0 0 0 0 0 0 0 0 0 0 16 16 15 15 15 0 0 0 0 0 0 0 0 0 10 10 10 10 100 10 10 10 100 100 100 10 10 100 100 0 0 0 0 0 0 100 0 0 0 0 0 0 10 10 10 10 100 10 10 10 100 100 100 10 29 100 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 118 1 0 176 163 255 255 80 230 255 255 160 224 255 255 144 113 1 0 208 173 255 255 224 6 0 0 64 146 255 255 224 102 1 0 0 0 0 0 0 0 0 0 0 0 0 0 
+Exif.Photo.UserComment                       Undefined   1  
+Exif.Photo.FlashpixVersion                   Undefined   4  48 49 48 49 
+Exif.Photo.ColorSpace                        Short       1  sRGB
+Exif.Photo.PixelXDimension                   Long        1  1024
+Exif.Photo.PixelYDimension                   Long        1  683
+Exif.Photo.InteroperabilityTag               Long        1  1850
+Exif.Photo.ExposureIndex                     Rational    1  1677721600/16777216
+Exif.Photo.SensingMethod                     Short       1  One-chip color area
+Exif.Photo.FileSource                        Undefined   1  Digital still camera
+Exif.Photo.SceneType                         Undefined   1  Directly photographed
+Exif.Thumbnail.Compression                   Short       1  JPEG
+Exif.Thumbnail.Orientation                   Short       1  top, left
+Exif.Thumbnail.XResolution                   Rational    1  72
+Exif.Thumbnail.YResolution                   Rational    1  72
+Exif.Thumbnail.ResolutionUnit                Short       1  inch
+Exif.Thumbnail.JPEGInterchangeFormat         Long        1  0
+Exif.Thumbnail.JPEGInterchangeFormatLength   Long        1  33779
+------> Bug 444 <-------
+Iptc.Envelope.CharacterSet                   Undefined   4  0 196 28 2 
+Iptc.Application2.Urgency                    String      2  GT
+Iptc.Application2.SuppCategory               String      8  portrait
+Iptc.Application2.Caption                    String     18  Witty caption here
+Iptc.Application2.Keywords                   String      3  ize
+Iptc.Application2.0x007b                     String      4  n123
diff --git a/test/data/exiv2-empty.jpg b/test/data/exiv2-bug426.jpg
similarity index 72%
copy from test/data/exiv2-empty.jpg
copy to test/data/exiv2-bug426.jpg
index 9394df8..9b74fd3 100644
Binary files a/test/data/exiv2-empty.jpg and b/test/data/exiv2-bug426.jpg differ
diff --git a/test/data/exiv2-bug440.jpg b/test/data/exiv2-bug440.jpg
index 6eefcdf..e57572b 100644
Binary files a/test/data/exiv2-bug440.jpg and b/test/data/exiv2-bug440.jpg differ
diff --git a/test/data/exiv2-bug443.jpg b/test/data/exiv2-bug443.jpg
new file mode 100644
index 0000000..b542f5a
Binary files /dev/null and b/test/data/exiv2-bug443.jpg differ
diff --git a/test/data/exiv2-bug441.jpg b/test/data/exiv2-bug444.jpg
similarity index 99%
rename from test/data/exiv2-bug441.jpg
rename to test/data/exiv2-bug444.jpg
index e65f7b7..a0e6d9c 100644
Binary files a/test/data/exiv2-bug441.jpg and b/test/data/exiv2-bug444.jpg differ

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list