xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't allow binary into the output stream!

Browse Source
v0.27.3
clanmills 5 years ago
parent 338176b239
commit 43b06b6814
22 changed files with 153 additions and 196 deletions
Show Stats Download Patch File Download Diff File

13
CMakeLists.txt
Unescape Escape View File

@ -90,13 +90,8 @@ if( EXIV2_BUILD_UNIT_TESTS )
) )
endif() 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 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" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test"
) )
@ -106,14 +101,14 @@ if( EXIV2_BUILD_SAMPLES )
if( EXIV2_BUILD_UNIT_TESTS ) if( EXIV2_BUILD_UNIT_TESTS )
add_custom_target(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 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 python_tests
COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make version_test COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make version_test
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test"
) )
else() else()
add_custom_target(tests 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 python_tests
COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make version_test COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make version_test
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test"
@ -124,7 +119,7 @@ if( EXIV2_BUILD_SAMPLES )
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test"
) )
add_custom_target(bash_tests 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" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test"
) )
add_subdirectory( samples ) add_subdirectory( samples )

2
samples/exifdata-test.cpp
Unescape Escape View File

@ -132,7 +132,7 @@ void print(const std::string& file)
<< std::dec << std::setw(3) << std::dec << std::setw(3)
<< std::setfill(' ') << std::right << std::setfill(' ') << std::right
<< i->count() << " " << i->count() << " "
<< std::dec << i->value() << std::dec << i->toString()
<< "\n"; << "\n";
} }
} }

2
samples/exifprint.cpp
Unescape Escape View File

@ -92,7 +92,7 @@ try {
<< std::dec << std::setw(3) << std::dec << std::setw(3)
<< std::setfill(' ') << std::right << std::setfill(' ') << std::right
<< i->count() << " " << i->count() << " "
<< std::dec << i->value() << std::dec << i->toString()
<< "\n"; << "\n";
} }

55
src/actions.cpp
Unescape Escape View File

