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

Merge pull request #1220 from Exiv2/fix_1219_mingw_crw_date_0.27

Browse Source 
fix_1219_mingw_crw_date_0.27
v0.27.3
Robin Mills 5 years ago committed by GitHub
parent 2dd47ebb44 6d7a5266ea
commit 5536cf13e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 126 additions and 59 deletions
Show Stats Download Patch File Download Diff File

3
cmake/config.h.cmake
Unescape Escape View File

@ -12,9 +12,6 @@
// Define if you require webready support. // Define if you require webready support.
#cmakedefine EXV_ENABLE_WEBREADY #cmakedefine EXV_ENABLE_WEBREADY
// Define if you have the `gmtime_r' function.
#cmakedefine EXV_HAVE_GMTIME_R
// Define if you have the <libintl.h> header file. // Define if you have the <libintl.h> header file.
#cmakedefine EXV_HAVE_LIBINTL_H #cmakedefine EXV_HAVE_LIBINTL_H

13
src/crwimage_int.cpp
Unescape Escape View File

@ -910,13 +910,7 @@ namespace Exiv2 {
ULongValue v; ULongValue v;
v.read(ciffComponent.pData(), 8, byteOrder); v.read(ciffComponent.pData(), 8, byteOrder);
time_t t = v.value_[0]; time_t t = v.value_[0];
#ifdef EXV_HAVE_GMTIME_R struct tm* tm = std::localtime(&t);
struct tm tms;
struct tm* tm = &tms;
tm = gmtime_r(&t, tm);
#else
struct tm* tm = std::gmtime(&t);
#endif
if (tm) { if (tm) {
const size_t m = 20; const size_t m = 20;
char s[m]; char s[m];
@ -1138,8 +1132,9 @@ namespace Exiv2 {
if (ed != image.exifData().end()) { if (ed != image.exifData().end()) {
struct tm tm; struct tm tm;
std::memset(&tm, 0x0, sizeof(tm)); std::memset(&tm, 0x0, sizeof(tm));
int rc = exifTime(ed->toString().c_str(), &tm); if ( exifTime(ed->toString().c_str(), &tm) == 0 ) {
if (rc == 0) t = timegm(&tm); t=::mktime(&tm);
}
} }
if (t != 0) { if (t != 0) {
DataBuf buf(12); DataBuf buf(12);

6
src/version.cpp
Unescape Escape View File

@ -317,7 +317,6 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
"unknown"; "unknown";
#endif #endif
int have_gmtime_r =0;
int have_inttypes =0; int have_inttypes =0;
int have_libintl =0; int have_libintl =0;
int have_lensdata =0; int have_lensdata =0;
@ -352,10 +351,6 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
int use_curl =0; int use_curl =0;
int use_ssh =0; int use_ssh =0;
#ifdef EXV_HAVE_GMTIME_R
have_gmtime_r=1;
#endif
#ifdef EXV_HAVE_INTTYPES_H #ifdef EXV_HAVE_INTTYPES_H
have_inttypes=1; have_inttypes=1;
#endif #endif
@ -524,7 +519,6 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
} }
output(os,keys,"have_strerror_r" ,have_strerror_r ); output(os,keys,"have_strerror_r" ,have_strerror_r );
output(os,keys,"have_gmtime_r" ,have_gmtime_r );
output(os,keys,"have_inttypes" ,have_inttypes ); output(os,keys,"have_inttypes" ,have_inttypes );
output(os,keys,"have_libintl" ,have_libintl ); output(os,keys,"have_libintl" ,have_libintl );
output(os,keys,"have_lensdata" ,have_lensdata ); output(os,keys,"have_lensdata" ,have_lensdata );

24
test/crw-test.sh
Unescape Escape View File

@ -2,11 +2,9 @@
# Test driver for CRW file operations # Test driver for CRW file operations
source ./functions.source source ./functions.source
( cd "$testdir" ( cd "$testdir"
crwfile=exiv2-canon-powershot-s40.crw crwfile=exiv2-canon-powershot-s40.crw
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Testcases: Add and modify tags # Testcases: Add and modify tags
cmdfile=cmdfile1 cmdfile=cmdfile1
@ -17,35 +15,25 @@ source ./functions.source
echo add Exif.Canon.SerialNumber 2 echo add Exif.Canon.SerialNumber 2
echo set Exif.Photo.ISOSpeedRatings 155 echo set Exif.Photo.ISOSpeedRatings 155
echo set Exif.Photo.DateTimeOriginal 2007:11:11 09:10:11 echo set Exif.Photo.DateTimeOriginal 2007:11:11 09:10:11
echo set Exif.Image.DateTime 2020:05:26 07:31:41
echo set Exif.Photo.DateTimeDigitized 2020:05:26 07:31:42
) > $cmdfile ) > $cmdfile
copyTestFile $crwfile copyTestFile $crwfile
runTest exiv2 -v -pt $crwfile runTest exiv2 -v -pt $crwfile
runTest exiv2 -v -m $cmdfile $crwfile runTest exiv2 -v -m$cmdfile $crwfile
# runTest crwparse $crwfile
runTest exiv2 -v -pt $crwfile runTest exiv2 -v -pt $crwfile
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Testcases: Delete tags # Testcases: Delete tags
cmdfile=cmdfile2
( echo del Exif.Canon.OwnerName
) > $cmdfile2
copyTestFile $crwfile copyTestFile $crwfile
runTest exiv2 -v -pt $crwfile runTest exiv2 -v -pt $crwfile
runTest exiv2 -v -m $cmdfile $crwfile runTest exiv2 -v -M'del Exif.Canon.OwnerName' $crwfile
# runTest crwparse $crwfile
runTest exiv2 -v -pt $crwfile runTest exiv2 -v -pt $crwfile
) 3>&1 > $results 2>&1 ) 3>&1 > $results
printf "\n"
# ---------------------------------------------------------------------- reportTest
# Evaluate results
cat $results | tr -d $'\r' > $results-stripped
mv $results-stripped $results
reportTest $results $good
# That's all Folks! # That's all Folks!
## ##

139
test/data/crw-test.out
Unescape Escape View File

@ -6,7 +6,7 @@ Exif.Photo.PixelXDimension Long 1 2272
Exif.Photo.PixelYDimension Long 1 1704 Exif.Photo.PixelYDimension Long 1 1704
Exif.Image.Orientation Short 1 top, left Exif.Image.Orientation Short 1 top, left
Exif.Canon.FileNumber Long 1 130-3050 Exif.Canon.FileNumber Long 1 130-3050
Exif.Photo.DateTimeOriginal Ascii 20 2005:04:23 17:54:36 Exif.Photo.DateTimeOriginal Ascii 20 2005:04:23 18:54:36
Exif.Canon.ImageType Ascii 30 CRW:High definition CCD image Exif.Canon.ImageType Ascii 30 CRW:High definition CCD image
Exif.Canon.OwnerName Ascii 15 Andreas Huggel Exif.Canon.OwnerName Ascii 15 Andreas Huggel
Exif.Image.Make Ascii 6 Canon Exif.Image.Make Ascii 6 Canon
@ -14,18 +14,25 @@ Exif.Image.Model Ascii 20 Canon PowerShot S40
Exif.Canon.SerialNumber Long 2 43b226716 Exif.Canon.SerialNumber Long 2 43b226716
Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.10 Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.10
Exif.Canon.FocalLength Short 4 7.1 mm Exif.Canon.FocalLength Short 4 7.1 mm
Exif.CanonSi.AutoISO Short 1 100
Exif.CanonSi.ISOSpeed Short 1 100 Exif.CanonSi.ISOSpeed Short 1 100
Exif.CanonSi.MeasuredEV Short 1 6.97 Exif.CanonSi.MeasuredEV Short 1 6.97
Exif.CanonSi.TargetAperture Short 1 F2.8 Exif.CanonSi.TargetAperture Short 1 F2.8
Exif.CanonSi.TargetShutterSpeed Short 1 1/15 s Exif.CanonSi.TargetShutterSpeed Short 1 1/15 s
Exif.CanonSi.WhiteBalance Short 1 Auto Exif.CanonSi.WhiteBalance Short 1 Auto
Exif.CanonSi.SlowShutter Short 1 Off
Exif.CanonSi.Sequence Short 1 0 Exif.CanonSi.Sequence Short 1 0
Exif.CanonSi.CameraTemperature Short 1 --
Exif.CanonSi.FlashGuideNumber Short 1 0
Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used
Exif.CanonSi.FlashBias Short 1 0 EV Exif.CanonSi.FlashBias Short 1 0 EV
Exif.CanonSi.SubjectDistance Short 1 892 Exif.CanonSi.AutoExposureBracketing Short 1 Off
Exif.CanonSi.SubjectDistance Short 1 8.92 m
Exif.CanonSi.ApertureValue Short 1 F2.9 Exif.CanonSi.ApertureValue Short 1 F2.9
Exif.CanonSi.ShutterSpeedValue Short 1 1/15 s Exif.CanonSi.ShutterSpeedValue Short 1 1/15 s
Exif.CanonSi.MeasuredEV2 Short 1 -6.00 Exif.CanonSi.MeasuredEV2 Short 1 -6.00
Exif.CanonSi.BulbDuration Short 1 0
Exif.CanonSi.CameraType Short 1 Compact
Exif.Photo.FNumber Rational 1 F2.9 Exif.Photo.FNumber Rational 1 F2.9
Exif.Photo.ExposureTime Rational 1 1/15 s Exif.Photo.ExposureTime Rational 1 1/15 s
Exif.CanonCs.Macro Short 1 Off Exif.CanonCs.Macro Short 1 Off
@ -66,13 +73,45 @@ Set Exif.Canon.SerialNumber "1" (Long)
Add Exif.Canon.SerialNumber "2" (Long) Add Exif.Canon.SerialNumber "2" (Long)
Set Exif.Photo.ISOSpeedRatings "155" (Short) Set Exif.Photo.ISOSpeedRatings "155" (Short)
Set Exif.Photo.DateTimeOriginal "2007:11:11 09:10:11" (Ascii) Set Exif.Photo.DateTimeOriginal "2007:11:11 09:10:11" (Ascii)
Set Exif.Image.DateTime "2020:05:26 07:31:41" (Ascii)
Set Exif.Photo.DateTimeDigitized "2020:05:26 07:31:42" (Ascii)
File 1/1: exiv2-canon-powershot-s40.crw File 1/1: exiv2-canon-powershot-s40.crw
Exif.Thumbnail.Compression Short 1 JPEG (old-style)
Exif.Thumbnail.JPEGInterchangeFormat Long 1 0
Exif.Thumbnail.JPEGInterchangeFormatLength Long 1 4418
Exif.Photo.PixelXDimension Long 1 2272
Exif.Photo.PixelYDimension Long 1 1704
Exif.Image.Orientation Short 1 top, left
Exif.Canon.FileNumber Long 1 130-3050
Exif.Photo.DateTimeOriginal Ascii 20 2007:11:11 09:10:11
Exif.Canon.ImageType Ascii 30 CRW:High definition CCD image
Exif.Canon.OwnerName Ascii 16 Different owner
Exif.Image.Make Ascii 6 Canon Exif.Image.Make Ascii 6 Canon
Exif.Image.Model Ascii 20 Canon PowerShot S40 Exif.Image.Model Ascii 20 Canon PowerShot S40
Exif.Canon.OwnerName Ascii 16 Different owner Exif.Canon.SerialNumber Long 2 000000001
Exif.Canon.FocalLength Short 1 65535 Exif.Canon.FirmwareVersion Ascii 17 Whatever version
Exif.Photo.DateTimeOriginal Ascii 20 2086:12:17 15:32:15 Exif.Canon.FocalLength Short 4 2 227 286 215
./crw-test.sh: line 40: $cmdfile2: ambiguous redirect Exif.CanonSi.AutoISO Short 1 100
Exif.CanonSi.ISOSpeed Short 1 100
Exif.CanonSi.MeasuredEV Short 1 6.97
Exif.CanonSi.TargetAperture Short 1 F2.8
Exif.CanonSi.TargetShutterSpeed Short 1 1/15 s
Exif.CanonSi.WhiteBalance Short 1 Auto
Exif.CanonSi.SlowShutter Short 1 Off
Exif.CanonSi.Sequence Short 1 0
Exif.CanonSi.CameraTemperature Short 1 --
Exif.CanonSi.FlashGuideNumber Short 1 0
Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used
Exif.CanonSi.FlashBias Short 1 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 Off
Exif.CanonSi.SubjectDistance Short 1 8.92 m
Exif.CanonSi.ApertureValue Short 1 F2.9
Exif.CanonSi.ShutterSpeedValue Short 1 1/15 s
Exif.CanonSi.MeasuredEV2 Short 1 -6.00
Exif.CanonSi.BulbDuration Short 1 0
Exif.CanonSi.CameraType Short 1 Compact
Exif.Photo.FNumber Rational 1 F2.9
Exif.Photo.ExposureTime Rational 1 1/15 s
File 1/1: exiv2-canon-powershot-s40.crw File 1/1: exiv2-canon-powershot-s40.crw
Exif.Thumbnail.Compression Short 1 JPEG (old-style) Exif.Thumbnail.Compression Short 1 JPEG (old-style)
Exif.Thumbnail.JPEGInterchangeFormat Long 1 0 Exif.Thumbnail.JPEGInterchangeFormat Long 1 0
@ -81,7 +120,7 @@ Exif.Photo.PixelXDimension Long 1 2272
Exif.Photo.PixelYDimension Long 1 1704 Exif.Photo.PixelYDimension Long 1 1704
Exif.Image.Orientation Short 1 top, left Exif.Image.Orientation Short 1 top, left
Exif.Canon.FileNumber Long 1 130-3050 Exif.Canon.FileNumber Long 1 130-3050
Exif.Photo.DateTimeOriginal Ascii 20 2005:04:23 17:54:36 Exif.Photo.DateTimeOriginal Ascii 20 2005:04:23 18:54:36
Exif.Canon.ImageType Ascii 30 CRW:High definition CCD image Exif.Canon.ImageType Ascii 30 CRW:High definition CCD image
Exif.Canon.OwnerName Ascii 15 Andreas Huggel Exif.Canon.OwnerName Ascii 15 Andreas Huggel
Exif.Image.Make Ascii 6 Canon Exif.Image.Make Ascii 6 Canon
@ -89,18 +128,25 @@ Exif.Image.Model Ascii 20 Canon PowerShot S40
Exif.Canon.SerialNumber Long 2 43b226716 Exif.Canon.SerialNumber Long 2 43b226716
Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.10 Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.10
Exif.Canon.FocalLength Short 4 7.1 mm Exif.Canon.FocalLength Short 4 7.1 mm
Exif.CanonSi.AutoISO Short 1 100
Exif.CanonSi.ISOSpeed Short 1 100 Exif.CanonSi.ISOSpeed Short 1 100
Exif.CanonSi.MeasuredEV Short 1 6.97 Exif.CanonSi.MeasuredEV Short 1 6.97
Exif.CanonSi.TargetAperture Short 1 F2.8 Exif.CanonSi.TargetAperture Short 1 F2.8
Exif.CanonSi.TargetShutterSpeed Short 1 1/15 s Exif.CanonSi.TargetShutterSpeed Short 1 1/15 s
Exif.CanonSi.WhiteBalance Short 1 Auto Exif.CanonSi.WhiteBalance Short 1 Auto
Exif.CanonSi.SlowShutter Short 1 Off
Exif.CanonSi.Sequence Short 1 0 Exif.CanonSi.Sequence Short 1 0
Exif.CanonSi.CameraTemperature Short 1 --
Exif.CanonSi.FlashGuideNumber Short 1 0
Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used
Exif.CanonSi.FlashBias Short 1 0 EV Exif.CanonSi.FlashBias Short 1 0 EV
Exif.CanonSi.SubjectDistance Short 1 892 Exif.CanonSi.AutoExposureBracketing Short 1 Off
Exif.CanonSi.SubjectDistance Short 1 8.92 m
Exif.CanonSi.ApertureValue Short 1 F2.9 Exif.CanonSi.ApertureValue Short 1 F2.9
Exif.CanonSi.ShutterSpeedValue Short 1 1/15 s Exif.CanonSi.ShutterSpeedValue Short 1 1/15 s
Exif.CanonSi.MeasuredEV2 Short 1 -6.00 Exif.CanonSi.MeasuredEV2 Short 1 -6.00
Exif.CanonSi.BulbDuration Short 1 0
Exif.CanonSi.CameraType Short 1 Compact
Exif.Photo.FNumber Rational 1 F2.9 Exif.Photo.FNumber Rational 1 F2.9
Exif.Photo.ExposureTime Rational 1 1/15 s Exif.Photo.ExposureTime Rational 1 1/15 s
Exif.CanonCs.Macro Short 1 Off Exif.CanonCs.Macro Short 1 Off
@ -136,21 +182,68 @@ Exif.CanonCs.SpotMeteringMode Short 1 Center
File 1/1: exiv2-canon-powershot-s40.crw File 1/1: exiv2-canon-powershot-s40.crw
Del Exif.Canon.OwnerName Del Exif.Canon.OwnerName
File 1/1: exiv2-canon-powershot-s40.crw File 1/1: exiv2-canon-powershot-s40.crw
Exif.Thumbnail.Compression Short 1 JPEG (old-style)
Exif.Thumbnail.JPEGInterchangeFormat Long 1 0
Exif.Thumbnail.JPEGInterchangeFormatLength Long 1 4418
Exif.Photo.PixelXDimension Long 1 2272
Exif.Photo.PixelYDimension Long 1 1704
Exif.Image.Orientation Short 1 top, left
Exif.Canon.FileNumber Long 1 130-3050
Exif.Photo.DateTimeOriginal Ascii 20 2005:04:23 18:54:36
Exif.Canon.ImageType Ascii 30 CRW:High definition CCD image
Exif.Image.Make Ascii 6 Canon Exif.Image.Make Ascii 6 Canon
Exif.Image.Model Ascii 20 Canon PowerShot S40 Exif.Image.Model Ascii 20 Canon PowerShot S40
Exif.Canon.SerialNumber Long 1104 dbff55551 Exif.Canon.SerialNumber Long 2 43b226716
Exif.Canon.ImageType Ascii 30 CRW:High definition CCD image Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.10
Exif.CanonSi.ISOSpeed Short 1 3.125 Exif.Canon.FocalLength Short 4 7.1 mm
Exif.CanonSi.MeasuredEV Short 1 5.13 Exif.CanonSi.AutoISO Short 1 100
Exif.CanonSi.TargetAperture Short 1 F1 Exif.CanonSi.ISOSpeed Short 1 100
Exif.CanonSi.TargetShutterSpeed Short 1 1 s Exif.CanonSi.MeasuredEV Short 1 6.97
Exif.CanonSi.WhiteBalance Short 1 Daylight Exif.CanonSi.TargetAperture Short 1 F2.8
Exif.CanonSi.Sequence Short 1 2 Exif.CanonSi.TargetShutterSpeed Short 1 1/15 s
Exif.CanonSi.AFPointUsed Short 1 0 focus points; none used Exif.CanonSi.WhiteBalance Short 1 Auto
Exif.CanonSi.SlowShutter Short 1 Off
Exif.CanonSi.Sequence Short 1 0
Exif.CanonSi.CameraTemperature Short 1 --
Exif.CanonSi.FlashGuideNumber Short 1 0
Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used
Exif.CanonSi.FlashBias Short 1 0 EV Exif.CanonSi.FlashBias Short 1 0 EV
Exif.CanonSi.SubjectDistance Short 1 12291 Exif.CanonSi.AutoExposureBracketing Short 1 Off
Exif.CanonSi.ApertureValue Short 1 65535 Exif.CanonSi.SubjectDistance Short 1 8.92 m
Exif.CanonSi.ShutterSpeedValue Short 1 1 s Exif.CanonSi.ApertureValue Short 1 F2.9
Exif.CanonSi.MeasuredEV2 Short 1 79.25 Exif.CanonSi.ShutterSpeedValue Short 1 1/15 s
Exif.Photo.FNumber Rational 1 F-2.1e+03 Exif.CanonSi.MeasuredEV2 Short 1 -6.00
Exif.Photo.ExposureTime Rational 1 (1/0) Exif.CanonSi.BulbDuration Short 1 0
Exif.CanonSi.CameraType Short 1 Compact
Exif.Photo.FNumber Rational 1 F2.9
Exif.Photo.ExposureTime Rational 1 1/15 s
Exif.CanonCs.Macro Short 1 Off
Exif.CanonCs.Selftimer Short 1 Off
Exif.CanonCs.Quality Short 1 RAW
Exif.CanonCs.FlashMode Short 1 Off
Exif.CanonCs.DriveMode Short 1 Single / timer
Exif.CanonCs.FocusMode Short 1 AI servo AF
Exif.CanonCs.ImageSize Short 1 Large
Exif.CanonCs.EasyMode Short 1 Manual
Exif.CanonCs.DigitalZoom Short 1 None
Exif.CanonCs.Contrast Short 1 Normal
Exif.CanonCs.Saturation Short 1 Normal
Exif.CanonCs.Sharpness Short 1 Normal
Exif.CanonCs.ISOSpeed Short 1 100
Exif.CanonCs.MeteringMode Short 1 Evaluative
Exif.CanonCs.FocusType Short 1 Auto
Exif.CanonCs.AFPoint Short 1 Center
Exif.CanonCs.ExposureProgram Short 1 Program (P)
Exif.CanonCs.LensType Short 1 n/a
Exif.CanonCs.Lens Short 3 7.1 - 21.3 mm
Exif.CanonCs.MaxAperture Short 1 F2.9
Exif.CanonCs.MinAperture Short 1 F8
Exif.CanonCs.FlashActivity Short 1 Did not fire
Exif.CanonCs.FlashDetails Short 1
Exif.CanonCs.FocusContinuous Short 1 Single
Exif.CanonCs.AESetting Short 1 Normal AE
Exif.CanonCs.ImageStabilization Short 1 (65535)
Exif.CanonCs.DisplayAperture Short 1 0
Exif.CanonCs.ZoomSourceWidth Short 1 2272
Exif.CanonCs.ZoomTargetWidth Short 1 2272
Exif.CanonCs.SpotMeteringMode Short 1 Center

Write Preview
Loading…
Cancel
Save