Skip to content

Commit

Permalink
Merge pull request #888 from Exiv2/mergify/bp/master/pr-885
Browse files Browse the repository at this point in the history 
fix880_NikonEndian (bp #885)
  • Loading branch information
@piponazo
piponazo authored May 21, 2019
2 parents b96f4c2 + dcfc5e9 commit 26dac6a
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
16 changes: 8 additions & 8 deletions src/tiffimage_int.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ namespace Exiv2 {
//! Nikon Auto Focus binary array - configuration
extern const ArrayCfg nikonAfCfg = {
nikonAfId, // Group for the elements
littleEndian, // Byte order
invalidByteOrder, // Use byte order from parent
ttUndefined, // Type for array entry
notEncrypted, // Not encrypted
false, // No size element
Expand All @@ -224,7 +224,7 @@ namespace Exiv2 {
//! Nikon Auto Focus 2 binary array - configuration
extern const ArrayCfg nikonAf2Cfg = {
nikonAf2Id, // Group for the elements
littleEndian, // Byte order
invalidByteOrder, // Use byte order from parent
ttUndefined, // Type for array entry
notEncrypted, // Not encrypted
false, // No size element
Expand Down Expand Up @@ -252,7 +252,7 @@ namespace Exiv2 {
//! Nikon AF Fine Tune binary array - configuration
extern const ArrayCfg nikonAFTCfg = {
nikonAFTId, // Group for the elements
littleEndian, // Byte order
invalidByteOrder, // Use byte order from parent
ttUndefined, // Type for array entry
notEncrypted, // Not encrypted
false, // No size element
Expand All @@ -270,7 +270,7 @@ namespace Exiv2 {
//! Nikon File Info binary array - configuration
extern const ArrayCfg nikonFiCfg = {
nikonFiId, // Group for the elements
littleEndian, // Byte order
invalidByteOrder, // Use byte order from parent
ttUndefined, // Type for array entry
notEncrypted, // Not encrypted
false, // No size element
Expand All @@ -288,7 +288,7 @@ namespace Exiv2 {
//! Nikon Multi Exposure binary array - configuration
extern const ArrayCfg nikonMeCfg = {
nikonMeId, // Group for the elements
littleEndian, // Byte order
invalidByteOrder, // Use byte order from parent
ttUndefined, // Type for array entry
notEncrypted, // Not encrypted
false, // No size element
Expand All @@ -307,7 +307,7 @@ namespace Exiv2 {
//! Nikon Flash Info binary array - configuration 1
extern const ArrayCfg nikonFl1Cfg = {
nikonFl1Id, // Group for the elements
littleEndian, // Byte order
invalidByteOrder, // Use byte order from parent
ttUndefined, // Type for array entry
notEncrypted, // Not encrypted
false, // No size element
Expand All @@ -331,7 +331,7 @@ namespace Exiv2 {
//! Nikon Flash Info binary array - configuration 2
extern const ArrayCfg nikonFl2Cfg = {
nikonFl2Id, // Group for the elements
littleEndian, // Byte order
invalidByteOrder, // Use byte order from parent
ttUndefined, // Type for array entry
notEncrypted, // Not encrypted
false, // No size element
Expand All @@ -353,7 +353,7 @@ namespace Exiv2 {
//! Nikon Flash Info binary array - configuration 3
extern const ArrayCfg nikonFl3Cfg = {
nikonFl3Id, // Group for the elements
littleEndian, // Byte order
invalidByteOrder, // Use byte order from parent
ttUndefined, // Type for array entry
notEncrypted, // Not encrypted
false, // No size element
Expand Down
8 changes: 4 additions & 4 deletions test/data/exifdata-test.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ Exif.Nikon3.Lens 0x0084 Makernote Rational 4
Exif.Nikon3.FlashMode 0x0087 Makernote Byte 1 0
Exif.NikonAf.AFAreaMode 0x0000 Makernote Byte 1 0
Exif.NikonAf.AFPoint 0x0001 Makernote Byte 1 0
Exif.NikonAf.AFPointsInFocus 0x0002 Makernote Short 1 256
Exif.NikonAf.AFPointsInFocus 0x0002 Makernote Short 1 1
Exif.Nikon3.ShootingMode 0x0089 Makernote Short 1 0
Exif.Nikon3.AutoBracketRelease 0x008a Makernote Short 1 0
Exif.Nikon3.LensFStops 0x008b Makernote Undefined 4 64 1 12 0
Expand Down Expand Up @@ -916,7 +916,7 @@ Exif.Nikon3.Lens 0x0084 Makernote Rational 4
Exif.Nikon3.FlashMode 0x0087 Makernote Byte 1 0
Exif.NikonAf.AFAreaMode 0x0000 Makernote Byte 1 0
Exif.NikonAf.AFPoint 0x0001 Makernote Byte 1 0
Exif.NikonAf.AFPointsInFocus 0x0002 Makernote Short 1 256
Exif.NikonAf.AFPointsInFocus 0x0002 Makernote Short 1 1
Exif.Nikon3.ShootingMode 0x0089 Makernote Short 1 0
Exif.Nikon3.AutoBracketRelease 0x008a Makernote Short 1 0
Exif.Nikon3.LensFStops 0x008b Makernote Undefined 4 64 1 12 0
Expand Down Expand Up @@ -1088,7 +1088,7 @@ Exif.Nikon3.Lens 0x0084 Makernote Rational 4
Exif.Nikon3.FlashMode 0x0087 Makernote Byte 1 0
Exif.NikonAf.AFAreaMode 0x0000 Makernote Byte 1 0
Exif.NikonAf.AFPoint 0x0001 Makernote Byte 1 0
Exif.NikonAf.AFPointsInFocus 0x0002 Makernote Short 1 256
Exif.NikonAf.AFPointsInFocus 0x0002 Makernote Short 1 1
Exif.Nikon3.ShootingMode 0x0089 Makernote Short 1 0
Exif.Nikon3.AutoBracketRelease 0x008a Makernote Short 1 0
Exif.Nikon3.LensFStops 0x008b Makernote Undefined 4 64 1 12 0
Expand Down Expand Up @@ -1260,7 +1260,7 @@ Exif.Nikon3.Lens 0x0084 Makernote Rational 4
Exif.Nikon3.FlashMode 0x0087 Makernote Byte 1 0
Exif.NikonAf.AFAreaMode 0x0000 Makernote Byte 1 0
Exif.NikonAf.AFPoint 0x0001 Makernote Byte 1 0
Exif.NikonAf.AFPointsInFocus 0x0002 Makernote Short 1 256
Exif.NikonAf.AFPointsInFocus 0x0002 Makernote Short 1 1
Exif.Nikon3.ShootingMode 0x0089 Makernote Short 1 0
Exif.Nikon3.AutoBracketRelease 0x008a Makernote Short 1 0
Exif.Nikon3.LensFStops 0x008b Makernote Undefined 4 64 1 12 0
Expand Down
10 changes: 5 additions & 5 deletions test/data/exiv2-test.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ File 4/15: 20040329_224245.jpg
20040329_224245.jpg Exif.Nikon3.FlashMode Byte 1 Did not fire
20040329_224245.jpg Exif.NikonAf.AFAreaMode Byte 1 Single Area
20040329_224245.jpg Exif.NikonAf.AFPoint Byte 1 Center
20040329_224245.jpg Exif.NikonAf.AFPointsInFocus Short 1 Center
20040329_224245.jpg Exif.NikonAf.AFPointsInFocus Short 1 Lower-right
20040329_224245.jpg Exif.Nikon3.ShootingMode Short 1 Single-frame
20040329_224245.jpg Exif.Nikon3.AutoBracketRelease Short 1 None
20040329_224245.jpg Exif.Nikon3.LensFStops Undefined 4 5.33333
Expand Down Expand Up @@ -2473,7 +2473,7 @@ Compare image data and extracted data ------------------------------------
< 20040329_224245.jpg Exif.Nikon3.FlashMode Byte 1 Did not fire
< 20040329_224245.jpg Exif.NikonAf.AFAreaMode Byte 1 Single Area
< 20040329_224245.jpg Exif.NikonAf.AFPoint Byte 1 Center
< 20040329_224245.jpg Exif.NikonAf.AFPointsInFocus Short 1 Center
< 20040329_224245.jpg Exif.NikonAf.AFPointsInFocus Short 1 Lower-right
< 20040329_224245.jpg Exif.Nikon3.ShootingMode Short 1 Single-frame
< 20040329_224245.jpg Exif.Nikon3.AutoBracketRelease Short 1 None
< 20040329_224245.jpg Exif.Nikon3.LensFStops Undefined 4 5.33333
Expand Down Expand Up @@ -4014,7 +4014,7 @@ Compare image data and extracted data ------------------------------------
> 20040329_224245.exv Exif.Nikon3.FlashMode Byte 1 Did not fire
> 20040329_224245.exv Exif.NikonAf.AFAreaMode Byte 1 Single Area
> 20040329_224245.exv Exif.NikonAf.AFPoint Byte 1 Center
> 20040329_224245.exv Exif.NikonAf.AFPointsInFocus Short 1 Center
> 20040329_224245.exv Exif.NikonAf.AFPointsInFocus Short 1 Lower-right
> 20040329_224245.exv Exif.Nikon3.ShootingMode Short 1 Single-frame
> 20040329_224245.exv Exif.Nikon3.AutoBracketRelease Short 1 None
> 20040329_224245.exv Exif.Nikon3.LensFStops Undefined 4 5.33333
Expand Down Expand Up @@ -5775,7 +5775,7 @@ Compare original and inserted image data ---------------------------------
< 20040329_224245.jpg Exif.Nikon3.FlashMode Byte 1 Did not fire
< 20040329_224245.jpg Exif.NikonAf.AFAreaMode Byte 1 Single Area
< 20040329_224245.jpg Exif.NikonAf.AFPoint Byte 1 Center
< 20040329_224245.jpg Exif.NikonAf.AFPointsInFocus Short 1 Center
< 20040329_224245.jpg Exif.NikonAf.AFPointsInFocus Short 1 Lower-right
< 20040329_224245.jpg Exif.Nikon3.ShootingMode Short 1 Single-frame
< 20040329_224245.jpg Exif.Nikon3.AutoBracketRelease Short 1 None
< 20040329_224245.jpg Exif.Nikon3.LensFStops Undefined 4 5.33333
Expand Down Expand Up @@ -7316,7 +7316,7 @@ Compare original and inserted image data ---------------------------------
> 20040329_224245.exv Exif.Nikon3.FlashMode Byte 1 Did not fire
> 20040329_224245.exv Exif.NikonAf.AFAreaMode Byte 1 Single Area
> 20040329_224245.exv Exif.NikonAf.AFPoint Byte 1 Center
> 20040329_224245.exv Exif.NikonAf.AFPointsInFocus Short 1 Center
> 20040329_224245.exv Exif.NikonAf.AFPointsInFocus Short 1 Lower-right
> 20040329_224245.exv Exif.Nikon3.ShootingMode Short 1 Single-frame
> 20040329_224245.exv Exif.Nikon3.AutoBracketRelease Short 1 None
> 20040329_224245.exv Exif.Nikon3.LensFStops Undefined 4 5.33333
Expand Down

0 comments on commit 26dac6a

Please sign in to comment.