@ -689,39 +689,13 @@ namespace Action {
if (!first) if (!first)
std::cout << " "; std::cout << " ";
first = false; 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<const Exiv2::CommentValue*>(&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 // #1114 - show negative values for SByte
if (md.typeId() != Exiv2::signedByte) { if (md.typeId() != Exiv2::signedByte) {
std::cout << std::dec << md.value(); std::cout << std::dec << md.value();
} else { } else {
int value = md.value().toLong(); for ( int c = 0 ; c < md.value().count() ; c++ ) {
std::cout << std::dec << (value < 128 ? value : value - 256); int value = md.value().toLong(c);
std::cout << (c?" ":"") << std::dec << (value < 128 ? value : value - 256);
} }
} }
} }
@ -729,35 +703,12 @@ namespace Action {
if (!first) if (!first)
std::cout << " "; std::cout << " ";
first = false; 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<const Exiv2::CommentValue*>(&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 (Params::instance().printItems_ & Params::prHex) {
if (!first) if (!first)
std::cout << std::endl; std::cout << std::endl;
first = false; 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()); Exiv2::DataBuf buf(md.size());
md.copy(buf.pData_, pImage->byteOrder()); md.copy(buf.pData_, pImage->byteOrder());
Exiv2::hexdump(std::cout, buf.pData_, buf.size_); Exiv2::hexdump(std::cout, buf.pData_, buf.size_);

13
src/exif.cpp
Unescape Escape View File

@ -219,10 +219,19 @@ namespace Exiv2 {
std::ostream& Exifdatum::write(std::ostream& os, const ExifData* pMetadata) const std::ostream& Exifdatum::write(std::ostream& os, const ExifData* pMetadata) const
{ {
if (value().count() == 0) return os; if (value().count() == 0) return os;
PrintFct fct = printValue; PrintFct fct = printValue;
const TagInfo* ti = Internal::tagInfo(tag(), static_cast<IfdId>(ifdId())); const TagInfo* ti = Internal::tagInfo(tag(), static_cast<IfdId>(ifdId()));
if (ti != 0) fct = ti->printFct_; // be careful with comments (User.Photo.UserComment, GPSAreaInfo etc).
return fct(os, value(), pMetadata); 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 const Value& Exifdatum::value() const

16
src/value.cpp
Unescape Escape View File

@ -555,6 +555,16 @@ namespace Exiv2 {
return os << comment(); 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 CommentValue::comment(const char* encoding) const
{ {
std::string c; std::string c;
@ -565,6 +575,10 @@ namespace Exiv2 {
if (charsetId() == unicode) { if (charsetId() == unicode) {
const char* from = encoding == 0 || *encoding == '\0' ? detectCharset(c) : encoding; const char* from = encoding == 0 || *encoding == '\0' ? detectCharset(c) : encoding;
convertStringCharset(c, from, "UTF-8"); convertStringCharset(c, from, "UTF-8");
} else {
if ( isBinary(c) ) {
c = "binary comment" ;
}
} }
return c; return c;
} }
@ -1191,7 +1205,7 @@ namespace Exiv2 {
time_.hour, time_.minute, time_.second, time_.hour, time_.minute, time_.second,
plusMinus, abs(time_.tzHour), abs(time_.tzMinute)); plusMinus, abs(time_.tzHour), abs(time_.tzMinute));
enforce(wrote == 11, Exiv2::kerUnsupportedTimeFormat); // enforce(wrote == 11, Exiv2::kerUnsupportedTimeFormat);
std::memcpy(buf, temp, wrote); std::memcpy(buf, temp, wrote);
return wrote; return wrote;
} }

64
test/Makefile
Unescape Escape View File

@ -72,29 +72,24 @@ SVN = svn://dev.exiv2.org/svn/testdata/trunk
## ##
# Add test drivers to this list # Add test drivers to this list
TESTS1 = addmoddel.sh \ TESTS = addmoddel.sh \
conversions.sh \ conversions.sh \
exifdata-test.sh \
exiv2-test.sh \
geotag-test.sh \ geotag-test.sh \
icc-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 <exiv2dir>/test ; env EXIV2_BINDIR=$PWD/../build/bin make test`
# You can manually run a single test: `cd <exiv2dir>/test ; env EXIV2_BINDIR=$PWD/../build/bin ./iotest.sh`
# Or: make iotest
TESTS2 = exifdata-test.sh \
exiv2-test.sh \
imagetest.sh \ imagetest.sh \
iotest.sh \ iotest.sh \
iptctest.sh \ iptctest.sh \
iso65k-test.sh \
modify-test.sh \
path-test.sh \
preview-test.sh \ preview-test.sh \
stringto-test.sh \
tiff-test.sh \ tiff-test.sh \
webp-test.sh \
write-test.sh \ write-test.sh \
write2-test.sh \
xmpparser-test.sh xmpparser-test.sh
# video tests # video tests
@ -136,30 +131,29 @@ xmpparser-test:
version_test \ version_test \
unit_test : unit_test :
@echo
@echo ---- Running $@ ----
@echo
-@./$@.sh -@./$@.sh
bash_tests:
-@if [ -e $$EXIV2_BINDIR/../Makefile ]; then \
-@./$@.sh ; \
else \
make alltest ; \
fi
tests: tests:
-@if [ -e $$EXIV2_BINDIR/../Makefile ]; then \ -@if [ -e $$EXIV2_BINDIR/../Makefile ]; then \
-@./$@.sh ; \ -@./$@.sh ; \
else \ 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 fi
alltest: bash_tests:
@echo @echo
@echo ---- Running bash tests: ALL ---- @echo ---- Running bash_tests ----
@echo @echo
mkdir -p tmp @mkdir -p tmp
@rm -rf tmp/test-failed @rm -rf tmp/test-failed
@list='$(TESTS1) $(TESTS2)'; for p in $$list; do \ @list='$(TESTS)'; for p in $$list; do \
echo Running $$p ...; \ echo Running $$p ...; \
./$$p; \ ./$$p; \
rc=$$?; \ rc=$$?; \
@ -168,25 +162,13 @@ alltest:
done done
@if [ -e tmp/test-failed ]; then echo ; echo '***' FAILED ; cat tmp/test-failed ; echo '***' ; fi @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: python_tests:
@echo
@echo ---- Running python_tests ----
@echo
-( cd ../tests ; if [ ! -z $$VERBOSE ]; then verbose=--verbose ;fi ; python3 runner.py $$verbose ) -( cd ../tests ; if [ ! -z $$VERBOSE ]; then verbose=--verbose ;fi ; python3 runner.py $$verbose )
testv: testv:
@for t in /video ; do \ @for t in /video ; do \
if [ ! -e data/$$t ]; then \ if [ ! -e data/$$t ]; then \

8
test/data/exifdata-test.out
Unescape Escape View File

@ -267,7 +267,7 @@ Exif.Canon.FileNumber 0x0008 Makernote Long 1
Exif.Canon.OwnerName 0x0009 Makernote Ascii 32 Andreas Huggel Exif.Canon.OwnerName 0x0009 Makernote Ascii 32 Andreas Huggel
Exif.Canon.ModelID 0x0010 Makernote Long 1 17891328 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.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.FlashpixVersion 0xa000 Exif Undefined 4 48 49 48 48
Exif.Photo.ColorSpace 0xa001 Exif Short 1 1 Exif.Photo.ColorSpace 0xa001 Exif Short 1 1
Exif.Photo.PixelXDimension 0xa002 Exif Short 1 2272 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.OwnerName 0x0009 Makernote Ascii 32 Andreas Huggel
Exif.Canon.ModelID 0x0010 Makernote Long 1 17891328 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.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.FlashpixVersion 0xa000 Exif Undefined 4 48 49 48 48
Exif.Photo.ColorSpace 0xa001 Exif Short 1 1 Exif.Photo.ColorSpace 0xa001 Exif Short 1 1
Exif.Photo.PixelXDimension 0xa002 Exif Short 1 2272 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.OwnerName 0x0009 Makernote Ascii 32 Andreas Huggel
Exif.Canon.ModelID 0x0010 Makernote Long 1 17891328 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.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.FlashpixVersion 0xa000 Exif Undefined 4 48 49 48 48
Exif.Photo.ColorSpace 0xa001 Exif Short 1 1 Exif.Photo.ColorSpace 0xa001 Exif Short 1 1
Exif.Photo.PixelXDimension 0xa002 Exif Short 1 2272 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.OwnerName 0x0009 Makernote Ascii 32 Andreas Huggel
Exif.Canon.ModelID 0x0010 Makernote Long 1 17891328 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.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.FlashpixVersion 0xa000 Exif Undefined 4 48 49 48 48
Exif.Photo.ColorSpace 0xa001 Exif Short 1 1 Exif.Photo.ColorSpace 0xa001 Exif Short 1 1
Exif.Photo.PixelXDimension 0xa002 Exif Short 1 2272 Exif.Photo.PixelXDimension 0xa002 Exif Short 1 2272

72
test/data/exiv2-test.out
View File

File diff suppressed because one or more lines are too long

2
test/data/geotag-test.out
Unescape Escape View File

@ -8,7 +8,7 @@ Exif.GPSInfo.GPSAltitudeRef Byte 1 Below sea level
Exif.GPSInfo.GPSAltitude Rational 1 14.3 m Exif.GPSInfo.GPSAltitude Rational 1 14.3 m
Exif.GPSInfo.GPSTimeStamp Rational 3 09:54:28 Exif.GPSInfo.GPSTimeStamp Rational 3 09:54:28
Exif.GPSInfo.GPSMapDatum Ascii 7 WGS-84 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 Exif.GPSInfo.GPSDateStamp Ascii 20 2008:05:08 09:54:28
--- deleting the GPSInfo tags --- deleting the GPSInfo tags
--- run geotag --- --- run geotag ---

2
test/data/modify-test.out
Unescape Escape View File

@ -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.Artist Ascii 17 Vincent van Gogh
exiv2-empty.jpg Exif.Image.WhitePoint Short 5 32 12 4 5 6 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.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 File 2/2: exiv2-gc.jpg
exiv2-gc.jpg Exif.Image.ImageDescription Ascii 18 Exif JPEG exiv2-gc.jpg Exif.Image.ImageDescription Ascii 18 Exif JPEG
exiv2-gc.jpg Exif.Image.Make Ascii 8 Camera exiv2-gc.jpg Exif.Image.Make Ascii 8 Camera

6
test/exiv2-test.sh
Unescape Escape View File

@ -2,7 +2,11 @@
# Test driver for exiv2 utility tests # Test driver for exiv2 utility tests
source ./functions.source source ./functions.source
if [ "$PLATFORM" == SunOS -o "$PLATFORM" == FreeBSD -o "$PLATFORM" == NetBSD ] ; then
diffargs="-w $diffargs"
else
diffargs="-w --text $diffargs" diffargs="-w --text $diffargs"
fi
( cd "$testdir" ( cd "$testdir"
@ -66,7 +70,7 @@ diffargs="-w --text $diffargs"
echo echo
echo "Exiv2 version ------------------------------------------------------------" echo "Exiv2 version ------------------------------------------------------------"
# Tweak this to avoid a maintenance headache with test/data/exiv2-test.out # 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
echo "Exiv2 help ---------------------------------------------------------------" echo "Exiv2 help ---------------------------------------------------------------"
runTest exiv2 -u -h runTest exiv2 -u -h

8
test/functions.source
Unescape Escape View File

@ -139,7 +139,7 @@ runTestCase()
runTest exifprint $rtc_infile > iii; runTest exifprint $rtc_infile > iii;
cp $rtc_infile $rtc_outfile; cp $rtc_infile $rtc_outfile;
runTest write-test $rtc_infile $rtc_number > ttt; 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 if [ -z "$errors" ]; then let -a errors=0; fi
#run diff and check results #run diff and check results
if [ $(uname) == FreeBSD -o $(uname) == NetBSD -o $(uname) == SunOS ]; then if [ "$PLATFORM" == SunOS ]; then
bdiff $diffargs "$test" "$good" bdiff $diffargs "$test" "$good"
elif [ "$PLATFORM" == FreeBSD -o "$PLATFORM" == NetBSD ]; then
diff $diffargs "$test" "$good"
else else
diff --binary $diffargs "$test" "$good" diff --binary $diffargs "$test" "$good"
fi fi
@ -430,7 +432,7 @@ checkSum()
if [ "$platform" == 'NetBSD' -o "$platform" == 'FreeBSD' ]; then if [ "$platform" == 'NetBSD' -o "$platform" == 'FreeBSD' ]; then
md5 -q $1 md5 -q $1
else else
md5sum $1 | cut -d' ' -f 1 md5sum $1 | cut -f 1 -d' '
fi fi
} }

17
test/preview-test.sh
Unescape Escape View File

@ -55,7 +55,7 @@ source ./functions.source
echo echo
echo "Command: exiv2 -pp $filename" echo "Command: exiv2 -pp $filename"
runTest exiv2 -pp "$filename" runTest exiv2 -pp "$filename" 2>/dev/null
exitcode=$? exitcode=$?
echo "Exit code: $exitcode" echo "Exit code: $exitcode"
@ -63,25 +63,22 @@ source ./functions.source
echo echo
echo "Command: exiv2 -f -ep $filename" echo "Command: exiv2 -f -ep $filename"
runTest exiv2 -f -ep "$filename" runTest exiv2 -f -ep "$filename" 2>/dev/null
echo "Exit code: $?" echo "Exit code: $?"
runTest exiv2 -pp "$filename" 2>/dev/null | sed -n 's,^Preview \([0-9]\+\):.*,\1,p' | while read preview; do runTest exiv2 -pp "$filename" 2>/dev/null | sed -n 's,^Preview \([0-9]\+\):.*,\1,p' | while read preview; do
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."* diff $diffargs -q "../data/preview/$image-preview$preview."* "$image-preview$preview."*
fi
done done
done done
) 3>&1 > "$testdir/preview-test.out" 2>&1 ) 3>&1 > "$testdir/preview-test.out" 2>&1
echo "." echo "."
# ---------------------------------------------------------------------- reportTest
# 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."
# That's all Folks! # That's all Folks!
## ##

20
test/tiff-test.sh
Unescape Escape View File

@ -21,10 +21,10 @@ exifprobe()
lens=() lens=()
vals=() vals=()
while read line; do while read line; do
tag=$(echo $line|cut -d. -f 3 | cut -d' ' -f 1) ; tags+=($tag) tag=$(echo $line|cut -f 3 -d. | cut -f 1 -d' ' ) ; tags+=($tag)
typ=$(echo $line|cut -d' ' -f 2- | sed -E -e 's/ +/ /g' -e 's/^ //' | cut -d' ' -f 1 ); typs+=($typ) typ=$(echo $line|cut -f 2- -d' ' | sed -e 's/ +/ /g' -e 's/^ //' | cut -f 1 -d' ' ); typs+=($typ)
len=$(echo $line|cut -d' ' -f 2- | sed -E -e 's/ +/ /g' -e 's/^ //' | cut -d' ' -f 2 ); lens+=($len) len=$(echo $line|cut -f 2- -d' ' | sed -e 's/ +/ /g' -e 's/^ //' | cut -f 2 -d' ' ); lens+=($len)
val=$(echo $line|cut -d' ' -f 2- | sed -E -e 's/ +/ /g' -e 's/^ //' | cut -d' ' -f 3-); vals+=("$val") 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 done < <( runTest exiv2 -pa $f 2>/dev/null ) # process pipe
count=${#tags[@]} count=${#tags[@]}
@ -51,13 +51,13 @@ exifprobe()
while read line; do while read line; do
k=$((k+1)) # skip the first couple of lines k=$((k+1)) # skip the first couple of lines
if [ $k -gt 2 ]; then if [ $k -gt 2 ]; then
TAG=$(echo $line| cut -d'|' -f 2 | cut -d' ' -f 3 ); TAGS+=($TAG); TAG=$(echo $line| cut -f 2 -d'|' | cut -f 3 -d' ' ); TAGS+=($TAG);
TYP=$(echo $line| cut -d'|' -f 3 | sed -E -e's/ +//g'); TYPS+=($TYP) TYP=$(echo $line| cut -f 3 -d'|' | sed -e's/ +//g' ); TYPS+=($TYP)
LEN=$(echo $line| cut -d'|' -f 4 | sed -E -e's/ +//g'); LENS+=($LEN) LEN=$(echo $line| cut -f 4 -d'|' | sed -e's/ +//g' ); LENS+=($LEN)
OFF=$(echo $line| cut -d'|' -f 5 | sed -E -e's/ +//g'); OFFS+=($OFF) OFF=$(echo $line| cut -f 5 -d'|' | sed -e's/ +//g' ); OFFS+=($OFF)
VAL=$(echo $line| cut -d'|' -f 6- | sed -e's/^ //' ); VALS+=($"$VAL") VAL=$(echo $line| cut -f 6- -d'|' | sed -e's/^ //' ); VALS+=($"$VAL")
fi 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[@]} COUNT=${#TAGS[@]}
echo '' echo ''

4
test/unit_test.sh
Unescape Escape View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/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! # That's all Folks!
## ##

4
test/xmpparser-test.sh
Unescape Escape View File

@ -2,6 +2,10 @@
# XMP parser test driver # XMP parser test driver
source ./functions.source 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 # Check if xmpparser-test exists

12
tests/bugfixes/github/test_issue_1046.py
Unescape Escape View File

@ -23,7 +23,7 @@ class test_issue_1046Test(metaclass=CaseMeta):
, "$exiv2 -pt -g GPSPro -g GPSArea $filename" , "$exiv2 -pt -g GPSPro -g GPSArea $filename"
, "$exiv2 -pv -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.GPSVersionID Byte 4 2.2.0.0
Exif.GPSInfo.GPSLatitudeRef Ascii 2 North Exif.GPSInfo.GPSLatitudeRef Ascii 2 North
Exif.GPSInfo.GPSLatitude Rational 3 51deg 23' 13" 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.GPSAltitude Rational 1 104.2 m
Exif.GPSInfo.GPSTimeStamp Rational 3 10:34:11 Exif.GPSInfo.GPSTimeStamp Rational 3 10:34:11
Exif.GPSInfo.GPSMapDatum Ascii 7 WGS-84 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.GPSAreaInformation Undefined 23 Surrey, England
Exif.GPSInfo.GPSDateStamp Ascii 20 2020:02:02 10:34:11 Exif.GPSInfo.GPSDateStamp Ascii 20 2020:02:02 10:34:11
""","""0x9286 Photo UserComment Undefined 12 charset="Unicode" AB ""","""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 0x001b GPSInfo GPSProcessingMethod Undefined 18 charset="Ascii" HYBRID-FIX
0x001c GPSInfo GPSAreaInformation Undefined 23 Surrey, England 0x001c GPSInfo GPSAreaInformation Undefined 23 Surrey, England
0x001d GPSInfo GPSDateStamp Ascii 20 2020:02:02 10:34:11 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 ""","""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 ""","""0x9286 Photo UserComment Undefined 12 charset="Unicode" AB
""","","""Exif.Photo.UserComment Undefined 19 hello world ""","","""Exif.Photo.UserComment Undefined 19 hello world
""","""0x9286 Photo UserComment Undefined 19 hello world ""","""0x9286 Photo UserComment Undefined 19 hello world
""","","","""Exif.GPSInfo.GPSProcessingMethod Undefined 18 Robin ""","","","""Exif.GPSInfo.GPSProcessingMethod Undefined 18 charset="Unicode" Robin
Exif.GPSInfo.GPSAreaInformation Undefined 24 area information Exif.GPSInfo.GPSAreaInformation Undefined 24 charset="Ascii" area information
""","""0x001b GPSInfo GPSProcessingMethod Undefined 18 charset="Unicode" Robin ""","""0x001b GPSInfo GPSProcessingMethod Undefined 18 charset="Unicode" Robin
0x001c GPSInfo GPSAreaInformation Undefined 24 charset="Ascii" area information 0x001c GPSInfo GPSAreaInformation Undefined 24 charset="Ascii" area information
""" """

4
tests/bugfixes/github/test_issue_247.py
Unescape Escape View File

@ -34,7 +34,7 @@ Exif.Photo.MaxApertureValue Rational 1 F2.8
Exif.Photo.MeteringMode Short 1 Center weighted average Exif.Photo.MeteringMode Short 1 Center weighted average
Exif.Photo.Flash Short 1 No, auto Exif.Photo.Flash Short 1 No, auto
Exif.Photo.FocalLength Rational 1 21.3 mm 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.Offset Long 1 942
Exif.MakerNote.ByteOrder Ascii 3 II Exif.MakerNote.ByteOrder Ascii 3 II
Exif.CanonCs.Macro Short 1 Off 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.OwnerName Ascii 32 Andreas Huggel
Exif.Canon.ModelID Long 1 PowerShot S40 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.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.FlashpixVersion Undefined 4 1.00
Exif.Photo.ColorSpace Short 1 sRGB Exif.Photo.ColorSpace Short 1 sRGB
Exif.Photo.PixelXDimension Short 1 2272 Exif.Photo.PixelXDimension Short 1 2272

2
tests/bugfixes/redmine/test_issue_479.py
Unescape Escape View File

@ -33,7 +33,7 @@ Exif.Image.ExposureBiasValue SRational 1 0 EV
Exif.Image.MeteringMode Short 1 Multi-segment Exif.Image.MeteringMode Short 1 Multi-segment
Exif.Image.Flash Short 1 No, compulsory Exif.Image.Flash Short 1 No, compulsory
Exif.Image.FocalLength Rational 1 24.0 mm 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. stderr = ["""Error: Directory Image: Next pointer is out of bounds; ignored.
"""] """]

3
tests/bugfixes/redmine/test_issue_528.py
Unescape Escape View File

@ -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.Offset Long 1 796
Exif.MakerNote.ByteOrder Ascii 3 MM Exif.MakerNote.ByteOrder Ascii 3 MM
Exif.Canon.0x0200 0x0300 0 Exif.Canon.0x0200 0x0300 0
Exif.Photo.UserComment Undefined 37 Chateaux de la Loire Exif.Photo.UserComment Undefined 37 charset="Ascii" binary comment
Chambord
Exif.Photo.SubSecTime Ascii 3 81 Exif.Photo.SubSecTime Ascii 3 81
Exif.Photo.SubSecTimeOriginal Ascii 3 81 Exif.Photo.SubSecTimeOriginal Ascii 3 81
Exif.Photo.SubSecTimeDigitized Ascii 3 81 Exif.Photo.SubSecTimeDigitized Ascii 3 81

2
tests/bugfixes/redmine/test_issue_800.py
Unescape Escape View File

@ -49,7 +49,7 @@ Exif.Photo.MaxApertureValue Rational 1 F2.8
Exif.Photo.MeteringMode Short 1 Multi-segment Exif.Photo.MeteringMode Short 1 Multi-segment
Exif.Photo.Flash Short 1 No, auto Exif.Photo.Flash Short 1 No, auto
Exif.Photo.FocalLength Rational 1 7.4 mm 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.UserComment Undefined 12 Test
Exif.Photo.FlashpixVersion Undefined 4 1.00 Exif.Photo.FlashpixVersion Undefined 4 1.00
Exif.Photo.PixelXDimension Short 1 2272 Exif.Photo.PixelXDimension Short 1 2272

Write Preview
Loading…
Cancel
Save