@ -1977,6 +1977,7 @@ namespace Exiv2 {
{ 368 , " Sigma 14-24mm f/2.8 DG HSM " } , // 9
{ 368 , " Sigma 14-24mm f/2.8 DG HSM " } , // 9
{ 368 , " Sigma 70mm f/2.8 DG Macro " } , // 10
{ 368 , " Sigma 70mm f/2.8 DG Macro " } , // 10
{ 368 , " Sigma 18-35mm f/1.8 DC HSM | A " } , // 11
{ 368 , " Sigma 18-35mm f/1.8 DC HSM | A " } , // 11
{ 368 , " Sigma 35mm f/1.4 DG HSM | A " } , // 12
{ 488 , " Canon EF-S 15-85mm f/3.5-5.6 IS USM " } ,
{ 488 , " Canon EF-S 15-85mm f/3.5-5.6 IS USM " } ,
{ 489 , " Canon EF 70-300mm f/4-5.6L IS USM " } ,
{ 489 , " Canon EF 70-300mm f/4-5.6L IS USM " } ,
{ 490 , " Canon EF 8-15mm f/4L Fisheye USM " } ,
{ 490 , " Canon EF 8-15mm f/4L Fisheye USM " } ,
@ -2132,7 +2133,7 @@ namespace Exiv2 {
{ 250 , printCsLensByFocalLength } , // not tested
{ 250 , printCsLensByFocalLength } , // not tested
{ 254 , printCsLensByFocalLength } ,
{ 254 , printCsLensByFocalLength } ,
{ 255 , printCsLensByFocalLength } , // not tested
{ 255 , printCsLensByFocalLength } , // not tested
{ 368 , printCsLensByFocalLength } ,
{ 368 , printCsLensByFocalLength AndMaxAperture } ,
{ 491 , printCsLensByFocalLength } ,
{ 491 , printCsLensByFocalLength } ,
{ 493 , printCsLensByFocalLength } , // not tested
{ 493 , printCsLensByFocalLength } , // not tested
{ 624 , printCsLensByFocalLengthTC } ,
{ 624 , printCsLensByFocalLengthTC } ,
@ -3217,6 +3218,9 @@ namespace Exiv2 {
else if ( frac = = 0x14 ) {
else if ( frac = = 0x14 ) {
frac = 64.0f / 3 ;
frac = 64.0f / 3 ;
}
}
else if ( ( val = = 160 ) & & ( frac = = 0x08 ) ) { // for Sigma f/6.3 lenses that report f/6.2 to camera
frac = 30.0F / 3 ;
}
return sign * ( val + frac ) / 32.0f ;
return sign * ( val + frac ) / 32.0f ;
}
}