|
|
@ -36,6 +36,7 @@ EXIV2_RCSID("@(#) $Id$")
|
|
|
|
// included header files
|
|
|
|
// included header files
|
|
|
|
#include "types.hpp"
|
|
|
|
#include "types.hpp"
|
|
|
|
#include "pentaxmn_int.hpp"
|
|
|
|
#include "pentaxmn_int.hpp"
|
|
|
|
|
|
|
|
#include "makernote_int.hpp"
|
|
|
|
#include "value.hpp"
|
|
|
|
#include "value.hpp"
|
|
|
|
#include "exif.hpp"
|
|
|
|
#include "exif.hpp"
|
|
|
|
#include "tags.hpp"
|
|
|
|
#include "tags.hpp"
|
|
|
@ -1351,7 +1352,15 @@ namespace Exiv2 {
|
|
|
|
std::ostream& printLensType(std::ostream& os, const Value& value,
|
|
|
|
std::ostream& printLensType(std::ostream& os, const Value& value,
|
|
|
|
const ExifData* metadata)
|
|
|
|
const ExifData* metadata)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
// #1034
|
|
|
|
|
|
|
|
const std::string undefined("undefined") ;
|
|
|
|
|
|
|
|
const std::string section ("pentax");
|
|
|
|
|
|
|
|
if ( Internal::readExiv2Config(section,value.toString(),undefined) != undefined ) {
|
|
|
|
|
|
|
|
return os << Internal::readExiv2Config(section,value.toString(),undefined);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
unsigned long index = value.toLong(0)*256+value.toLong(1);
|
|
|
|
unsigned long index = value.toLong(0)*256+value.toLong(1);
|
|
|
|
|
|
|
|
|
|
|
|
// std::cout << std::endl << "printLensType value =" << value.toLong() << " index = " << index << std::endl;
|
|
|
|
// std::cout << std::endl << "printLensType value =" << value.toLong() << " index = " << index << std::endl;
|
|
|
|
const LensIdFct* lif = find(lensIdFct, index);
|
|
|
|
const LensIdFct* lif = find(lensIdFct, index);
|
|
|
|
if (!lif) {
|
|
|
|
if (!lif) {
|
|
|
|