diff --git a/CMakeLists.txt b/CMakeLists.txt index 5088b10f..c5e1ebee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,13 +90,8 @@ if( EXIV2_BUILD_UNIT_TESTS ) ) endif() -# Run a reduced test suite on UNIX #902 -set (TEST alltest) -if ( CMAKE_HOST_SOLARIS OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" ) - set (TEST unixtest) -endif() add_custom_target(version_test - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" ./version_test.sh + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make version_test WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" ) @@ -106,14 +101,14 @@ if( EXIV2_BUILD_SAMPLES ) if( EXIV2_BUILD_UNIT_TESTS ) add_custom_target(tests COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make unit_test - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make ${TEST} + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make bash_tests COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make python_tests COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make version_test WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" ) else() add_custom_target(tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make ${TEST} + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make bash_tests COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make python_tests COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make version_test WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" @@ -124,7 +119,7 @@ if( EXIV2_BUILD_SAMPLES ) WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" ) add_custom_target(bash_tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make ${TEST} + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make bash_tests WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" ) add_subdirectory( samples ) diff --git a/samples/exifdata-test.cpp b/samples/exifdata-test.cpp index a631630f..eed3b9cb 100644 --- a/samples/exifdata-test.cpp +++ b/samples/exifdata-test.cpp @@ -132,7 +132,7 @@ void print(const std::string& file) << std::dec << std::setw(3) << std::setfill(' ') << std::right << i->count() << " " - << std::dec << i->value() + << std::dec << i->toString() << "\n"; } } diff --git a/samples/exifprint.cpp b/samples/exifprint.cpp index 113e4bb6..a8bfbc3d 100644 --- a/samples/exifprint.cpp +++ b/samples/exifprint.cpp @@ -92,7 +92,7 @@ try { << std::dec << std::setw(3) << std::setfill(' ') << std::right << i->count() << " " - << std::dec << i->value() + << std::dec << i->toString() << "\n"; } diff --git a/src/actions.cpp b/src/actions.cpp index e0005030..af31f11d 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -689,39 +689,13 @@ namespace Action { if (!first) std::cout << " "; first = false; - if (md.size() > 128 && Params::instance().binary_ && - (md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte || - md.typeId() == Exiv2::signedByte)) { - std::cout << _("(Binary value suppressed)") << std::endl; - return true; - } - bool done = false; - // handle `comment` typeIDs - // $ bin/taglist | grep '\tComment,' | cut -d, -f 5 - // Exif.Photo.UserComment - // Exif.GPSInfo.GPSProcessingMethod - // Exif.GPSInfo.GPSAreaInformation - if( md.key() == "Exif.Photo.UserComment" - || md.key() == "Exif.GPSInfo.GPSProcessingMethod" - || md.key() == "Exif.GPSInfo.GPSAreaInformation" - ) { - const Exiv2::CommentValue* pcv = dynamic_cast(&md.value()); - if (pcv) { - Exiv2::CommentValue::CharsetId csId = pcv->charsetId(); - if (csId != Exiv2::CommentValue::undefined) { - std::cout << "charset=\"" << Exiv2::CommentValue::CharsetInfo::name(csId) << "\" "; - } - std::cout << pcv->comment(Params::instance().charset_.c_str()); - done = true; - } - } - if (!done) { - // #1114 - show negative values for SByte - if (md.typeId() != Exiv2::signedByte) { - std::cout << std::dec << md.value(); - } else { - int value = md.value().toLong(); - std::cout << std::dec << (value < 128 ? value : value - 256); + // #1114 - show negative values for SByte + if (md.typeId() != Exiv2::signedByte) { + std::cout << std::dec << md.value(); + } else { + for ( int c = 0 ; c < md.value().count() ; c++ ) { + int value = md.value().toLong(c); + std::cout << (c?" ":"") << std::dec << (value < 128 ? value : value - 256); } } } @@ -729,35 +703,12 @@ namespace Action { if (!first) std::cout << " "; first = false; - if (Params::instance().binary_ && - (md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte || - md.typeId() == Exiv2::signedByte) && - md.size() > 128) { - std::cout << _("(Binary value suppressed)") << std::endl; - return true; - } - bool done = false; - if (0 == strcmp(md.key().c_str(), "Exif.Photo.UserComment")) { - const Exiv2::CommentValue* pcv = dynamic_cast(&md.value()); - if (pcv) { - std::cout << pcv->comment(Params::instance().charset_.c_str()); - done = true; - } - } - if (!done) - std::cout << std::dec << md.print(&pImage->exifData()); + std::cout << std::dec << md.print(&pImage->exifData()); } if (Params::instance().printItems_ & Params::prHex) { if (!first) std::cout << std::endl; first = false; - if (Params::instance().binary_ && - (md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte || - md.typeId() == Exiv2::signedByte) && - md.size() > 128) { - std::cout << _("(Binary value suppressed)") << std::endl; - return true; - } Exiv2::DataBuf buf(md.size()); md.copy(buf.pData_, pImage->byteOrder()); Exiv2::hexdump(std::cout, buf.pData_, buf.size_); diff --git a/src/exif.cpp b/src/exif.cpp index 85c015ef..493fd20b 100644 --- a/src/exif.cpp +++ b/src/exif.cpp @@ -219,10 +219,19 @@ namespace Exiv2 { std::ostream& Exifdatum::write(std::ostream& os, const ExifData* pMetadata) const { if (value().count() == 0) return os; - PrintFct fct = printValue; - const TagInfo* ti = Internal::tagInfo(tag(), static_cast(ifdId())); - if (ti != 0) fct = ti->printFct_; - return fct(os, value(), pMetadata); + + PrintFct fct = printValue; + const TagInfo* ti = Internal::tagInfo(tag(), static_cast(ifdId())); + // be careful with comments (User.Photo.UserComment, GPSAreaInfo etc). + if ( ti ) { + fct = ti->printFct_; + if ( ti->typeId_ == comment ) { + os << value().toString(); + fct=NULL; + } + } + if ( fct ) fct(os, value(), pMetadata); + return os; } const Value& Exifdatum::value() const diff --git a/src/value.cpp b/src/value.cpp index 4df92221..a1593e1e 100644 --- a/src/value.cpp +++ b/src/value.cpp @@ -555,6 +555,16 @@ namespace Exiv2 { return os << comment(); } + static bool isBinary(const std::string& s) + { + bool result = false ; + size_t i = 0; + while ( !result && i < s.length() ) { + result = s[i++] < 32 || s[i] > 127 ; + } + return result; + } + std::string CommentValue::comment(const char* encoding) const { std::string c; @@ -565,6 +575,10 @@ namespace Exiv2 { if (charsetId() == unicode) { const char* from = encoding == 0 || *encoding == '\0' ? detectCharset(c) : encoding; convertStringCharset(c, from, "UTF-8"); + } else { + if ( isBinary(c) ) { + c = "binary comment" ; + } } return c; } @@ -1191,7 +1205,7 @@ namespace Exiv2 { time_.hour, time_.minute, time_.second, plusMinus, abs(time_.tzHour), abs(time_.tzMinute)); - enforce(wrote == 11, Exiv2::kerUnsupportedTimeFormat); + // enforce(wrote == 11, Exiv2::kerUnsupportedTimeFormat); std::memcpy(buf, temp, wrote); return wrote; } diff --git a/test/Makefile b/test/Makefile index 7a5100ee..0f501f1a 100644 --- a/test/Makefile +++ b/test/Makefile @@ -72,29 +72,24 @@ SVN = svn://dev.exiv2.org/svn/testdata/trunk ## # Add test drivers to this list -TESTS1 = addmoddel.sh \ +TESTS = addmoddel.sh \ conversions.sh \ + exifdata-test.sh \ + exiv2-test.sh \ geotag-test.sh \ icc-test.sh \ - iso65k-test.sh \ - modify-test.sh \ - path-test.sh \ - stringto-test.sh \ - webp-test.sh \ - write2-test.sh \ - -# the following tests are broken on UNIX -# You can manually run all the tests: `cd /test ; env EXIV2_BINDIR=$PWD/../build/bin make test` -# You can manually run a single test: `cd /test ; env EXIV2_BINDIR=$PWD/../build/bin ./iotest.sh` -# Or: make iotest -TESTS2 = exifdata-test.sh \ - exiv2-test.sh \ imagetest.sh \ iotest.sh \ iptctest.sh \ + iso65k-test.sh \ + modify-test.sh \ + path-test.sh \ preview-test.sh \ + stringto-test.sh \ tiff-test.sh \ + webp-test.sh \ write-test.sh \ + write2-test.sh \ xmpparser-test.sh # video tests @@ -136,30 +131,29 @@ xmpparser-test: version_test \ unit_test : + @echo + @echo ---- Running $@ ---- + @echo -@./$@.sh -bash_tests: - -@if [ -e $$EXIV2_BINDIR/../Makefile ]; then \ - -@./$@.sh ; \ - else \ - make alltest ; \ - fi - tests: -@if [ -e $$EXIV2_BINDIR/../Makefile ]; then \ -@./$@.sh ; \ else \ - make unit_test ; make alltest ; make python_tests ; make version_test ; \ + make unit_test ; \ + make bash_tests ; \ + make python_tests ; \ + make version_test ; \ fi -alltest: +bash_tests: @echo - @echo ---- Running bash tests: ALL ---- + @echo ---- Running bash_tests ---- @echo - mkdir -p tmp + @mkdir -p tmp @rm -rf tmp/test-failed - @list='$(TESTS1) $(TESTS2)'; for p in $$list; do \ + @list='$(TESTS)'; for p in $$list; do \ echo Running $$p ...; \ ./$$p; \ rc=$$?; \ @@ -168,25 +162,13 @@ alltest: done @if [ -e tmp/test-failed ]; then echo ; echo '***' FAILED ; cat tmp/test-failed ; echo '***' ; fi -unixtest: - @echo - @echo ---- Running bash tests: UNIX subset ---- - @echo - mkdir -p tmp - @rm -rf tmp/test-failed - @list='$(TESTS1)'; for p in $$list; do \ - echo Running $$p ...; \ - ./$$p; \ - rc=$$?; \ - if [ $$rc -ne 0 ]; then echo '***' ; echo '***' $$p result = $$rc ; echo '***' ; fi ; \ - if [ $$rc -ne 0 ]; then echo '***' $$p result = $$rc >> tmp/test-failed ; fi ; \ - done - @if [ -e tmp/test-failed ]; then echo '***' FAILED ; cat tmp/test-failed ; echo '***' ; fi python_tests: + @echo + @echo ---- Running python_tests ---- + @echo -( cd ../tests ; if [ ! -z $$VERBOSE ]; then verbose=--verbose ;fi ; python3 runner.py $$verbose ) - testv: @for t in /video ; do \ if [ ! -e data/$$t ]; then \ diff --git a/test/data/exifdata-test.out b/test/data/exifdata-test.out index 62d08856..4032cec9 100644 --- a/test/data/exifdata-test.out +++ b/test/data/exifdata-test.out @@ -267,7 +267,7 @@ Exif.Canon.FileNumber 0x0008 Makernote Long 1 Exif.Canon.OwnerName 0x0009 Makernote Ascii 32 Andreas Huggel Exif.Canon.ModelID 0x0010 Makernote Long 1 17891328 Exif.Canon.CameraInfo 0x000d Makernote Short 21 42 3 32769 378 32769 0 0 0 259 2 0 10 0 0 0 57 198 5 0 0 0 -Exif.Photo.UserComment 0x9286 Exif Undefined 264 +Exif.Photo.UserComment 0x9286 Exif Undefined 264 binary comment Exif.Photo.FlashpixVersion 0xa000 Exif Undefined 4 48 49 48 48 Exif.Photo.ColorSpace 0xa001 Exif Short 1 1 Exif.Photo.PixelXDimension 0xa002 Exif Short 1 2272 @@ -396,7 +396,7 @@ Exif.Canon.FileNumber 0x0008 Makernote Long 1 Exif.Canon.OwnerName 0x0009 Makernote Ascii 32 Andreas Huggel Exif.Canon.ModelID 0x0010 Makernote Long 1 17891328 Exif.Canon.CameraInfo 0x000d Makernote Short 21 42 3 32769 378 32769 0 0 0 259 2 0 10 0 0 0 57 198 5 0 0 0 -Exif.Photo.UserComment 0x9286 Exif Undefined 264 +Exif.Photo.UserComment 0x9286 Exif Undefined 264 binary comment Exif.Photo.FlashpixVersion 0xa000 Exif Undefined 4 48 49 48 48 Exif.Photo.ColorSpace 0xa001 Exif Short 1 1 Exif.Photo.PixelXDimension 0xa002 Exif Short 1 2272 @@ -526,7 +526,7 @@ Exif.Canon.FileNumber 0x0008 Makernote Long 1 Exif.Canon.OwnerName 0x0009 Makernote Ascii 32 Andreas Huggel Exif.Canon.ModelID 0x0010 Makernote Long 1 17891328 Exif.Canon.CameraInfo 0x000d Makernote Short 21 42 3 32769 378 32769 0 0 0 259 2 0 10 0 0 0 57 198 5 0 0 0 -Exif.Photo.UserComment 0x9286 Exif Undefined 264 +Exif.Photo.UserComment 0x9286 Exif Undefined 264 binary comment Exif.Photo.FlashpixVersion 0xa000 Exif Undefined 4 48 49 48 48 Exif.Photo.ColorSpace 0xa001 Exif Short 1 1 Exif.Photo.PixelXDimension 0xa002 Exif Short 1 2272 @@ -656,7 +656,7 @@ Exif.Canon.FileNumber 0x0008 Makernote Long 1 Exif.Canon.OwnerName 0x0009 Makernote Ascii 32 Andreas Huggel Exif.Canon.ModelID 0x0010 Makernote Long 1 17891328 Exif.Canon.CameraInfo 0x000d Makernote Short 21 42 3 32769 378 32769 0 0 0 259 2 0 10 0 0 0 57 198 5 0 0 0 -Exif.Photo.UserComment 0x9286 Exif Undefined 264 +Exif.Photo.UserComment 0x9286 Exif Undefined 264 binary comment Exif.Photo.FlashpixVersion 0xa000 Exif Undefined 4 48 49 48 48 Exif.Photo.ColorSpace 0xa001 Exif Short 1 1 Exif.Photo.PixelXDimension 0xa002 Exif Short 1 2272 diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out index ab2e49bd..9ebae191 100644 --- a/test/data/exiv2-test.out +++ b/test/data/exiv2-test.out @@ -252,7 +252,7 @@ File 2/15: 20031214_000043.jpg 20031214_000043.jpg White balance : Auto 20031214_000043.jpg Thumbnail : image/jpeg, 5448 Bytes 20031214_000043.jpg Copyright : -20031214_000043.jpg Exif comment : +20031214_000043.jpg Exif comment : binary comment File 3/15: 20000506_020544.jpg 20000506_020544.jpg File name : 20000506_020544.jpg @@ -306,7 +306,7 @@ File 4/15: 20040329_224245.jpg 20040329_224245.jpg White balance : AUTO 20040329_224245.jpg Thumbnail : image/jpeg, 8930 Bytes 20040329_224245.jpg Copyright : -20040329_224245.jpg Exif comment : +20040329_224245.jpg Exif comment : charset="Ascii" File 5/15: 20010405_235039.jpg 20010405_235039.jpg File name : 20010405_235039.jpg @@ -360,7 +360,7 @@ File 6/15: 20030925_201850.jpg 20030925_201850.jpg White balance : Auto 20030925_201850.jpg Thumbnail : image/jpeg, 9728 Bytes 20030925_201850.jpg Copyright : -20030925_201850.jpg Exif comment : +20030925_201850.jpg Exif comment : binary comment File 7/15: 20001026_044550.jpg 20001026_044550.jpg File name : 20001026_044550.jpg @@ -550,7 +550,7 @@ Warning: Directory Canon has an unexpected next pointer; ignored. 20060802_095200.jpg White balance : Custom 20060802_095200.jpg Thumbnail : image/jpeg, 6260 Bytes 20060802_095200.jpg Copyright : -20060802_095200.jpg Exif comment : +20060802_095200.jpg Exif comment : binary comment File 14/15: 20001004_015404.jpg 20001004_015404.jpg File name : 20001004_015404.jpg @@ -577,7 +577,7 @@ File 14/15: 20001004_015404.jpg 20001004_015404.jpg White balance : Daylight 20001004_015404.jpg Thumbnail : image/jpeg, 13824 Bytes 20001004_015404.jpg Copyright : -20001004_015404.jpg Exif comment : +20001004_015404.jpg Exif comment : binary comment File 15/15: 20060127_225027.jpg 20060127_225027.jpg File name : 20060127_225027.jpg @@ -604,7 +604,7 @@ File 15/15: 20060127_225027.jpg 20060127_225027.jpg White balance : Auto 20060127_225027.jpg Thumbnail : image/jpeg, 6137 Bytes 20060127_225027.jpg Copyright : -20060127_225027.jpg Exif comment : +20060127_225027.jpg Exif comment : binary comment File 1/15: exiv2-empty.jpg exiv2-empty.jpg: No Exif data found in the file @@ -710,7 +710,7 @@ File 2/15: 20031214_000043.jpg 20031214_000043.jpg Exif.Canon.OwnerName Ascii 32 Andreas Huggel 20031214_000043.jpg Exif.Canon.ModelID Long 1 PowerShot S40 20031214_000043.jpg Exif.Canon.CameraInfo Short 21 42 3 32769 378 32769 0 0 0 259 2 0 10 0 0 0 57 198 5 0 0 0 -20031214_000043.jpg Exif.Photo.UserComment Undefined 264 +20031214_000043.jpg Exif.Photo.UserComment Undefined 264 binary comment 20031214_000043.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 20031214_000043.jpg Exif.Photo.ColorSpace Short 1 sRGB 20031214_000043.jpg Exif.Photo.PixelXDimension Short 1 2272 @@ -934,7 +934,7 @@ File 4/15: 20040329_224245.jpg 20040329_224245.jpg Exif.Nikon3.ImageOptimization Ascii 16 NORMAL 20040329_224245.jpg Exif.Nikon3.Saturation Ascii 16 NORMAL 20040329_224245.jpg Exif.Nikon3.VariProgram Ascii 16 -20040329_224245.jpg Exif.Photo.UserComment Undefined 44 +20040329_224245.jpg Exif.Photo.UserComment Undefined 44 charset="Ascii" 20040329_224245.jpg Exif.Photo.SubSecTime Ascii 3 00 20040329_224245.jpg Exif.Photo.SubSecTimeOriginal Ascii 3 00 20040329_224245.jpg Exif.Photo.SubSecTimeDigitized Ascii 3 00 @@ -1184,7 +1184,7 @@ File 6/15: 20030925_201850.jpg 20030925_201850.jpg Exif.Canon.ThumbnailImageValidArea Short 4 0 159 7 112 20030925_201850.jpg Exif.Canon.0x0000 Short 5 0 0 0 0 0 20030925_201850.jpg Exif.Canon.0x00b6 Long 12 24 2 380376 1536 1024 2449882 3072000 892 2048000 595 65540 262146 -20030925_201850.jpg Exif.Photo.UserComment Undefined 264 +20030925_201850.jpg Exif.Photo.UserComment Undefined 264 binary comment 20030925_201850.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 20030925_201850.jpg Exif.Photo.ColorSpace Short 1 sRGB 20030925_201850.jpg Exif.Photo.PixelXDimension Short 1 3072 @@ -1818,7 +1818,7 @@ Warning: Directory Canon has an unexpected next pointer; ignored. 20060802_095200.jpg Exif.Canon.ColorData Short 582 1164 875 1024 1024 365 600 1024 1024 530 421 1024 1024 774 266 295 294 103 206 333 332 170 157 359 358 274 1929 1015 1015 1433 5200 2104 1023 1023 1274 6172 1929 1023 1023 1433 5200 2215 1023 1023 1189 7000 2087 1023 1023 1295 6000 1364 1023 1023 2344 3198 1737 1023 1023 1999 3945 2108 1023 1023 1261 6258 1929 1023 1023 1433 5200 1929 1023 1023 1433 5200 414 1081 65151 11661 427 1024 65187 9907 451 937 65247 8000 473 881 65291 7000 502 809 65349 6000 523 767 65387 5600 543 731 65421 5200 567 675 65469 4792 601 621 65524 4352 633 583 31 4056 680 531 93 3696 757 455 189 3250 801 424 235 3051 851 391 286 2871 1015 314 425 2413 500 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 128 127 128 127 25 25 26 22 24 45 52 49 75 62 53 45 39 36 34 35 22 19 20 22 65 66 58 50 47 45 42 40 37 31 34 33 19 20 25 43 90 77 61 55 52 48 56 55 52 32 32 34 23 29 31 58 102 68 57 55 48 54 61 60 52 37 29 31 49 48 50 44 42 65 71 71 105 84 69 57 48 44 39 33 45 39 41 43 114 114 99 84 75 66 59 54 49 39 39 36 42 44 53 81 163 137 104 94 89 77 82 79 72 44 41 40 53 64 69 111 187 122 99 96 83 86 92 88 75 52 41 43 48 46 48 41 40 69 79 73 107 85 69 56 47 43 38 34 45 39 41 43 114 114 98 83 74 65 59 53 48 39 39 35 42 43 53 81 163 136 104 93 87 76 82 79 72 43 39 37 54 65 69 112 187 122 99 96 81 85 92 87 74 51 39 36 51 49 48 38 33 47 49 50 71 54 43 34 27 24 19 14 43 36 37 35 81 78 66 54 47 40 34 29 25 19 17 14 38 39 46 61 113 92 68 60 54 44 42 39 34 20 17 16 46 55 58 81 129 80 63 60 50 47 46 43 35 23 17 16 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 0 108 11 18 43 12 8 1 61 536 2289 4660 2775 581 345 537 5 165 96 193 800 1156 815 320 712 581 633 1002 695 213 227 1673 29 269 134 272 1019 6912 2788 699 1345 572 234 1829 3203 465 203 310 8 2636 1181 1944 3081 12356 2263 706 1146 351 500 11994 21415 1562 417 675 4 727 454 512 726 424 920 0 111 145 143 87 1023 1024 1024 0 1 0 0 0 0 0 0 1156 1024 1024 2660 3817 6327 20060802_095200.jpg Exif.Canon.0x4002 Short 2676 5352 0 0 0 5657 65535 65280 41984 1297 65535 400 0 28673 916 4062 371 141 53 459 3783 3200 0 39061 38552 64 64 64 0 29590 28815 50703 0 0 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 0 118 578 1869 0 4589 1951 95 4383 2004 146 12794 2001 192 12535 2032 224 1100 12462 2038 238 1520 32809 0 252 1040 1040 1040 0 17 19 1331 28 58 128 817 8 18 0 32 32 32 0 1 0 2 192 19335 511 512 512 512 1 1 78 151 28 0 768 0 0 768 0 0 2054 2827 17 32 0 17151 1 2816 512 21862 2672 63 9 29 6 26 133 63 13 32 5 15 67 63 10 41 5 21 68 63 21 36 16 28 102 63 13 32 10 27 118 40 512 202 132 0 1311 0 40 384 144 88 0 1048 0 48 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 1 0 0 560 400 3080 1099 900 710 1543 1652 0 0 0 0 0 0 0 0 256 0 0 0 0 0 0 0 256 256 32 4353 256 256 0 0 0 0 0 0 400 400 400 4496 4496 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 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 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 64 64 64 64 64 64 0 28 58 20 40 64 64 50 0 62 55 10 35 64 35 48 70 46 55 30 64 52 32 64 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 0 118 644 1826 0 4561 1941 101 8669 1973 147 12700 2027 185 12582 2036 215 990 12550 2034 226 1500 32816 0 251 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2029 220 990 12515 2034 230 1500 32816 0 251 0 118 578 1869 0 4589 1951 95 4383 2004 146 12794 2001 192 12535 2032 224 1100 12462 2038 238 1520 32809 0 252 0 118 492 1954 0 316 1970 93 4397 2006 154 8488 2012 204 12473 2022 237 990 12406 2040 243 1235 32796 0 249 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 2056 8 8 8 80 25703 8500 80 25703 8500 80 25703 8500 84 25703 8500 84 25703 8500 78 151 28 98 158 1 138 118 1 254 1 1 1 254 1 2054 2827 17 32 2054 2827 17 32 2054 2827 17 32 4104 6678 292 32 6666 10019 312 32 63 21 36 16 28 102 63 13 32 10 27 118 63 21 36 16 28 102 63 13 32 10 27 118 63 21 36 8 14 51 63 13 32 10 27 118 63 0 0 0 0 0 63 13 32 10 27 118 63 0 0 0 0 0 63 13 32 10 27 118 38 43 48 58 67 128 128 128 128 128 128 128 128 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 5000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 7000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 3000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 5000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 7000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 3000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 5000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 7000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 3000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 5000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 7000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 3000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 5000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 7000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 3000 65524 65524 14 0 5000 65524 65524 14 0 7000 65524 65524 14 0 3000 65530 65530 7 0 5000 65530 65530 7 0 7000 65530 65530 7 0 3000 0 0 0 0 5000 0 0 0 0 7000 0 0 0 0 3000 6 6 65529 0 5000 6 6 65529 0 7000 6 6 65529 0 3000 12 12 65522 0 5000 12 12 65522 0 7000 12 12 65522 0 3000 65522 65522 15 0 5000 65522 65522 15 0 7000 65522 65522 15 0 3000 65530 65530 7 0 5000 65530 65530 7 0 7000 65530 65530 7 0 3000 0 0 0 0 5000 0 0 0 0 7000 0 0 0 0 3000 6 6 65529 0 5000 6 6 65529 0 7000 6 6 65529 0 3000 13 12 65522 0 5000 13 12 65522 0 7000 13 12 65522 0 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 2 0 142 143 141 0 2 6 10 14 18 22 26 30 34 38 42 46 50 54 58 62 66 70 74 78 82 86 90 94 98 102 106 110 114 118 122 126 130 134 138 142 146 150 154 158 162 166 170 174 178 182 186 190 194 198 202 206 210 214 218 222 226 230 234 238 242 246 250 254 258 262 266 270 274 278 282 286 290 294 298 304 308 312 316 320 324 328 332 336 340 346 350 354 360 364 368 374 378 384 388 394 400 404 410 416 420 426 432 438 444 452 458 464 472 478 486 494 500 510 518 526 534 542 552 560 568 578 586 596 604 614 624 632 642 652 662 672 682 692 704 714 726 736 748 758 770 782 794 806 820 834 846 860 874 888 904 920 936 952 970 988 1004 1022 1040 1058 1076 1094 1112 1130 1148 1166 1184 1202 1222 1240 1258 1276 1296 1314 1334 1352 1372 1390 1410 1428 1448 1468 1488 1506 1526 1546 1566 1586 1606 1626 1646 1668 1688 1708 1730 1752 1772 1794 1816 1840 1862 1886 1908 1932 1956 1982 2006 2032 2058 2084 2110 2138 2166 2194 2222 2250 2280 2310 2340 2370 2400 2430 2462 2492 2524 2554 2586 2618 2650 2682 2714 2746 2780 2812 2846 2880 2914 2948 2982 3018 3052 3088 3124 3160 3196 3232 3270 3306 3344 3382 3420 3460 3498 3538 3578 20060802_095200.jpg Exif.Canon.0x4003 Short 22 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -20060802_095200.jpg Exif.Photo.UserComment Undefined 264 +20060802_095200.jpg Exif.Photo.UserComment Undefined 264 binary comment 20060802_095200.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 20060802_095200.jpg Exif.Photo.ColorSpace Short 1 sRGB 20060802_095200.jpg Exif.Photo.PixelXDimension Short 1 3504 @@ -1949,7 +1949,7 @@ File 14/15: 20001004_015404.jpg 20001004_015404.jpg Exif.CanonCf.MenuButtonReturn Short 1 2816 20001004_015404.jpg Exif.CanonCf.SetButtonFunction Short 1 3072 20001004_015404.jpg Exif.CanonCf.SensorCleaning Short 1 3328 -20001004_015404.jpg Exif.Photo.UserComment Undefined 264 +20001004_015404.jpg Exif.Photo.UserComment Undefined 264 binary comment 20001004_015404.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 20001004_015404.jpg Exif.Photo.ColorSpace Short 1 sRGB 20001004_015404.jpg Exif.Photo.PixelXDimension Short 1 2160 @@ -2122,7 +2122,7 @@ File 15/15: 20060127_225027.jpg 20060127_225027.jpg Exif.Canon.0x0019 Short 1 1 20060127_225027.jpg Exif.Canon.0x001c Short 1 0 20060127_225027.jpg Exif.Canon.CameraInfo Short 36 72 9 404 405 403 402 406 403 401 404 403 64 0 0 310 2 0 10 2 2 10 65310 387 4 65534 1024 0 0 0 0 0 132 0 0 128 10 -20060127_225027.jpg Exif.Photo.UserComment Undefined 264 +20060127_225027.jpg Exif.Photo.UserComment Undefined 264 binary comment 20060127_225027.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 20060127_225027.jpg Exif.Photo.ColorSpace Short 1 sRGB 20060127_225027.jpg Exif.Photo.PixelXDimension Short 1 2272 @@ -2323,7 +2323,7 @@ Compare image data and extracted data ------------------------------------ < 20031214_000043.jpg Exif.Canon.OwnerName Ascii 32 Andreas Huggel < 20031214_000043.jpg Exif.Canon.ModelID Long 1 PowerShot S40 < 20031214_000043.jpg Exif.Canon.CameraInfo Short 21 42 3 32769 378 32769 0 0 0 259 2 0 10 0 0 0 57 198 5 0 0 0 -< 20031214_000043.jpg Exif.Photo.UserComment Undefined 264 +< 20031214_000043.jpg Exif.Photo.UserComment Undefined 264 binary comment < 20031214_000043.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 < 20031214_000043.jpg Exif.Photo.ColorSpace Short 1 sRGB < 20031214_000043.jpg Exif.Photo.PixelXDimension Short 1 2272 @@ -2547,7 +2547,7 @@ Compare image data and extracted data ------------------------------------ < 20040329_224245.jpg Exif.Nikon3.ImageOptimization Ascii 16 NORMAL < 20040329_224245.jpg Exif.Nikon3.Saturation Ascii 16 NORMAL < 20040329_224245.jpg Exif.Nikon3.VariProgram Ascii 16 -< 20040329_224245.jpg Exif.Photo.UserComment Undefined 44 +< 20040329_224245.jpg Exif.Photo.UserComment Undefined 44 charset="Ascii" < 20040329_224245.jpg Exif.Photo.SubSecTime Ascii 3 00 < 20040329_224245.jpg Exif.Photo.SubSecTimeOriginal Ascii 3 00 < 20040329_224245.jpg Exif.Photo.SubSecTimeDigitized Ascii 3 00 @@ -2797,7 +2797,7 @@ Compare image data and extracted data ------------------------------------ < 20030925_201850.jpg Exif.Canon.ThumbnailImageValidArea Short 4 0 159 7 112 < 20030925_201850.jpg Exif.Canon.0x0000 Short 5 0 0 0 0 0 < 20030925_201850.jpg Exif.Canon.0x00b6 Long 12 24 2 380376 1536 1024 2449882 3072000 892 2048000 595 65540 262146 -< 20030925_201850.jpg Exif.Photo.UserComment Undefined 264 +< 20030925_201850.jpg Exif.Photo.UserComment Undefined 264 binary comment < 20030925_201850.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 < 20030925_201850.jpg Exif.Photo.ColorSpace Short 1 sRGB < 20030925_201850.jpg Exif.Photo.PixelXDimension Short 1 3072 @@ -3430,7 +3430,7 @@ Compare image data and extracted data ------------------------------------ < 20060802_095200.jpg Exif.Canon.ColorData Short 582 1164 875 1024 1024 365 600 1024 1024 530 421 1024 1024 774 266 295 294 103 206 333 332 170 157 359 358 274 1929 1015 1015 1433 5200 2104 1023 1023 1274 6172 1929 1023 1023 1433 5200 2215 1023 1023 1189 7000 2087 1023 1023 1295 6000 1364 1023 1023 2344 3198 1737 1023 1023 1999 3945 2108 1023 1023 1261 6258 1929 1023 1023 1433 5200 1929 1023 1023 1433 5200 414 1081 65151 11661 427 1024 65187 9907 451 937 65247 8000 473 881 65291 7000 502 809 65349 6000 523 767 65387 5600 543 731 65421 5200 567 675 65469 4792 601 621 65524 4352 633 583 31 4056 680 531 93 3696 757 455 189 3250 801 424 235 3051 851 391 286 2871 1015 314 425 2413 500 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 128 127 128 127 25 25 26 22 24 45 52 49 75 62 53 45 39 36 34 35 22 19 20 22 65 66 58 50 47 45 42 40 37 31 34 33 19 20 25 43 90 77 61 55 52 48 56 55 52 32 32 34 23 29 31 58 102 68 57 55 48 54 61 60 52 37 29 31 49 48 50 44 42 65 71 71 105 84 69 57 48 44 39 33 45 39 41 43 114 114 99 84 75 66 59 54 49 39 39 36 42 44 53 81 163 137 104 94 89 77 82 79 72 44 41 40 53 64 69 111 187 122 99 96 83 86 92 88 75 52 41 43 48 46 48 41 40 69 79 73 107 85 69 56 47 43 38 34 45 39 41 43 114 114 98 83 74 65 59 53 48 39 39 35 42 43 53 81 163 136 104 93 87 76 82 79 72 43 39 37 54 65 69 112 187 122 99 96 81 85 92 87 74 51 39 36 51 49 48 38 33 47 49 50 71 54 43 34 27 24 19 14 43 36 37 35 81 78 66 54 47 40 34 29 25 19 17 14 38 39 46 61 113 92 68 60 54 44 42 39 34 20 17 16 46 55 58 81 129 80 63 60 50 47 46 43 35 23 17 16 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 0 108 11 18 43 12 8 1 61 536 2289 4660 2775 581 345 537 5 165 96 193 800 1156 815 320 712 581 633 1002 695 213 227 1673 29 269 134 272 1019 6912 2788 699 1345 572 234 1829 3203 465 203 310 8 2636 1181 1944 3081 12356 2263 706 1146 351 500 11994 21415 1562 417 675 4 727 454 512 726 424 920 0 111 145 143 87 1023 1024 1024 0 1 0 0 0 0 0 0 1156 1024 1024 2660 3817 6327 < 20060802_095200.jpg Exif.Canon.0x4002 Short 2676 5352 0 0 0 5657 65535 65280 41984 1297 65535 400 0 28673 916 4062 371 141 53 459 3783 3200 0 39061 38552 64 64 64 0 29590 28815 50703 0 0 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 0 118 578 1869 0 4589 1951 95 4383 2004 146 12794 2001 192 12535 2032 224 1100 12462 2038 238 1520 32809 0 252 1040 1040 1040 0 17 19 1331 28 58 128 817 8 18 0 32 32 32 0 1 0 2 192 19335 511 512 512 512 1 1 78 151 28 0 768 0 0 768 0 0 2054 2827 17 32 0 17151 1 2816 512 21862 2672 63 9 29 6 26 133 63 13 32 5 15 67 63 10 41 5 21 68 63 21 36 16 28 102 63 13 32 10 27 118 40 512 202 132 0 1311 0 40 384 144 88 0 1048 0 48 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 1 0 0 560 400 3080 1099 900 710 1543 1652 0 0 0 0 0 0 0 0 256 0 0 0 0 0 0 0 256 256 32 4353 256 256 0 0 0 0 0 0 400 400 400 4496 4496 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 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 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 64 64 64 64 64 64 0 28 58 20 40 64 64 50 0 62 55 10 35 64 35 48 70 46 55 30 64 52 32 64 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 0 118 644 1826 0 4561 1941 101 8669 1973 147 12700 2027 185 12582 2036 215 990 12550 2034 226 1500 32816 0 251 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2029 220 990 12515 2034 230 1500 32816 0 251 0 118 578 1869 0 4589 1951 95 4383 2004 146 12794 2001 192 12535 2032 224 1100 12462 2038 238 1520 32809 0 252 0 118 492 1954 0 316 1970 93 4397 2006 154 8488 2012 204 12473 2022 237 990 12406 2040 243 1235 32796 0 249 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 2056 8 8 8 80 25703 8500 80 25703 8500 80 25703 8500 84 25703 8500 84 25703 8500 78 151 28 98 158 1 138 118 1 254 1 1 1 254 1 2054 2827 17 32 2054 2827 17 32 2054 2827 17 32 4104 6678 292 32 6666 10019 312 32 63 21 36 16 28 102 63 13 32 10 27 118 63 21 36 16 28 102 63 13 32 10 27 118 63 21 36 8 14 51 63 13 32 10 27 118 63 0 0 0 0 0 63 13 32 10 27 118 63 0 0 0 0 0 63 13 32 10 27 118 38 43 48 58 67 128 128 128 128 128 128 128 128 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 5000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 7000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 3000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 5000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 7000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 3000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 5000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 7000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 3000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 5000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 7000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 3000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 5000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 7000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 3000 65524 65524 14 0 5000 65524 65524 14 0 7000 65524 65524 14 0 3000 65530 65530 7 0 5000 65530 65530 7 0 7000 65530 65530 7 0 3000 0 0 0 0 5000 0 0 0 0 7000 0 0 0 0 3000 6 6 65529 0 5000 6 6 65529 0 7000 6 6 65529 0 3000 12 12 65522 0 5000 12 12 65522 0 7000 12 12 65522 0 3000 65522 65522 15 0 5000 65522 65522 15 0 7000 65522 65522 15 0 3000 65530 65530 7 0 5000 65530 65530 7 0 7000 65530 65530 7 0 3000 0 0 0 0 5000 0 0 0 0 7000 0 0 0 0 3000 6 6 65529 0 5000 6 6 65529 0 7000 6 6 65529 0 3000 13 12 65522 0 5000 13 12 65522 0 7000 13 12 65522 0 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 2 0 142 143 141 0 2 6 10 14 18 22 26 30 34 38 42 46 50 54 58 62 66 70 74 78 82 86 90 94 98 102 106 110 114 118 122 126 130 134 138 142 146 150 154 158 162 166 170 174 178 182 186 190 194 198 202 206 210 214 218 222 226 230 234 238 242 246 250 254 258 262 266 270 274 278 282 286 290 294 298 304 308 312 316 320 324 328 332 336 340 346 350 354 360 364 368 374 378 384 388 394 400 404 410 416 420 426 432 438 444 452 458 464 472 478 486 494 500 510 518 526 534 542 552 560 568 578 586 596 604 614 624 632 642 652 662 672 682 692 704 714 726 736 748 758 770 782 794 806 820 834 846 860 874 888 904 920 936 952 970 988 1004 1022 1040 1058 1076 1094 1112 1130 1148 1166 1184 1202 1222 1240 1258 1276 1296 1314 1334 1352 1372 1390 1410 1428 1448 1468 1488 1506 1526 1546 1566 1586 1606 1626 1646 1668 1688 1708 1730 1752 1772 1794 1816 1840 1862 1886 1908 1932 1956 1982 2006 2032 2058 2084 2110 2138 2166 2194 2222 2250 2280 2310 2340 2370 2400 2430 2462 2492 2524 2554 2586 2618 2650 2682 2714 2746 2780 2812 2846 2880 2914 2948 2982 3018 3052 3088 3124 3160 3196 3232 3270 3306 3344 3382 3420 3460 3498 3538 3578 < 20060802_095200.jpg Exif.Canon.0x4003 Short 22 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -< 20060802_095200.jpg Exif.Photo.UserComment Undefined 264 +< 20060802_095200.jpg Exif.Photo.UserComment Undefined 264 binary comment < 20060802_095200.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 < 20060802_095200.jpg Exif.Photo.ColorSpace Short 1 sRGB < 20060802_095200.jpg Exif.Photo.PixelXDimension Short 1 3504 @@ -3561,7 +3561,7 @@ Compare image data and extracted data ------------------------------------ < 20001004_015404.jpg Exif.CanonCf.MenuButtonReturn Short 1 2816 < 20001004_015404.jpg Exif.CanonCf.SetButtonFunction Short 1 3072 < 20001004_015404.jpg Exif.CanonCf.SensorCleaning Short 1 3328 -< 20001004_015404.jpg Exif.Photo.UserComment Undefined 264 +< 20001004_015404.jpg Exif.Photo.UserComment Undefined 264 binary comment < 20001004_015404.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 < 20001004_015404.jpg Exif.Photo.ColorSpace Short 1 sRGB < 20001004_015404.jpg Exif.Photo.PixelXDimension Short 1 2160 @@ -3734,7 +3734,7 @@ Compare image data and extracted data ------------------------------------ < 20060127_225027.jpg Exif.Canon.0x0019 Short 1 1 < 20060127_225027.jpg Exif.Canon.0x001c Short 1 0 < 20060127_225027.jpg Exif.Canon.CameraInfo Short 36 72 9 404 405 403 402 406 403 401 404 403 64 0 0 310 2 0 10 2 2 10 65310 387 4 65534 1024 0 0 0 0 0 132 0 0 128 10 -< 20060127_225027.jpg Exif.Photo.UserComment Undefined 264 +< 20060127_225027.jpg Exif.Photo.UserComment Undefined 264 binary comment < 20060127_225027.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 < 20060127_225027.jpg Exif.Photo.ColorSpace Short 1 sRGB < 20060127_225027.jpg Exif.Photo.PixelXDimension Short 1 2272 @@ -3864,7 +3864,7 @@ Compare image data and extracted data ------------------------------------ > 20031214_000043.exv Exif.Canon.OwnerName Ascii 32 Andreas Huggel > 20031214_000043.exv Exif.Canon.ModelID Long 1 PowerShot S40 > 20031214_000043.exv Exif.Canon.CameraInfo Short 21 42 3 32769 378 32769 0 0 0 259 2 0 10 0 0 0 57 198 5 0 0 0 -> 20031214_000043.exv Exif.Photo.UserComment Undefined 264 +> 20031214_000043.exv Exif.Photo.UserComment Undefined 264 binary comment > 20031214_000043.exv Exif.Photo.FlashpixVersion Undefined 4 1.00 > 20031214_000043.exv Exif.Photo.ColorSpace Short 1 sRGB > 20031214_000043.exv Exif.Photo.PixelXDimension Short 1 2272 @@ -4088,7 +4088,7 @@ Compare image data and extracted data ------------------------------------ > 20040329_224245.exv Exif.Nikon3.ImageOptimization Ascii 16 NORMAL > 20040329_224245.exv Exif.Nikon3.Saturation Ascii 16 NORMAL > 20040329_224245.exv Exif.Nikon3.VariProgram Ascii 16 -> 20040329_224245.exv Exif.Photo.UserComment Undefined 44 +> 20040329_224245.exv Exif.Photo.UserComment Undefined 44 charset="Ascii" > 20040329_224245.exv Exif.Photo.SubSecTime Ascii 3 00 > 20040329_224245.exv Exif.Photo.SubSecTimeOriginal Ascii 3 00 > 20040329_224245.exv Exif.Photo.SubSecTimeDigitized Ascii 3 00 @@ -4338,7 +4338,7 @@ Compare image data and extracted data ------------------------------------ > 20030925_201850.exv Exif.Canon.ThumbnailImageValidArea Short 4 0 159 7 112 > 20030925_201850.exv Exif.Canon.0x0000 Short 5 0 0 0 0 0 > 20030925_201850.exv Exif.Canon.0x00b6 Long 12 24 2 380376 1536 1024 2449882 3072000 892 2048000 595 65540 262146 -> 20030925_201850.exv Exif.Photo.UserComment Undefined 264 +> 20030925_201850.exv Exif.Photo.UserComment Undefined 264 binary comment > 20030925_201850.exv Exif.Photo.FlashpixVersion Undefined 4 1.00 > 20030925_201850.exv Exif.Photo.ColorSpace Short 1 sRGB > 20030925_201850.exv Exif.Photo.PixelXDimension Short 1 3072 @@ -4971,7 +4971,7 @@ Compare image data and extracted data ------------------------------------ > 20060802_095200.exv Exif.Canon.ColorData Short 582 1164 875 1024 1024 365 600 1024 1024 530 421 1024 1024 774 266 295 294 103 206 333 332 170 157 359 358 274 1929 1015 1015 1433 5200 2104 1023 1023 1274 6172 1929 1023 1023 1433 5200 2215 1023 1023 1189 7000 2087 1023 1023 1295 6000 1364 1023 1023 2344 3198 1737 1023 1023 1999 3945 2108 1023 1023 1261 6258 1929 1023 1023 1433 5200 1929 1023 1023 1433 5200 414 1081 65151 11661 427 1024 65187 9907 451 937 65247 8000 473 881 65291 7000 502 809 65349 6000 523 767 65387 5600 543 731 65421 5200 567 675 65469 4792 601 621 65524 4352 633 583 31 4056 680 531 93 3696 757 455 189 3250 801 424 235 3051 851 391 286 2871 1015 314 425 2413 500 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 128 127 128 127 25 25 26 22 24 45 52 49 75 62 53 45 39 36 34 35 22 19 20 22 65 66 58 50 47 45 42 40 37 31 34 33 19 20 25 43 90 77 61 55 52 48 56 55 52 32 32 34 23 29 31 58 102 68 57 55 48 54 61 60 52 37 29 31 49 48 50 44 42 65 71 71 105 84 69 57 48 44 39 33 45 39 41 43 114 114 99 84 75 66 59 54 49 39 39 36 42 44 53 81 163 137 104 94 89 77 82 79 72 44 41 40 53 64 69 111 187 122 99 96 83 86 92 88 75 52 41 43 48 46 48 41 40 69 79 73 107 85 69 56 47 43 38 34 45 39 41 43 114 114 98 83 74 65 59 53 48 39 39 35 42 43 53 81 163 136 104 93 87 76 82 79 72 43 39 37 54 65 69 112 187 122 99 96 81 85 92 87 74 51 39 36 51 49 48 38 33 47 49 50 71 54 43 34 27 24 19 14 43 36 37 35 81 78 66 54 47 40 34 29 25 19 17 14 38 39 46 61 113 92 68 60 54 44 42 39 34 20 17 16 46 55 58 81 129 80 63 60 50 47 46 43 35 23 17 16 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 0 108 11 18 43 12 8 1 61 536 2289 4660 2775 581 345 537 5 165 96 193 800 1156 815 320 712 581 633 1002 695 213 227 1673 29 269 134 272 1019 6912 2788 699 1345 572 234 1829 3203 465 203 310 8 2636 1181 1944 3081 12356 2263 706 1146 351 500 11994 21415 1562 417 675 4 727 454 512 726 424 920 0 111 145 143 87 1023 1024 1024 0 1 0 0 0 0 0 0 1156 1024 1024 2660 3817 6327 > 20060802_095200.exv Exif.Canon.0x4002 Short 2676 5352 0 0 0 5657 65535 65280 41984 1297 65535 400 0 28673 916 4062 371 141 53 459 3783 3200 0 39061 38552 64 64 64 0 29590 28815 50703 0 0 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 0 118 578 1869 0 4589 1951 95 4383 2004 146 12794 2001 192 12535 2032 224 1100 12462 2038 238 1520 32809 0 252 1040 1040 1040 0 17 19 1331 28 58 128 817 8 18 0 32 32 32 0 1 0 2 192 19335 511 512 512 512 1 1 78 151 28 0 768 0 0 768 0 0 2054 2827 17 32 0 17151 1 2816 512 21862 2672 63 9 29 6 26 133 63 13 32 5 15 67 63 10 41 5 21 68 63 21 36 16 28 102 63 13 32 10 27 118 40 512 202 132 0 1311 0 40 384 144 88 0 1048 0 48 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 1 0 0 560 400 3080 1099 900 710 1543 1652 0 0 0 0 0 0 0 0 256 0 0 0 0 0 0 0 256 256 32 4353 256 256 0 0 0 0 0 0 400 400 400 4496 4496 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 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 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 64 64 64 64 64 64 0 28 58 20 40 64 64 50 0 62 55 10 35 64 35 48 70 46 55 30 64 52 32 64 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 0 118 644 1826 0 4561 1941 101 8669 1973 147 12700 2027 185 12582 2036 215 990 12550 2034 226 1500 32816 0 251 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2029 220 990 12515 2034 230 1500 32816 0 251 0 118 578 1869 0 4589 1951 95 4383 2004 146 12794 2001 192 12535 2032 224 1100 12462 2038 238 1520 32809 0 252 0 118 492 1954 0 316 1970 93 4397 2006 154 8488 2012 204 12473 2022 237 990 12406 2040 243 1235 32796 0 249 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 2056 8 8 8 80 25703 8500 80 25703 8500 80 25703 8500 84 25703 8500 84 25703 8500 78 151 28 98 158 1 138 118 1 254 1 1 1 254 1 2054 2827 17 32 2054 2827 17 32 2054 2827 17 32 4104 6678 292 32 6666 10019 312 32 63 21 36 16 28 102 63 13 32 10 27 118 63 21 36 16 28 102 63 13 32 10 27 118 63 21 36 8 14 51 63 13 32 10 27 118 63 0 0 0 0 0 63 13 32 10 27 118 63 0 0 0 0 0 63 13 32 10 27 118 38 43 48 58 67 128 128 128 128 128 128 128 128 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 5000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 7000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 3000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 5000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 7000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 3000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 5000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 7000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 3000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 5000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 7000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 3000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 5000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 7000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 3000 65524 65524 14 0 5000 65524 65524 14 0 7000 65524 65524 14 0 3000 65530 65530 7 0 5000 65530 65530 7 0 7000 65530 65530 7 0 3000 0 0 0 0 5000 0 0 0 0 7000 0 0 0 0 3000 6 6 65529 0 5000 6 6 65529 0 7000 6 6 65529 0 3000 12 12 65522 0 5000 12 12 65522 0 7000 12 12 65522 0 3000 65522 65522 15 0 5000 65522 65522 15 0 7000 65522 65522 15 0 3000 65530 65530 7 0 5000 65530 65530 7 0 7000 65530 65530 7 0 3000 0 0 0 0 5000 0 0 0 0 7000 0 0 0 0 3000 6 6 65529 0 5000 6 6 65529 0 7000 6 6 65529 0 3000 13 12 65522 0 5000 13 12 65522 0 7000 13 12 65522 0 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 2 0 142 143 141 0 2 6 10 14 18 22 26 30 34 38 42 46 50 54 58 62 66 70 74 78 82 86 90 94 98 102 106 110 114 118 122 126 130 134 138 142 146 150 154 158 162 166 170 174 178 182 186 190 194 198 202 206 210 214 218 222 226 230 234 238 242 246 250 254 258 262 266 270 274 278 282 286 290 294 298 304 308 312 316 320 324 328 332 336 340 346 350 354 360 364 368 374 378 384 388 394 400 404 410 416 420 426 432 438 444 452 458 464 472 478 486 494 500 510 518 526 534 542 552 560 568 578 586 596 604 614 624 632 642 652 662 672 682 692 704 714 726 736 748 758 770 782 794 806 820 834 846 860 874 888 904 920 936 952 970 988 1004 1022 1040 1058 1076 1094 1112 1130 1148 1166 1184 1202 1222 1240 1258 1276 1296 1314 1334 1352 1372 1390 1410 1428 1448 1468 1488 1506 1526 1546 1566 1586 1606 1626 1646 1668 1688 1708 1730 1752 1772 1794 1816 1840 1862 1886 1908 1932 1956 1982 2006 2032 2058 2084 2110 2138 2166 2194 2222 2250 2280 2310 2340 2370 2400 2430 2462 2492 2524 2554 2586 2618 2650 2682 2714 2746 2780 2812 2846 2880 2914 2948 2982 3018 3052 3088 3124 3160 3196 3232 3270 3306 3344 3382 3420 3460 3498 3538 3578 > 20060802_095200.exv Exif.Canon.0x4003 Short 22 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -> 20060802_095200.exv Exif.Photo.UserComment Undefined 264 +> 20060802_095200.exv Exif.Photo.UserComment Undefined 264 binary comment > 20060802_095200.exv Exif.Photo.FlashpixVersion Undefined 4 1.00 > 20060802_095200.exv Exif.Photo.ColorSpace Short 1 sRGB > 20060802_095200.exv Exif.Photo.PixelXDimension Short 1 3504 @@ -5102,7 +5102,7 @@ Compare image data and extracted data ------------------------------------ > 20001004_015404.exv Exif.CanonCf.MenuButtonReturn Short 1 2816 > 20001004_015404.exv Exif.CanonCf.SetButtonFunction Short 1 3072 > 20001004_015404.exv Exif.CanonCf.SensorCleaning Short 1 3328 -> 20001004_015404.exv Exif.Photo.UserComment Undefined 264 +> 20001004_015404.exv Exif.Photo.UserComment Undefined 264 binary comment > 20001004_015404.exv Exif.Photo.FlashpixVersion Undefined 4 1.00 > 20001004_015404.exv Exif.Photo.ColorSpace Short 1 sRGB > 20001004_015404.exv Exif.Photo.PixelXDimension Short 1 2160 @@ -5275,7 +5275,7 @@ Compare image data and extracted data ------------------------------------ > 20060127_225027.exv Exif.Canon.0x0019 Short 1 1 > 20060127_225027.exv Exif.Canon.0x001c Short 1 0 > 20060127_225027.exv Exif.Canon.CameraInfo Short 36 72 9 404 405 403 402 406 403 401 404 403 64 0 0 310 2 0 10 2 2 10 65310 387 4 65534 1024 0 0 0 0 0 132 0 0 128 10 -> 20060127_225027.exv Exif.Photo.UserComment Undefined 264 +> 20060127_225027.exv Exif.Photo.UserComment Undefined 264 binary comment > 20060127_225027.exv Exif.Photo.FlashpixVersion Undefined 4 1.00 > 20060127_225027.exv Exif.Photo.ColorSpace Short 1 sRGB > 20060127_225027.exv Exif.Photo.PixelXDimension Short 1 2272 @@ -5625,7 +5625,7 @@ Compare original and inserted image data --------------------------------- < 20031214_000043.jpg Exif.Canon.OwnerName Ascii 32 Andreas Huggel < 20031214_000043.jpg Exif.Canon.ModelID Long 1 PowerShot S40 < 20031214_000043.jpg Exif.Canon.CameraInfo Short 21 42 3 32769 378 32769 0 0 0 259 2 0 10 0 0 0 57 198 5 0 0 0 -< 20031214_000043.jpg Exif.Photo.UserComment Undefined 264 +< 20031214_000043.jpg Exif.Photo.UserComment Undefined 264 binary comment < 20031214_000043.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 < 20031214_000043.jpg Exif.Photo.ColorSpace Short 1 sRGB < 20031214_000043.jpg Exif.Photo.PixelXDimension Short 1 2272 @@ -5849,7 +5849,7 @@ Compare original and inserted image data --------------------------------- < 20040329_224245.jpg Exif.Nikon3.ImageOptimization Ascii 16 NORMAL < 20040329_224245.jpg Exif.Nikon3.Saturation Ascii 16 NORMAL < 20040329_224245.jpg Exif.Nikon3.VariProgram Ascii 16 -< 20040329_224245.jpg Exif.Photo.UserComment Undefined 44 +< 20040329_224245.jpg Exif.Photo.UserComment Undefined 44 charset="Ascii" < 20040329_224245.jpg Exif.Photo.SubSecTime Ascii 3 00 < 20040329_224245.jpg Exif.Photo.SubSecTimeOriginal Ascii 3 00 < 20040329_224245.jpg Exif.Photo.SubSecTimeDigitized Ascii 3 00 @@ -6099,7 +6099,7 @@ Compare original and inserted image data --------------------------------- < 20030925_201850.jpg Exif.Canon.ThumbnailImageValidArea Short 4 0 159 7 112 < 20030925_201850.jpg Exif.Canon.0x0000 Short 5 0 0 0 0 0 < 20030925_201850.jpg Exif.Canon.0x00b6 Long 12 24 2 380376 1536 1024 2449882 3072000 892 2048000 595 65540 262146 -< 20030925_201850.jpg Exif.Photo.UserComment Undefined 264 +< 20030925_201850.jpg Exif.Photo.UserComment Undefined 264 binary comment < 20030925_201850.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 < 20030925_201850.jpg Exif.Photo.ColorSpace Short 1 sRGB < 20030925_201850.jpg Exif.Photo.PixelXDimension Short 1 3072 @@ -6732,7 +6732,7 @@ Compare original and inserted image data --------------------------------- < 20060802_095200.jpg Exif.Canon.ColorData Short 582 1164 875 1024 1024 365 600 1024 1024 530 421 1024 1024 774 266 295 294 103 206 333 332 170 157 359 358 274 1929 1015 1015 1433 5200 2104 1023 1023 1274 6172 1929 1023 1023 1433 5200 2215 1023 1023 1189 7000 2087 1023 1023 1295 6000 1364 1023 1023 2344 3198 1737 1023 1023 1999 3945 2108 1023 1023 1261 6258 1929 1023 1023 1433 5200 1929 1023 1023 1433 5200 414 1081 65151 11661 427 1024 65187 9907 451 937 65247 8000 473 881 65291 7000 502 809 65349 6000 523 767 65387 5600 543 731 65421 5200 567 675 65469 4792 601 621 65524 4352 633 583 31 4056 680 531 93 3696 757 455 189 3250 801 424 235 3051 851 391 286 2871 1015 314 425 2413 500 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 128 127 128 127 25 25 26 22 24 45 52 49 75 62 53 45 39 36 34 35 22 19 20 22 65 66 58 50 47 45 42 40 37 31 34 33 19 20 25 43 90 77 61 55 52 48 56 55 52 32 32 34 23 29 31 58 102 68 57 55 48 54 61 60 52 37 29 31 49 48 50 44 42 65 71 71 105 84 69 57 48 44 39 33 45 39 41 43 114 114 99 84 75 66 59 54 49 39 39 36 42 44 53 81 163 137 104 94 89 77 82 79 72 44 41 40 53 64 69 111 187 122 99 96 83 86 92 88 75 52 41 43 48 46 48 41 40 69 79 73 107 85 69 56 47 43 38 34 45 39 41 43 114 114 98 83 74 65 59 53 48 39 39 35 42 43 53 81 163 136 104 93 87 76 82 79 72 43 39 37 54 65 69 112 187 122 99 96 81 85 92 87 74 51 39 36 51 49 48 38 33 47 49 50 71 54 43 34 27 24 19 14 43 36 37 35 81 78 66 54 47 40 34 29 25 19 17 14 38 39 46 61 113 92 68 60 54 44 42 39 34 20 17 16 46 55 58 81 129 80 63 60 50 47 46 43 35 23 17 16 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 0 108 11 18 43 12 8 1 61 536 2289 4660 2775 581 345 537 5 165 96 193 800 1156 815 320 712 581 633 1002 695 213 227 1673 29 269 134 272 1019 6912 2788 699 1345 572 234 1829 3203 465 203 310 8 2636 1181 1944 3081 12356 2263 706 1146 351 500 11994 21415 1562 417 675 4 727 454 512 726 424 920 0 111 145 143 87 1023 1024 1024 0 1 0 0 0 0 0 0 1156 1024 1024 2660 3817 6327 < 20060802_095200.jpg Exif.Canon.0x4002 Short 2676 5352 0 0 0 5657 65535 65280 41984 1297 65535 400 0 28673 916 4062 371 141 53 459 3783 3200 0 39061 38552 64 64 64 0 29590 28815 50703 0 0 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 0 118 578 1869 0 4589 1951 95 4383 2004 146 12794 2001 192 12535 2032 224 1100 12462 2038 238 1520 32809 0 252 1040 1040 1040 0 17 19 1331 28 58 128 817 8 18 0 32 32 32 0 1 0 2 192 19335 511 512 512 512 1 1 78 151 28 0 768 0 0 768 0 0 2054 2827 17 32 0 17151 1 2816 512 21862 2672 63 9 29 6 26 133 63 13 32 5 15 67 63 10 41 5 21 68 63 21 36 16 28 102 63 13 32 10 27 118 40 512 202 132 0 1311 0 40 384 144 88 0 1048 0 48 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 1 0 0 560 400 3080 1099 900 710 1543 1652 0 0 0 0 0 0 0 0 256 0 0 0 0 0 0 0 256 256 32 4353 256 256 0 0 0 0 0 0 400 400 400 4496 4496 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 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 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 64 64 64 64 64 64 0 28 58 20 40 64 64 50 0 62 55 10 35 64 35 48 70 46 55 30 64 52 32 64 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 0 118 644 1826 0 4561 1941 101 8669 1973 147 12700 2027 185 12582 2036 215 990 12550 2034 226 1500 32816 0 251 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2029 220 990 12515 2034 230 1500 32816 0 251 0 118 578 1869 0 4589 1951 95 4383 2004 146 12794 2001 192 12535 2032 224 1100 12462 2038 238 1520 32809 0 252 0 118 492 1954 0 316 1970 93 4397 2006 154 8488 2012 204 12473 2022 237 990 12406 2040 243 1235 32796 0 249 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 2056 8 8 8 80 25703 8500 80 25703 8500 80 25703 8500 84 25703 8500 84 25703 8500 78 151 28 98 158 1 138 118 1 254 1 1 1 254 1 2054 2827 17 32 2054 2827 17 32 2054 2827 17 32 4104 6678 292 32 6666 10019 312 32 63 21 36 16 28 102 63 13 32 10 27 118 63 21 36 16 28 102 63 13 32 10 27 118 63 21 36 8 14 51 63 13 32 10 27 118 63 0 0 0 0 0 63 13 32 10 27 118 63 0 0 0 0 0 63 13 32 10 27 118 38 43 48 58 67 128 128 128 128 128 128 128 128 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 5000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 7000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 3000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 5000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 7000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 3000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 5000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 7000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 3000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 5000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 7000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 3000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 5000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 7000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 3000 65524 65524 14 0 5000 65524 65524 14 0 7000 65524 65524 14 0 3000 65530 65530 7 0 5000 65530 65530 7 0 7000 65530 65530 7 0 3000 0 0 0 0 5000 0 0 0 0 7000 0 0 0 0 3000 6 6 65529 0 5000 6 6 65529 0 7000 6 6 65529 0 3000 12 12 65522 0 5000 12 12 65522 0 7000 12 12 65522 0 3000 65522 65522 15 0 5000 65522 65522 15 0 7000 65522 65522 15 0 3000 65530 65530 7 0 5000 65530 65530 7 0 7000 65530 65530 7 0 3000 0 0 0 0 5000 0 0 0 0 7000 0 0 0 0 3000 6 6 65529 0 5000 6 6 65529 0 7000 6 6 65529 0 3000 13 12 65522 0 5000 13 12 65522 0 7000 13 12 65522 0 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 2 0 142 143 141 0 2 6 10 14 18 22 26 30 34 38 42 46 50 54 58 62 66 70 74 78 82 86 90 94 98 102 106 110 114 118 122 126 130 134 138 142 146 150 154 158 162 166 170 174 178 182 186 190 194 198 202 206 210 214 218 222 226 230 234 238 242 246 250 254 258 262 266 270 274 278 282 286 290 294 298 304 308 312 316 320 324 328 332 336 340 346 350 354 360 364 368 374 378 384 388 394 400 404 410 416 420 426 432 438 444 452 458 464 472 478 486 494 500 510 518 526 534 542 552 560 568 578 586 596 604 614 624 632 642 652 662 672 682 692 704 714 726 736 748 758 770 782 794 806 820 834 846 860 874 888 904 920 936 952 970 988 1004 1022 1040 1058 1076 1094 1112 1130 1148 1166 1184 1202 1222 1240 1258 1276 1296 1314 1334 1352 1372 1390 1410 1428 1448 1468 1488 1506 1526 1546 1566 1586 1606 1626 1646 1668 1688 1708 1730 1752 1772 1794 1816 1840 1862 1886 1908 1932 1956 1982 2006 2032 2058 2084 2110 2138 2166 2194 2222 2250 2280 2310 2340 2370 2400 2430 2462 2492 2524 2554 2586 2618 2650 2682 2714 2746 2780 2812 2846 2880 2914 2948 2982 3018 3052 3088 3124 3160 3196 3232 3270 3306 3344 3382 3420 3460 3498 3538 3578 < 20060802_095200.jpg Exif.Canon.0x4003 Short 22 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -< 20060802_095200.jpg Exif.Photo.UserComment Undefined 264 +< 20060802_095200.jpg Exif.Photo.UserComment Undefined 264 binary comment < 20060802_095200.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 < 20060802_095200.jpg Exif.Photo.ColorSpace Short 1 sRGB < 20060802_095200.jpg Exif.Photo.PixelXDimension Short 1 3504 @@ -6863,7 +6863,7 @@ Compare original and inserted image data --------------------------------- < 20001004_015404.jpg Exif.CanonCf.MenuButtonReturn Short 1 2816 < 20001004_015404.jpg Exif.CanonCf.SetButtonFunction Short 1 3072 < 20001004_015404.jpg Exif.CanonCf.SensorCleaning Short 1 3328 -< 20001004_015404.jpg Exif.Photo.UserComment Undefined 264 +< 20001004_015404.jpg Exif.Photo.UserComment Undefined 264 binary comment < 20001004_015404.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 < 20001004_015404.jpg Exif.Photo.ColorSpace Short 1 sRGB < 20001004_015404.jpg Exif.Photo.PixelXDimension Short 1 2160 @@ -7036,7 +7036,7 @@ Compare original and inserted image data --------------------------------- < 20060127_225027.jpg Exif.Canon.0x0019 Short 1 1 < 20060127_225027.jpg Exif.Canon.0x001c Short 1 0 < 20060127_225027.jpg Exif.Canon.CameraInfo Short 36 72 9 404 405 403 402 406 403 401 404 403 64 0 0 310 2 0 10 2 2 10 65310 387 4 65534 1024 0 0 0 0 0 132 0 0 128 10 -< 20060127_225027.jpg Exif.Photo.UserComment Undefined 264 +< 20060127_225027.jpg Exif.Photo.UserComment Undefined 264 binary comment < 20060127_225027.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00 < 20060127_225027.jpg Exif.Photo.ColorSpace Short 1 sRGB < 20060127_225027.jpg Exif.Photo.PixelXDimension Short 1 2272 @@ -7166,7 +7166,7 @@ Compare original and inserted image data --------------------------------- > 20031214_000043.exv Exif.Canon.OwnerName Ascii 32 Andreas Huggel > 20031214_000043.exv Exif.Canon.ModelID Long 1 PowerShot S40 > 20031214_000043.exv Exif.Canon.CameraInfo Short 21 42 3 32769 378 32769 0 0 0 259 2 0 10 0 0 0 57 198 5 0 0 0 -> 20031214_000043.exv Exif.Photo.UserComment Undefined 264 +> 20031214_000043.exv Exif.Photo.UserComment Undefined 264 binary comment > 20031214_000043.exv Exif.Photo.FlashpixVersion Undefined 4 1.00 > 20031214_000043.exv Exif.Photo.ColorSpace Short 1 sRGB > 20031214_000043.exv Exif.Photo.PixelXDimension Short 1 2272 @@ -7390,7 +7390,7 @@ Compare original and inserted image data --------------------------------- > 20040329_224245.exv Exif.Nikon3.ImageOptimization Ascii 16 NORMAL > 20040329_224245.exv Exif.Nikon3.Saturation Ascii 16 NORMAL > 20040329_224245.exv Exif.Nikon3.VariProgram Ascii 16 -> 20040329_224245.exv Exif.Photo.UserComment Undefined 44 +> 20040329_224245.exv Exif.Photo.UserComment Undefined 44 charset="Ascii" > 20040329_224245.exv Exif.Photo.SubSecTime Ascii 3 00 > 20040329_224245.exv Exif.Photo.SubSecTimeOriginal Ascii 3 00 > 20040329_224245.exv Exif.Photo.SubSecTimeDigitized Ascii 3 00 @@ -7640,7 +7640,7 @@ Compare original and inserted image data --------------------------------- > 20030925_201850.exv Exif.Canon.ThumbnailImageValidArea Short 4 0 159 7 112 > 20030925_201850.exv Exif.Canon.0x0000 Short 5 0 0 0 0 0 > 20030925_201850.exv Exif.Canon.0x00b6 Long 12 24 2 380376 1536 1024 2449882 3072000 892 2048000 595 65540 262146 -> 20030925_201850.exv Exif.Photo.UserComment Undefined 264 +> 20030925_201850.exv Exif.Photo.UserComment Undefined 264 binary comment > 20030925_201850.exv Exif.Photo.FlashpixVersion Undefined 4 1.00 > 20030925_201850.exv Exif.Photo.ColorSpace Short 1 sRGB > 20030925_201850.exv Exif.Photo.PixelXDimension Short 1 3072 @@ -8273,7 +8273,7 @@ Compare original and inserted image data --------------------------------- > 20060802_095200.exv Exif.Canon.ColorData Short 582 1164 875 1024 1024 365 600 1024 1024 530 421 1024 1024 774 266 295 294 103 206 333 332 170 157 359 358 274 1929 1015 1015 1433 5200 2104 1023 1023 1274 6172 1929 1023 1023 1433 5200 2215 1023 1023 1189 7000 2087 1023 1023 1295 6000 1364 1023 1023 2344 3198 1737 1023 1023 1999 3945 2108 1023 1023 1261 6258 1929 1023 1023 1433 5200 1929 1023 1023 1433 5200 414 1081 65151 11661 427 1024 65187 9907 451 937 65247 8000 473 881 65291 7000 502 809 65349 6000 523 767 65387 5600 543 731 65421 5200 567 675 65469 4792 601 621 65524 4352 633 583 31 4056 680 531 93 3696 757 455 189 3250 801 424 235 3051 851 391 286 2871 1015 314 425 2413 500 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 2069 2087 128 127 128 127 25 25 26 22 24 45 52 49 75 62 53 45 39 36 34 35 22 19 20 22 65 66 58 50 47 45 42 40 37 31 34 33 19 20 25 43 90 77 61 55 52 48 56 55 52 32 32 34 23 29 31 58 102 68 57 55 48 54 61 60 52 37 29 31 49 48 50 44 42 65 71 71 105 84 69 57 48 44 39 33 45 39 41 43 114 114 99 84 75 66 59 54 49 39 39 36 42 44 53 81 163 137 104 94 89 77 82 79 72 44 41 40 53 64 69 111 187 122 99 96 83 86 92 88 75 52 41 43 48 46 48 41 40 69 79 73 107 85 69 56 47 43 38 34 45 39 41 43 114 114 98 83 74 65 59 53 48 39 39 35 42 43 53 81 163 136 104 93 87 76 82 79 72 43 39 37 54 65 69 112 187 122 99 96 81 85 92 87 74 51 39 36 51 49 48 38 33 47 49 50 71 54 43 34 27 24 19 14 43 36 37 35 81 78 66 54 47 40 34 29 25 19 17 14 38 39 46 61 113 92 68 60 54 44 42 39 34 20 17 16 46 55 58 81 129 80 63 60 50 47 46 43 35 23 17 16 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 0 108 11 18 43 12 8 1 61 536 2289 4660 2775 581 345 537 5 165 96 193 800 1156 815 320 712 581 633 1002 695 213 227 1673 29 269 134 272 1019 6912 2788 699 1345 572 234 1829 3203 465 203 310 8 2636 1181 1944 3081 12356 2263 706 1146 351 500 11994 21415 1562 417 675 4 727 454 512 726 424 920 0 111 145 143 87 1023 1024 1024 0 1 0 0 0 0 0 0 1156 1024 1024 2660 3817 6327 > 20060802_095200.exv Exif.Canon.0x4002 Short 2676 5352 0 0 0 5657 65535 65280 41984 1297 65535 400 0 28673 916 4062 371 141 53 459 3783 3200 0 39061 38552 64 64 64 0 29590 28815 50703 0 0 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 0 118 578 1869 0 4589 1951 95 4383 2004 146 12794 2001 192 12535 2032 224 1100 12462 2038 238 1520 32809 0 252 1040 1040 1040 0 17 19 1331 28 58 128 817 8 18 0 32 32 32 0 1 0 2 192 19335 511 512 512 512 1 1 78 151 28 0 768 0 0 768 0 0 2054 2827 17 32 0 17151 1 2816 512 21862 2672 63 9 29 6 26 133 63 13 32 5 15 67 63 10 41 5 21 68 63 21 36 16 28 102 63 13 32 10 27 118 40 512 202 132 0 1311 0 40 384 144 88 0 1048 0 48 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 1 0 0 560 400 3080 1099 900 710 1543 1652 0 0 0 0 0 0 0 0 256 0 0 0 0 0 0 0 256 256 32 4353 256 256 0 0 0 0 0 0 400 400 400 4496 4496 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 39061 38552 38540 28310 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 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 64 64 64 64 64 64 0 28 58 20 40 64 64 50 0 62 55 10 35 64 35 48 70 46 55 30 64 52 32 64 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 3996 481 13 929 120 502 406 0 300 444 94 4411 473 153 8533 489 207 12713 475 254 1270 32854 0 286 1270 32854 0 286 1270 32854 0 286 4063 723 357 981 41 643 4444 0 431 424 43 4369 471 160 12778 463 204 12505 485 234 1125 12375 509 245 1385 12359 507 250 1785 32768 0 255 0 118 644 1826 0 4561 1941 101 8669 1973 147 12700 2027 185 12582 2036 215 990 12550 2034 226 1500 32816 0 251 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2029 220 990 12515 2034 230 1500 32816 0 251 0 118 578 1869 0 4589 1951 95 4383 2004 146 12794 2001 192 12535 2032 224 1100 12462 2038 238 1520 32809 0 252 0 118 492 1954 0 316 1970 93 4397 2006 154 8488 2012 204 12473 2022 237 990 12406 2040 243 1235 32796 0 249 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 118 643 1827 0 4564 1938 101 8662 1977 147 12712 2023 185 12570 2026 215 990 12512 2035 225 1500 32809 0 246 0 118 598 1867 0 262 1978 99 8643 1992 148 12787 2008 187 12566 2009 220 990 12465 2041 229 1500 32804 0 247 0 118 578 1870 0 4590 1950 95 4382 2005 146 12798 2000 192 12531 2019 224 1100 12406 2046 236 1520 32806 0 247 0 118 512 1936 0 304 1978 94 4406 2001 154 8471 2018 204 12507 1996 237 990 12373 0 243 1235 32788 0 248 0 118 349 17 0 380 1953 84 4452 1993 157 8504 2008 214 12465 1989 248 990 12313 2045 252 1217 32777 0 253 0 2056 8 8 8 80 25703 8500 80 25703 8500 80 25703 8500 84 25703 8500 84 25703 8500 78 151 28 98 158 1 138 118 1 254 1 1 1 254 1 2054 2827 17 32 2054 2827 17 32 2054 2827 17 32 4104 6678 292 32 6666 10019 312 32 63 21 36 16 28 102 63 13 32 10 27 118 63 21 36 16 28 102 63 13 32 10 27 118 63 21 36 8 14 51 63 13 32 10 27 118 63 0 0 0 0 0 63 13 32 10 27 118 63 0 0 0 0 0 63 13 32 10 27 118 38 43 48 58 67 128 128 128 128 128 128 128 128 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 5000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 7000 916 64620 34 65502 371 141 53 459 65223 313 896 64640 3000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 5000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 7000 866 64670 3 65533 381 131 58 454 65245 291 914 64622 3000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 5000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 7000 880 64656 35 65501 391 121 79 433 65243 293 915 64621 3000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 5000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 7000 837 64699 15 65521 346 166 45 467 65258 278 927 64609 3000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 5000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 7000 883 64653 65515 21 385 127 53 459 65236 300 910 64626 3000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 5000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 7000 878 64658 65509 27 456 56 13 499 65233 303 943 64593 3000 65524 65524 14 0 5000 65524 65524 14 0 7000 65524 65524 14 0 3000 65530 65530 7 0 5000 65530 65530 7 0 7000 65530 65530 7 0 3000 0 0 0 0 5000 0 0 0 0 7000 0 0 0 0 3000 6 6 65529 0 5000 6 6 65529 0 7000 6 6 65529 0 3000 12 12 65522 0 5000 12 12 65522 0 7000 12 12 65522 0 3000 65522 65522 15 0 5000 65522 65522 15 0 7000 65522 65522 15 0 3000 65530 65530 7 0 5000 65530 65530 7 0 7000 65530 65530 7 0 3000 0 0 0 0 5000 0 0 0 0 7000 0 0 0 0 3000 6 6 65529 0 5000 6 6 65529 0 7000 6 6 65529 0 3000 13 12 65522 0 5000 13 12 65522 0 7000 13 12 65522 0 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 110 100 135 4 5 200 6 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 125 110 122 4 6 190 9 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 178 124 125 12 11 150 17 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 100 90 181 5 2 180 5 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 110 100 135 5 5 200 6 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 125 110 123 4 6 190 9 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 143 112 115 9 6 198 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 162 122 119 10 9 158 15 2 0 142 143 141 0 2 6 10 14 18 22 26 30 34 38 42 46 50 54 58 62 66 70 74 78 82 86 90 94 98 102 106 110 114 118 122 126 130 134 138 142 146 150 154 158 162 166 170 174 178 182 186 190 194 198 202 206 210 214 218 222 226 230 234 238 242 246 250 254 258 262 266 270 274 278 282 286 290 294 298 304 308 312 316 320 324 328 332 336 340 346 350 354 360 364 368 374 378 384 388 394 400 404 410 416 420 426 432 438 444 452 458 464 472 478 486 494 500 510 518 526 534 542 552 560 568 578 586 596 604 614 624 632 642 652 662 672 682 692 704 714 726 736 748 758 770 782 794 806 820 834 846 860 874 888 904 920 936 952 970 988 1004 1022 1040 1058 1076 1094 1112 1130 1148 1166 1184 1202 1222 1240 1258 1276 1296 1314 1334 1352 1372 1390 1410 1428 1448 1468 1488 1506 1526 1546 1566 1586 1606 1626 1646 1668 1688 1708 1730 1752 1772 1794 1816 1840 1862 1886 1908 1932 1956 1982 2006 2032 2058 2084 2110 2138 2166 2194 2222 2250 2280 2310 2340 2370 2400 2430 2462 2492 2524 2554 2586 2618 2650 2682 2714 2746 2780 2812 2846 2880 2914 2948 2982 3018 3052 3088 3124 3160 3196 3232 3270 3306 3344 3382 3420 3460 3498 3538 3578 > 20060802_095200.exv Exif.Canon.0x4003 Short 22 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -> 20060802_095200.exv Exif.Photo.UserComment Undefined 264 +> 20060802_095200.exv Exif.Photo.UserComment Undefined 264 binary comment > 20060802_095200.exv Exif.Photo.FlashpixVersion Undefined 4 1.00 > 20060802_095200.exv Exif.Photo.ColorSpace Short 1 sRGB > 20060802_095200.exv Exif.Photo.PixelXDimension Short 1 3504 @@ -8404,7 +8404,7 @@ Compare original and inserted image data --------------------------------- > 20001004_015404.exv Exif.CanonCf.MenuButtonReturn Short 1 2816 > 20001004_015404.exv Exif.CanonCf.SetButtonFunction Short 1 3072 > 20001004_015404.exv Exif.CanonCf.SensorCleaning Short 1 3328 -> 20001004_015404.exv Exif.Photo.UserComment Undefined 264 +> 20001004_015404.exv Exif.Photo.UserComment Undefined 264 binary comment > 20001004_015404.exv Exif.Photo.FlashpixVersion Undefined 4 1.00 > 20001004_015404.exv Exif.Photo.ColorSpace Short 1 sRGB > 20001004_015404.exv Exif.Photo.PixelXDimension Short 1 2160 @@ -8577,7 +8577,7 @@ Compare original and inserted image data --------------------------------- > 20060127_225027.exv Exif.Canon.0x0019 Short 1 1 > 20060127_225027.exv Exif.Canon.0x001c Short 1 0 > 20060127_225027.exv Exif.Canon.CameraInfo Short 36 72 9 404 405 403 402 406 403 401 404 403 64 0 0 310 2 0 10 2 2 10 65310 387 4 65534 1024 0 0 0 0 0 132 0 0 128 10 -> 20060127_225027.exv Exif.Photo.UserComment Undefined 264 +> 20060127_225027.exv Exif.Photo.UserComment Undefined 264 binary comment > 20060127_225027.exv Exif.Photo.FlashpixVersion Undefined 4 1.00 > 20060127_225027.exv Exif.Photo.ColorSpace Short 1 sRGB > 20060127_225027.exv Exif.Photo.PixelXDimension Short 1 2272 diff --git a/test/data/geotag-test.out b/test/data/geotag-test.out index 0d49855c..a9dc0436 100644 --- a/test/data/geotag-test.out +++ b/test/data/geotag-test.out @@ -8,7 +8,7 @@ Exif.GPSInfo.GPSAltitudeRef Byte 1 Below sea level Exif.GPSInfo.GPSAltitude Rational 1 14.3 m Exif.GPSInfo.GPSTimeStamp Rational 3 09:54:28 Exif.GPSInfo.GPSMapDatum Ascii 7 WGS-84 -Exif.GPSInfo.GPSProcessingMethod Undefined 18 HYBRID-FIX +Exif.GPSInfo.GPSProcessingMethod Undefined 18 charset="Ascii" HYBRID-FIX Exif.GPSInfo.GPSDateStamp Ascii 20 2008:05:08 09:54:28 --- deleting the GPSInfo tags --- run geotag --- diff --git a/test/data/modify-test.out b/test/data/modify-test.out index c1f9c944..0f7c98b8 100644 --- a/test/data/modify-test.out +++ b/test/data/modify-test.out @@ -18,7 +18,7 @@ exiv2-empty.jpg Exif.Image.DateTime Ascii 19 exiv2-empty.jpg Exif.Image.Artist Ascii 17 Vincent van Gogh exiv2-empty.jpg Exif.Image.WhitePoint Short 5 32 12 4 5 6 exiv2-empty.jpg Exif.Image.ExifTag Long 1 110 -exiv2-empty.jpg Exif.Photo.UserComment Undefined 37 This is an ASCII Exif comment +exiv2-empty.jpg Exif.Photo.UserComment Undefined 37 charset="Ascii" This is an ASCII Exif comment File 2/2: exiv2-gc.jpg exiv2-gc.jpg Exif.Image.ImageDescription Ascii 18 Exif JPEG exiv2-gc.jpg Exif.Image.Make Ascii 8 Camera diff --git a/test/exiv2-test.sh b/test/exiv2-test.sh index 76ce179e..5b181dd0 100755 --- a/test/exiv2-test.sh +++ b/test/exiv2-test.sh @@ -2,7 +2,11 @@ # Test driver for exiv2 utility tests source ./functions.source -diffargs="-w --text $diffargs" +if [ "$PLATFORM" == SunOS -o "$PLATFORM" == FreeBSD -o "$PLATFORM" == NetBSD ] ; then + diffargs="-w $diffargs" +else + diffargs="-w --text $diffargs" +fi ( cd "$testdir" @@ -66,7 +70,7 @@ diffargs="-w --text $diffargs" echo echo "Exiv2 version ------------------------------------------------------------" # Tweak this to avoid a maintenance headache with test/data/exiv2-test.out - runTest exiv2 -u -V | sed -E -e 's#^exiv2.*$#exiv2 0.27.0.0 (__ bit build)#' + runTest exiv2 -u -V | sed -e 's#^exiv2.*$#exiv2 0.27.0.0 (__ bit build)#' echo echo "Exiv2 help ---------------------------------------------------------------" runTest exiv2 -u -h diff --git a/test/functions.source b/test/functions.source index 949394c8..729e4817 100644 --- a/test/functions.source +++ b/test/functions.source @@ -139,7 +139,7 @@ runTestCase() runTest exifprint $rtc_infile > iii; cp $rtc_infile $rtc_outfile; runTest write-test $rtc_infile $rtc_number > ttt; - diff -a iii ttt + diff $diffargs iii ttt } ## @@ -227,8 +227,10 @@ diffCheck() if [ -z "$errors" ]; then let -a errors=0; fi #run diff and check results - if [ $(uname) == FreeBSD -o $(uname) == NetBSD -o $(uname) == SunOS ]; then + if [ "$PLATFORM" == SunOS ]; then bdiff $diffargs "$test" "$good" + elif [ "$PLATFORM" == FreeBSD -o "$PLATFORM" == NetBSD ]; then + diff $diffargs "$test" "$good" else diff --binary $diffargs "$test" "$good" fi @@ -430,7 +432,7 @@ checkSum() if [ "$platform" == 'NetBSD' -o "$platform" == 'FreeBSD' ]; then md5 -q $1 else - md5sum $1 | cut -d' ' -f 1 + md5sum $1 | cut -f 1 -d' ' fi } diff --git a/test/preview-test.sh b/test/preview-test.sh index 63019716..53c163ae 100755 --- a/test/preview-test.sh +++ b/test/preview-test.sh @@ -55,7 +55,7 @@ source ./functions.source echo echo "Command: exiv2 -pp $filename" - runTest exiv2 -pp "$filename" + runTest exiv2 -pp "$filename" 2>/dev/null exitcode=$? echo "Exit code: $exitcode" @@ -63,25 +63,22 @@ source ./functions.source echo echo "Command: exiv2 -f -ep $filename" - runTest exiv2 -f -ep "$filename" + runTest exiv2 -f -ep "$filename" 2>/dev/null echo "Exit code: $?" runTest exiv2 -pp "$filename" 2>/dev/null | sed -n 's,^Preview \([0-9]\+\):.*,\1,p' | while read preview; do - diff $diffargs -q "../data/preview/$image-preview$preview."* "$image-preview$preview."* + if [ $(uname) == FreeBSD -o $(uname) == NetBSD -o $(uname) == SunOS ]; then + bdiff "../data/preview/$image-preview$preview."* "$image-preview$preview."* + else + diff $diffargs -q "../data/preview/$image-preview$preview."* "$image-preview$preview."* + fi done done ) 3>&1 > "$testdir/preview-test.out" 2>&1 - echo "." -# ---------------------------------------------------------------------- -# Result -if ! diff -q $diffargs "$testdir/$datadir/preview/preview-test.out" "$testdir/preview-test.out" ; then - diff -u $diffargs "$testdir/$datadir/preview/preview-test.out" "$testdir/preview-test.out" - exit 1 -fi -echo "All testcases passed." +reportTest # That's all Folks! ## \ No newline at end of file diff --git a/test/tiff-test.sh b/test/tiff-test.sh index 2be7b5e3..c13a29a3 100755 --- a/test/tiff-test.sh +++ b/test/tiff-test.sh @@ -21,10 +21,10 @@ exifprobe() lens=() vals=() while read line; do - tag=$(echo $line|cut -d. -f 3 | cut -d' ' -f 1) ; tags+=($tag) - typ=$(echo $line|cut -d' ' -f 2- | sed -E -e 's/ +/ /g' -e 's/^ //' | cut -d' ' -f 1 ); typs+=($typ) - len=$(echo $line|cut -d' ' -f 2- | sed -E -e 's/ +/ /g' -e 's/^ //' | cut -d' ' -f 2 ); lens+=($len) - val=$(echo $line|cut -d' ' -f 2- | sed -E -e 's/ +/ /g' -e 's/^ //' | cut -d' ' -f 3-); vals+=("$val") + tag=$(echo $line|cut -f 3 -d. | cut -f 1 -d' ' ) ; tags+=($tag) + typ=$(echo $line|cut -f 2- -d' ' | sed -e 's/ +/ /g' -e 's/^ //' | cut -f 1 -d' ' ); typs+=($typ) + len=$(echo $line|cut -f 2- -d' ' | sed -e 's/ +/ /g' -e 's/^ //' | cut -f 2 -d' ' ); lens+=($len) + val=$(echo $line|cut -f 2- -d' ' | sed -e 's/ +/ /g' -e 's/^ //' | cut -f 3- -d' ' ); vals+=("$val") done < <( runTest exiv2 -pa $f 2>/dev/null ) # process pipe count=${#tags[@]} @@ -51,13 +51,13 @@ exifprobe() while read line; do k=$((k+1)) # skip the first couple of lines if [ $k -gt 2 ]; then - TAG=$(echo $line| cut -d'|' -f 2 | cut -d' ' -f 3 ); TAGS+=($TAG); - TYP=$(echo $line| cut -d'|' -f 3 | sed -E -e's/ +//g'); TYPS+=($TYP) - LEN=$(echo $line| cut -d'|' -f 4 | sed -E -e's/ +//g'); LENS+=($LEN) - OFF=$(echo $line| cut -d'|' -f 5 | sed -E -e's/ +//g'); OFFS+=($OFF) - VAL=$(echo $line| cut -d'|' -f 6- | sed -e's/^ //' ); VALS+=($"$VAL") + TAG=$(echo $line| cut -f 2 -d'|' | cut -f 3 -d' ' ); TAGS+=($TAG); + TYP=$(echo $line| cut -f 3 -d'|' | sed -e's/ +//g' ); TYPS+=($TYP) + LEN=$(echo $line| cut -f 4 -d'|' | sed -e's/ +//g' ); LENS+=($LEN) + OFF=$(echo $line| cut -f 5 -d'|' | sed -e's/ +//g' ); OFFS+=($OFF) + VAL=$(echo $line| cut -f 6- -d'|' | sed -e's/^ //' ); VALS+=($"$VAL") fi - done < <( runTest exiv2 -pS $f | grep -v -e '^END' 2>/dev/null ) + done < <( runTest exiv2 -pS $f | grep -v '^END' 2>/dev/null ) COUNT=${#TAGS[@]} echo '' diff --git a/test/unit_test.sh b/test/unit_test.sh index 70150875..f3d45f38 100755 --- a/test/unit_test.sh +++ b/test/unit_test.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -# Test driver for exiv2.exe --verbose --version +# driver for $ make unit_test -( source ./functions.source ; runTest unit_tests --gtest_color=no | grep -v "Warning: Unsupported date format") +( source ./functions.source ; runTest unit_tests --gtest_color=no 2>&1 | grep -v "Warning: Unsupported .... format" ) # That's all Folks! ## diff --git a/test/xmpparser-test.sh b/test/xmpparser-test.sh index 2d56fd1b..3038e30b 100755 --- a/test/xmpparser-test.sh +++ b/test/xmpparser-test.sh @@ -2,6 +2,10 @@ # XMP parser test driver source ./functions.source +if [ "$PLATFORM" == "NetBSD" -o "$PLATFORM" == "SunOS" -o "$PLATFORM" == "FreeBSD" ]; then + echo "UNIX platform $PLATFORM Skip $0" + exit 0 # UNIX diff complains about newline stuff +fi ## # Check if xmpparser-test exists diff --git a/tests/bugfixes/github/test_issue_1046.py b/tests/bugfixes/github/test_issue_1046.py index 0090019c..744f0b89 100644 --- a/tests/bugfixes/github/test_issue_1046.py +++ b/tests/bugfixes/github/test_issue_1046.py @@ -23,7 +23,7 @@ class test_issue_1046Test(metaclass=CaseMeta): , "$exiv2 -pt -g GPSPro -g GPSArea $filename" , "$exiv2 -pv -g GPSPro -g GPSArea $filename" ] - stdout = ["""Exif.Photo.UserComment Undefined 12 AB + stdout = ["""Exif.Photo.UserComment Undefined 12 charset="Unicode" AB Exif.GPSInfo.GPSVersionID Byte 4 2.2.0.0 Exif.GPSInfo.GPSLatitudeRef Ascii 2 North Exif.GPSInfo.GPSLatitude Rational 3 51deg 23' 13" @@ -33,7 +33,7 @@ Exif.GPSInfo.GPSAltitudeRef Byte 1 Above sea level Exif.GPSInfo.GPSAltitude Rational 1 104.2 m Exif.GPSInfo.GPSTimeStamp Rational 3 10:34:11 Exif.GPSInfo.GPSMapDatum Ascii 7 WGS-84 -Exif.GPSInfo.GPSProcessingMethod Undefined 18 HYBRID-FIX +Exif.GPSInfo.GPSProcessingMethod Undefined 18 charset="Ascii" HYBRID-FIX Exif.GPSInfo.GPSAreaInformation Undefined 23 Surrey, England Exif.GPSInfo.GPSDateStamp Ascii 20 2020:02:02 10:34:11 ""","""0x9286 Photo UserComment Undefined 12 charset="Unicode" AB @@ -49,14 +49,14 @@ Exif.GPSInfo.GPSDateStamp Ascii 20 2020:02:02 10:34:11 0x001b GPSInfo GPSProcessingMethod Undefined 18 charset="Ascii" HYBRID-FIX 0x001c GPSInfo GPSAreaInformation Undefined 23 Surrey, England 0x001d GPSInfo GPSDateStamp Ascii 20 2020:02:02 10:34:11 -""","","""Exif.Photo.UserComment Undefined 25 how now brown cow +""","","""Exif.Photo.UserComment Undefined 25 charset="Ascii" how now brown cow ""","""0x9286 Photo UserComment Undefined 25 charset="Ascii" how now brown cow -""","","""Exif.Photo.UserComment Undefined 12 AB +""","","""Exif.Photo.UserComment Undefined 12 charset="Unicode" AB ""","""0x9286 Photo UserComment Undefined 12 charset="Unicode" AB ""","","""Exif.Photo.UserComment Undefined 19 hello world ""","""0x9286 Photo UserComment Undefined 19 hello world -""","","","""Exif.GPSInfo.GPSProcessingMethod Undefined 18 Robin -Exif.GPSInfo.GPSAreaInformation Undefined 24 area information +""","","","""Exif.GPSInfo.GPSProcessingMethod Undefined 18 charset="Unicode" Robin +Exif.GPSInfo.GPSAreaInformation Undefined 24 charset="Ascii" area information ""","""0x001b GPSInfo GPSProcessingMethod Undefined 18 charset="Unicode" Robin 0x001c GPSInfo GPSAreaInformation Undefined 24 charset="Ascii" area information """ diff --git a/tests/bugfixes/github/test_issue_247.py b/tests/bugfixes/github/test_issue_247.py index 6edaa3a2..7c53a96f 100644 --- a/tests/bugfixes/github/test_issue_247.py +++ b/tests/bugfixes/github/test_issue_247.py @@ -34,7 +34,7 @@ Exif.Photo.MaxApertureValue Rational 1 F2.8 Exif.Photo.MeteringMode Short 1 Center weighted average Exif.Photo.Flash Short 1 No, auto Exif.Photo.FocalLength Rational 1 21.3 mm -Exif.Photo.MakerNote Undefined 450 (Binary value suppressed) +Exif.Photo.MakerNote Undefined 450 12 0 1 0 3 0 40 0 0 0 68 4 0 0 2 0 3 0 4 0 0 0 148 4 0 0 3 0 3 0 4 0 0 0 156 4 0 0 4 0 3 0 27 0 0 0 164 4 0 0 0 0 3 0 6 0 0 0 218 4 0 0 0 0 3 0 4 0 0 0 230 4 0 0 6 0 2 0 32 0 0 0 238 4 0 0 7 0 2 0 24 0 0 0 14 5 0 0 8 0 4 0 1 0 0 0 59 225 17 0 9 0 2 0 32 0 0 0 38 5 0 0 16 0 4 0 1 0 0 0 0 0 17 1 13 0 3 0 21 0 0 0 70 5 0 0 0 0 0 0 80 0 2 0 0 0 5 0 1 0 0 0 0 0 4 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 17 0 5 0 1 0 3 48 1 0 255 255 255 255 170 2 227 0 32 0 149 0 192 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 49 0 224 8 224 8 0 0 1 0 2 0 170 2 30 1 215 0 0 0 0 0 0 0 0 0 54 0 0 0 160 0 20 1 149 0 31 1 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 2 48 0 0 0 0 0 0 1 0 14 3 0 0 149 0 33 1 0 0 0 0 0 0 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 73 77 71 58 80 111 119 101 114 83 104 111 116 32 83 52 48 32 74 80 69 71 0 0 0 0 0 0 0 0 0 0 70 105 114 109 119 97 114 101 32 86 101 114 115 105 111 110 32 49 46 49 48 0 0 0 65 110 100 114 101 97 115 32 72 117 103 103 101 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 42 0 3 0 1 128 122 1 1 128 0 0 0 0 0 0 3 1 2 0 0 0 10 0 0 0 0 0 0 0 57 0 198 0 5 0 0 0 0 0 0 0 Exif.MakerNote.Offset Long 1 942 Exif.MakerNote.ByteOrder Ascii 3 II Exif.CanonCs.Macro Short 1 Off @@ -93,7 +93,7 @@ Exif.Canon.FileNumber Long 1 117-1771 Exif.Canon.OwnerName Ascii 32 Andreas Huggel Exif.Canon.ModelID Long 1 PowerShot S40 Exif.Canon.CameraInfo Short 21 42 3 32769 378 32769 0 0 0 259 2 0 10 0 0 0 57 198 5 0 0 0 -Exif.Photo.UserComment Undefined 264 (Binary value suppressed) +Exif.Photo.UserComment Undefined 264 binary comment Exif.Photo.FlashpixVersion Undefined 4 1.00 Exif.Photo.ColorSpace Short 1 sRGB Exif.Photo.PixelXDimension Short 1 2272 diff --git a/tests/bugfixes/redmine/test_issue_479.py b/tests/bugfixes/redmine/test_issue_479.py index 08898005..e1c0286f 100644 --- a/tests/bugfixes/redmine/test_issue_479.py +++ b/tests/bugfixes/redmine/test_issue_479.py @@ -33,7 +33,7 @@ Exif.Image.ExposureBiasValue SRational 1 0 EV Exif.Image.MeteringMode Short 1 Multi-segment Exif.Image.Flash Short 1 No, compulsory Exif.Image.FocalLength Rational 1 24.0 mm -Exif.Image.0x9286 Undefined 264 (Binary value suppressed) +Exif.Image.0x9286 Undefined 264 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 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 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 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 0 0 0 0 0 0 0 0 0 0 0 0 """] stderr = ["""Error: Directory Image: Next pointer is out of bounds; ignored. """] diff --git a/tests/bugfixes/redmine/test_issue_528.py b/tests/bugfixes/redmine/test_issue_528.py index 7db691e2..46694763 100644 --- a/tests/bugfixes/redmine/test_issue_528.py +++ b/tests/bugfixes/redmine/test_issue_528.py @@ -49,8 +49,7 @@ Exif.Photo.MakerNote Undefined 18 0 1 2 0 3 0 0 0 0 0 Exif.MakerNote.Offset Long 1 796 Exif.MakerNote.ByteOrder Ascii 3 MM Exif.Canon.0x0200 0x0300 0 -Exif.Photo.UserComment Undefined 37 Chateaux de la Loire -Chambord +Exif.Photo.UserComment Undefined 37 charset="Ascii" binary comment Exif.Photo.SubSecTime Ascii 3 81 Exif.Photo.SubSecTimeOriginal Ascii 3 81 Exif.Photo.SubSecTimeDigitized Ascii 3 81 diff --git a/tests/bugfixes/redmine/test_issue_800.py b/tests/bugfixes/redmine/test_issue_800.py index dee1b939..348d8e9f 100644 --- a/tests/bugfixes/redmine/test_issue_800.py +++ b/tests/bugfixes/redmine/test_issue_800.py @@ -49,7 +49,7 @@ Exif.Photo.MaxApertureValue Rational 1 F2.8 Exif.Photo.MeteringMode Short 1 Multi-segment Exif.Photo.Flash Short 1 No, auto Exif.Photo.FocalLength Rational 1 7.4 mm -Exif.Photo.MakerNote Undefined 590 (Binary value suppressed) +Exif.Photo.MakerNote Undefined 590 14 0 1 0 3 0 46 0 0 0 92 4 0 0 2 0 3 0 4 0 0 0 184 4 0 0 3 0 3 0 4 0 0 0 192 4 0 0 4 0 3 0 34 0 0 0 200 4 0 0 0 0 3 0 6 0 0 0 12 5 0 0 0 0 3 0 4 0 0 0 24 5 0 0 18 0 3 0 28 0 0 0 32 5 0 0 19 0 3 0 4 0 0 0 88 5 0 0 6 0 2 0 32 0 0 0 96 5 0 0 7 0 2 0 24 0 0 0 128 5 0 0 8 0 4 0 1 0 0 0 104 167 20 0 9 0 2 0 32 0 0 0 152 5 0 0 16 0 4 0 1 0 0 0 0 0 39 1 13 0 3 0 34 0 0 0 184 5 0 0 0 0 0 0 92 0 2 0 0 0 5 0 1 0 0 0 0 0 4 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 15 0 3 0 1 0 1 64 0 0 255 255 255 255 199 2 237 0 32 0 98 0 180 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 224 8 224 8 0 0 1 0 0 0 0 0 255 127 0 0 0 0 0 0 2 0 237 0 30 1 215 0 0 4 0 0 0 0 0 0 68 0 0 0 128 0 50 1 181 0 245 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 1 0 121 0 0 0 180 0 247 0 0 0 0 0 0 0 250 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 9 0 9 0 224 8 168 6 224 8 212 0 153 1 38 0 102 254 0 0 154 1 102 254 0 0 154 1 102 254 0 0 154 1 215 255 215 255 215 255 0 0 0 0 0 0 41 0 41 0 41 0 16 0 4 0 0 0 0 0 0 0 0 0 73 77 71 58 80 111 119 101 114 83 104 111 116 32 83 52 48 48 32 74 80 69 71 0 0 0 0 0 0 0 0 0 70 105 114 109 119 97 114 101 32 86 101 114 115 105 111 110 32 50 46 48 48 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 68 0 9 0 67 1 57 1 62 1 65 1 69 1 68 1 67 1 66 1 70 1 64 0 0 0 0 0 83 0 0 0 0 0 10 0 0 0 10 0 3 0 120 0 123 1 26 0 249 255 249 3 10 4 0 0 0 0 0 0 0 0 153 0 0 0 0 0 Exif.Photo.UserComment Undefined 12 Test Exif.Photo.FlashpixVersion Undefined 4 1.00 Exif.Photo.PixelXDimension Short 1 2272