summaryrefslogtreecommitdiff
path: root/modules/exif/lib/makers
diff options
context:
space:
mode:
Diffstat (limited to 'modules/exif/lib/makers')
-rw-r--r--modules/exif/lib/makers/canon.php15
-rw-r--r--modules/exif/lib/makers/fujifilm.php13
-rw-r--r--modules/exif/lib/makers/gps.php128
-rw-r--r--modules/exif/lib/makers/nikon.php301
-rw-r--r--modules/exif/lib/makers/olympus.php13
-rw-r--r--modules/exif/lib/makers/panasonic.php12
-rw-r--r--modules/exif/lib/makers/sanyo.php13
7 files changed, 252 insertions, 243 deletions
diff --git a/modules/exif/lib/makers/canon.php b/modules/exif/lib/makers/canon.php
index 75cf0b7b..aecd266d 100644
--- a/modules/exif/lib/makers/canon.php
+++ b/modules/exif/lib/makers/canon.php
@@ -40,6 +40,7 @@ function lookup_Canon_tag($tag) {
case "0009": $tag = "OwnerName";break;
case "000c": $tag = "CameraSerialNumber";break;
case "000f": $tag = "CustomFunctions";break;
+ case "0095": $tag = "LensInfo";break;
default: $tag = "unknown:".$tag;break;
}
@@ -57,13 +58,7 @@ function formatCanonData($type,$tag,$intel,$data,$exif,&$result) {
if($type=="ASCII") {
$result = $data = str_replace("\0", "", $data);
} else if($type=="URATIONAL" || $type=="SRATIONAL") {
- $data = bin2hex($data);
- if($intel==1) $data = intel2Moto($data);
- $top = hexdec(substr($data,8,8));
- $bottom = hexdec(substr($data,0,8));
- if($bottom!=0) $data=$top/$bottom;
- else if($top==0) $data = 0;
- else $data=$top."/".$bottom;
+ $data = unRational($data,$type,$intel);
if($tag=="0204") { //DigitalZoom
$data=$data."x";
@@ -71,7 +66,7 @@ function formatCanonData($type,$tag,$intel,$data,$exif,&$result) {
} else if($type=="USHORT" || $type=="SSHORT" || $type=="ULONG" || $type=="SLONG" || $type=="FLOAT" || $type=="DOUBLE") {
- $data = bin2hex($data);
+ $data = rational($data,$type,$intel);
$result['RAWDATA'] = $data;
if($tag=="0001") { //first chunk
@@ -377,20 +372,18 @@ function parseCanon($block,&$result,$seek, $globalOffset) {
//2 byte type
$type = bin2hex(substr($block,$place,2));$place+=2;
if($intel==1) $type = intel2Moto($type);
- lookup_type($type,$size);
+ lookup_type($type,$size);
//4 byte count of number of data units
$count = bin2hex(substr($block,$place,4));$place+=4;
if($intel==1) $count = intel2Moto($count);
$bytesofdata = $size*hexdec($count);
-
if($bytesofdata<=0) {
return; //if this value is 0 or less then we have read all the tags we can
}
//4 byte value of data or pointer to data
$value = substr($block,$place,4);$place+=4;
-
if($bytesofdata<=4) {
$data = $value;
} else {
diff --git a/modules/exif/lib/makers/fujifilm.php b/modules/exif/lib/makers/fujifilm.php
index a88e51c3..a1f2f416 100644
--- a/modules/exif/lib/makers/fujifilm.php
+++ b/modules/exif/lib/makers/fujifilm.php
@@ -44,7 +44,6 @@ function lookup_Fujifilm_tag($tag) {
case "1021": $tag = "FocusMode";break;
case "1030": $tag = "SlowSync";break;
case "1031": $tag = "PictureMode";break;
- case "1032": $tag = "Unknown";break;
case "1100": $tag = "ContinuousTakingBracket";break;
case "1200": $tag = "Unknown";break;
case "1300": $tag = "BlurWarning";break;
@@ -66,22 +65,14 @@ function formatFujifilmData($type,$tag,$intel,$data) {
} else if($type=="URATIONAL" || $type=="SRATIONAL") {
- $data = bin2hex($data);
- if($intel==1) $data = intel2Moto($data);
- $top = hexdec(substr($data,8,8));
- $bottom = hexdec(substr($data,0,8));
- if($bottom!=0) $data=$top/$bottom;
- else if($top==0) $data = 0;
- else $data=$top."/".$bottom;
+ $data = unRational($data,$type,$intel);
if($tag=="1011") { //FlashStrength
$data=$data." EV";
}
} else if($type=="USHORT" || $type=="SSHORT" || $type=="ULONG" || $type=="SLONG" || $type=="FLOAT" || $type=="DOUBLE") {
- $data = bin2hex($data);
- if($intel==1) $data = intel2Moto($data);
- $data=hexdec($data);
+ $data =rational($data,$type,$intel);
if($tag=="1001") { //Sharpness
if($data == 1) $data = (string) t("Soft");
diff --git a/modules/exif/lib/makers/gps.php b/modules/exif/lib/makers/gps.php
index 9a6ab137..462aae68 100644
--- a/modules/exif/lib/makers/gps.php
+++ b/modules/exif/lib/makers/gps.php
@@ -73,102 +73,65 @@ function lookup_GPS_tag($tag) {
}
//=================
-// Formats a rational number
-//====================================================================
-function GPSRational($data, $intel) {
-
- if($intel==1) $top = hexdec(substr($data,8,8)); //intel stores them bottom-top
- else $top = hexdec(substr($data,0,8)); //motorola stores them top-bottom
-
- if($intel==1) $bottom = hexdec(substr($data,0,8)); //intel stores them bottom-top
- else $bottom = hexdec(substr($data,8,8)); //motorola stores them top-bottom
-
- if($bottom!=0) $data=$top/$bottom;
- else if($top==0) $data = 0;
- else $data=$top."/".$bottom;
-
- return $data;
-}
-//=================
// Formats Data for the data type
//====================================================================
function formatGPSData($type,$tag,$intel,$data) {
if($type=="ASCII") {
- if($tag=="0001" || $tag=="0003"){ // Latitude Reference, Longitude Reference
- $data = ($data{1} == $data{2} && $data{1} == $data{3}) ? $data{0} : $data;
- }
-
+ if($tag=="0001" || $tag=="0003"){ // Latitude Reference, Longitude Reference
+ $data = ($data{1} == $data{2} && $data{1} == $data{3}) ? $data{0} : $data;
+ }
+
} else if($type=="URATIONAL" || $type=="SRATIONAL") {
- $data = bin2hex($data);
- if($intel==1) $data = intel2Moto($data);
-
- if($intel==1) $top = hexdec(substr($data,8,8)); //intel stores them bottom-top
- else $top = hexdec(substr($data,0,8)); //motorola stores them top-bottom
-
- if($intel==1) $bottom = hexdec(substr($data,0,8)); //intel stores them bottom-top
- else $bottom = hexdec(substr($data,8,8)); //motorola stores them top-bottom
-
- if($type=="SRATIONAL" && $top>2147483647) $top = $top - 4294967296; //this makes the number signed instead of unsigned
-
- if($tag=="0002" || $tag=="0004") { //Latitude, Longitude
-
- if($intel==1){
- $seconds = GPSRational(substr($data,0,16),$intel);
- $hour = GPSRational(substr($data,32,16),$intel);
- } else {
- $hour= GPSRational(substr($data,0,16),$intel);
- $seconds = GPSRational(substr($data,32,16),$intel);
+ if($tag=="0002" || $tag=="0004" || $tag=='0007') { //Latitude, Longitude, Time
+ $datum = array();
+ for ($i=0;$i<strlen($data);$i=$i+8) {
+ array_push($datum,substr($data, $i, 8));
+ }
+ $hour = unRational($datum[0],$type,$intel);
+ $minutes = unRational($datum[1],$type,$intel);
+ $seconds = unRational($datum[2],$type,$intel);
+ if($tag=="0007") { //Time
+ $data = $hour.":".$minutes.":".$seconds;
+ } else {
+ $data = $hour+$minutes/60+$seconds/3600;
}
- $minutes = GPSRational(substr($data,16,16),$intel);
-
- $data = $hour+$minutes/60+$seconds/3600;
- } else if($tag=="0007") { //Time
- $seconds = GPSRational(substr($data,0,16),$intel);
- $minutes = GPSRational(substr($data,16,16),$intel);
- $hour = GPSRational(substr($data,32,16),$intel);
-
- $data = $hour.":".$minutes.":".$seconds;
} else {
- if($bottom!=0) $data=$top/$bottom;
- else if($top==0) $data = 0;
- else $data=$top."/".$bottom;
-
- if($tag=="0006"){
- $data .= 'm';
- }
+ $data = unRational($data,$type,$intel);
+
+ if($tag=="0006"){
+ $data .= 'm';
+ }
}
} else if($type=="USHORT" || $type=="SSHORT" || $type=="ULONG" || $type=="SLONG" || $type=="FLOAT" || $type=="DOUBLE") {
- $data = bin2hex($data);
- if($intel==1) $data = intel2Moto($data);
- $data=hexdec($data);
-
-
+ $data = rational($data,$type,$intel);
+
+
} else if($type=="UNDEFINED") {
-
-
-
+
+
+
} else if($type=="UBYTE") {
$data = bin2hex($data);
if($intel==1) $num = intel2Moto($data);
if($tag=="0000") { // VersionID
- $data = hexdec(substr($data,0,2)) .
+ $data = hexdec(substr($data,0,2)) .
".". hexdec(substr($data,2,2)) .
".". hexdec(substr($data,4,2)) .
".". hexdec(substr($data,6,2));
- } else if($tag=="0005"){ // Altitude Reference
- if($data == "00000000"){ $data = 'Above Sea Level'; }
- else if($data == "01000000"){ $data = 'Below Sea Level'; }
- }
-
+ } else if($tag=="0005"){ // Altitude Reference
+ if($data == "00000000"){ $data = '+'; }
+ else if($data == "01000000"){ $data = '-'; }
+ }
+
} else {
$data = bin2hex($data);
if($intel==1) $data = intel2Moto($data);
}
-
+
return $data;
}
@@ -220,21 +183,26 @@ function parseGPS($block,&$result,$offset,$seek, $globalOffset) {
//4 byte value or pointer to value if larger than 4 bytes
$value = substr($block,$place,4);$place+=4;
-
if($bytesofdata<=4) {
$data = $value;
} else {
- $value = bin2hex($value);
- if($intel==1) $value = intel2Moto($value);
-
- $v = fseek($seek,$globalOffset+hexdec($value)); //offsets are from TIFF header which is 12 bytes from the start of the file
- if($v==0) {
- $data = fread($seek, $bytesofdata);
- } else if($v==-1) {
+ if (strpos('unknown',$tag_name) !== false || $bytesofdata > 1024) {
$result['Errors'] = $result['Errors']++;
+ $data = '';
+ $type = 'ASCII';
+ } else {
+ $value = bin2hex($value);
+ if($intel==1) $value = intel2Moto($value);
+ $v = fseek($seek,$globalOffset+hexdec($value)); //offsets are from TIFF header which is 12 bytes from the start of the file
+ if($v==0) {
+ $data = fread($seek, $bytesofdata);
+ } else {
+ $result['Errors'] = $result['Errors']++;
+ $data = '';
+ $type = 'ASCII';
+ }
}
}
-
if($result['VerboseOutput']==1) {
$result['GPS'][$tag_name] = formatGPSData($type,$tag,$intel,$data);
$result['GPS'][$tag_name."_Verbose"]['RawData'] = bin2hex($data);
diff --git a/modules/exif/lib/makers/nikon.php b/modules/exif/lib/makers/nikon.php
index ebc2af7c..d2fff9a2 100644
--- a/modules/exif/lib/makers/nikon.php
+++ b/modules/exif/lib/makers/nikon.php
@@ -57,8 +57,32 @@ function lookup_Nikon_tag($tag,$model) {
case "0008": $tag = "FlashSetting";break;
case "0009": $tag = "FlashMode";break;
case "000b": $tag = "WhiteBalanceFine";break;
+ case "000c": $tag = "WB_RBLevels";break;
+ case "000d": $tag = "ProgramShift";break;
+ case "000e": $tag = "ExposureDifference";break;
case "000f": $tag = "ISOSelection";break;
- case "0013": $tag = "ISOSelection2";break;
+ case "0010": $tag = "DataDump";break;
+ case "0011": $tag = "NikonPreview";break;
+ case "0012": $tag = "FlashExposureComp";break;
+ case "0013": $tag = "ISOSetting2";break;
+ case "0014": $tag = "ColorBalanceA";break;
+ case "0016": $tag = "ImageBoundary";break;
+ case "0017": $tag = "FlashExposureComp";break;
+ case "0018": $tag = "FlashExposureBracketValue";break;
+ case "0019": $tag = "ExposureBracketValue";break;
+ case "001a": $tag = "ImageProcessing";break;
+ case "001b": $tag = "CropHiSpeed";break;
+ case "001c": $tag = "ExposureTuning";break;
+ case "001d": $tag = "SerialNumber";break;
+ case "001e": $tag = "ColorSpace";break;
+ case "001f": $tag = "VRInfo";break;
+ case "0020": $tag = "ImageAuthentication";break;
+ case "0022": $tag = "ActiveD-Lighting";break;
+ case "0023": $tag = "PictureControl";break;
+ case "0024": $tag = "WorldTime";break;
+ case "0025": $tag = "ISOInfo";break;
+ case "002a": $tag = "VignetteControl";break;
+ case "002b": $tag = "DistortInfo";break;
case "0080": $tag = "ImageAdjustment";break;
case "0081": $tag = "ToneCompensation";break;
case "0082": $tag = "Adapter";break;
@@ -68,11 +92,16 @@ function lookup_Nikon_tag($tag,$model) {
case "0086": $tag = "DigitalZoom";break;
case "0087": $tag = "FlashUsed";break;
case "0088": $tag = "AFFocusPosition";break;
+ case "0089": $tag = "ShootingMode";break;
+ case "008b": $tag = "LensFStops";break;
+ case "008c": $tag = "ContrastCurve";break;
case "008d": $tag = "ColorMode";break;
case "0090": $tag = "LightType";break;
+ case "0092": $tag = "HueAdjustment";break;
+ case "0093": $tag = "NEFCompression";break;
case "0094": $tag = "Saturation";break;
case "0095": $tag = "NoiseReduction";break;
- case "0010": $tag = "DataDump";break;
+ case "009a": $tag = "SensorPixelSize";break;
default: $tag = "unknown:".$tag;break;
}
@@ -81,120 +110,172 @@ function lookup_Nikon_tag($tag,$model) {
return $tag;
}
+
//=================
// Formats Data for the data type
//====================================================================
function formatNikonData($type,$tag,$intel,$model,$data) {
-
- if($type=="ASCII") {
-
-
- } else if($type=="URATIONAL" || $type=="SRATIONAL") {
- $data = bin2hex($data);
- if($intel==1) $data = intel2Moto($data);
- $top = hexdec(substr($data,8,8));
- $bottom = hexdec(substr($data,0,8));
- if($bottom!=0) $data=$top/$bottom;
- else if($top==0) $data = 0;
- else $data=$top."/".$bottom;
-
- if($tag=="0085" && $model==1) { //ManualFocusDistance
- $data=$data." m";
- }
- if($tag=="0086" && $model==1) { //DigitalZoom
- $data=$data."x";
- }
- if($tag=="000a" && $model==0) { //DigitalZoom
- $data=$data."x";
- }
- } else if($type=="USHORT" || $type=="SSHORT" || $type=="ULONG" || $type=="SLONG" || $type=="FLOAT" || $type=="DOUBLE") {
- $data = bin2hex($data);
- if($intel==1) $data = intel2Moto($data);
- $data=hexdec($data);
-
- if($tag=="0003" && $model==0) { //Quality
- if($data == 1) $data = (string) t("VGA Basic");
- else if($data == 2) $data = (string) t("VGA Normal");
- else if($data == 3) $data = (string) t("VGA Fine");
- else if($data == 4) $data = (string) t("SXGA Basic");
- else if($data == 5) $data = (string) t("SXGA Normal");
- else if($data == 6) $data = (string) t("SXGA Fine");
- else $data = (string) t("Unknown").": ".$data;
- }
- if($tag=="0004" && $model==0) { //Color
- if($data == 1) $data = (string) t("Color");
- else if($data == 2) $data = (string) t("Monochrome");
- else $data = (string) t("Unknown").": ".$data;
- }
- if($tag=="0005" && $model==0) { //Image Adjustment
- if($data == 0) $data = (string) t("Normal");
- else if($data == 1) $data = (string) t("Bright+");
- else if($data == 2) $data = (string) t("Bright-");
- else if($data == 3) $data = (string) t("Contrast+");
- else if($data == 4) $data = (string) t("Contrast-");
- else $data = (string) t("Unknown").": ".$data;
- }
- if($tag=="0006" && $model==0) { //CCD Sensitivity
- if($data == 0) $data = "ISO-80";
- else if($data == 2) $data = "ISO-160";
- else if($data == 4) $data = "ISO-320";
- else if($data == 5) $data = "ISO-100";
- else $data = (string) t("Unknown").": ".$data;
- }
- if($tag=="0007" && $model==0) { //White Balance
- if($data == 0) $data = (string) t("Auto");
- else if($data == 1) $data = (string) t("Preset");
- else if($data == 2) $data = (string) t("Daylight");
- else if($data == 3) $data = (string) t("Incandescense");
- else if($data == 4) $data = (string) t("Flourescence");
- else if($data == 5) $data = (string) t("Cloudy");
- else if($data == 6) $data = (string) t("SpeedLight");
- else $data = (string) t("Unknown").": ".$data;
- }
- if($tag=="000b" && $model==0) { //Converter
- if($data == 0) $data = (string) t("None");
- else if($data == 1) $data = (string) t("Fisheye");
- else $data = (string) t("Unknown").": ".$data;
- }
- } else if($type=="UNDEFINED") {
-
- if($tag=="0001" && $model==1) { //Unknown (Version?)
- $data=$data/100;
- }
- if($tag=="0088" && $model==1) { //AF Focus Position
- $temp = (string) t("Center");
+ switch ($type) {
+ case "ASCII":
+ break; // do nothing!
+ case "URATIONAL":
+ case"SRATIONAL":
+ switch ($tag) {
+ case '0084': // LensInfo
+ $minFL = unRational(substr($data,0,8),$type,$intel);
+ $maxFL = unRational(substr($data,8,8),$type,$intel);
+ $minSP = unRational(substr($data,16,8),$type,$intel);
+ $maxSP = unRational(substr($data,24,8),$type,$intel);
+ if ($minFL == $maxFL) {
+ $data = sprintf('%0.0f f/%0.0f',$minFL,$minSP);
+ } elseif ($minSP == $maxSP) {
+ $data = sprintf('%0.0f-%0.0fmm f/%0.1f',$minFL,$maxFL,$minSP);
+ } else {
+ $data = sprintf('%0.0f-%0.0fmm f/%0.1f-%0.1f',$minFL,$maxFL,$minSP,$maxSP);
+ }
+ break;
+ case "0085":
+ if ($model==1) $data=unRational($data,$type,$intel)." m"; //ManualFocusDistance
+ break;
+ case "0086":
+ if ($model==1) $data=unRational($data,$type,$intel)."x"; //DigitalZoom
+ break;
+ case "000a":
+ if ($model==0) $data=unRational($data,$type,$intel)."x"; //DigitalZoom
+ break;
+ default:
+ $data=unRational($data,$type,$intel);
+ break;
+ }
+ break;
+ case "USHORT":
+ case $type=="SSHORT":
+ case $type=="ULONG":
+ case $type=="SLONG":
+ case $type=="FLOAT":
+ case $type=="DOUBLE":
+ $data = rational($data,$type,$intel);
+ switch ($tag) {
+ case "0003":
+ if ($model==0) { //Quality
+ switch ($data) {
+ case 1: $data = (string) t("VGA Basic"); break;
+ case 2: $data = (string) t("VGA Normal"); break;
+ case 3: $data = (string) t("VGA Fine"); break;
+ case 4: $data = (string) t("SXGA Basic"); break;
+ case 5: $data = (string) t("SXGA Normal"); break;
+ case 6: $data = (string) t("SXGA Fine"); break;
+ default: $data = (string) t("Unknown").": ".$data; break;
+ }
+ }
+ break;
+ case "0004":
+ if ($model==0) { //Color
+ switch ($data) {
+ case 1: $data = (string) t("Color"); break;
+ case 2: $data = (string) t("Monochrome"); break;
+ default: $data = (string) t("Unknown").": ".$data; break;
+ }
+ }
+ break;
+ case "0005":
+ if ($model==0) { //Image Adjustment
+ switch ($data) {
+ case 0: $data = (string) t("Normal"); break;
+ case 1: $data = (string) t("Bright+"); break;
+ case 2: $data = (string) t("Bright-"); break;
+ case 3: $data = (string) t("Contrast+"); break;
+ case 4: $data = (string) t("Contrast-"); break;
+ default: $data = (string) t("Unknown").": ".$data; break;
+ }
+ }
+ break;
+ case "0006":
+ if ($model==0) { //CCD Sensitivity
+ switch($data) {
+ case 0: $data = "ISO-80"; break;
+ case 2: $data = "ISO-160"; break;
+ case 4: $data = "ISO-320"; break;
+ case 5: $data = "ISO-100"; break;
+ default: $data = (string) t("Unknown").": ".$data; break;
+ }
+ }
+ break;
+ case "0007":
+ if ($model==0) { //White Balance
+ switch ($data) {
+ case 0: $data = (string) t("Auto"); break;
+ case 1: $data = (string) t("Preset"); break;
+ case 2: $data = (string) t("Daylight"); break;
+ case 3: $data = (string) t("Incandescence"); break;
+ case 4: $data = (string) t("Fluorescence"); break;
+ case 5: $data = (string) t("Cloudy"); break;
+ case 6: $data = (string) t("SpeedLight"); break;
+ default: $data = (string) t("Unknown").": ".$data; break;
+ }
+ }
+ break;
+ case "000b":
+ if ($model==0) { //Converter
+ switch ($data) {
+ case 0: $data = (string) t("None"); break;
+ case 1: $data = (string) t("Fisheye"); break;
+ default: $data = (string) t("Unknown").": ".$data; break;
+ }
+ }
+ break;
+ }
+ break;
+ case "UNDEFINED":
+ switch ($tag) {
+ case "0001":
+ if ($model==1) $data=$data/100; break; //Unknown (Version?)
+ break;
+ case "0088":
+ if ($model==1) { //AF Focus Position
+ $temp = (string) t("Center");
+ $data = bin2hex($data);
+ $data = str_replace("01","Top",$data);
+ $data = str_replace("02","Bottom",$data);
+ $data = str_replace("03","Left",$data);
+ $data = str_replace("04","Right",$data);
+ $data = str_replace("00","",$data);
+ if(strlen($data)==0) $data = $temp;
+ }
+ break;
+ }
+ break;
+ default:
$data = bin2hex($data);
- $data = str_replace("01","Top",$data);
- $data = str_replace("02","Bottom",$data);
- $data = str_replace("03","Left",$data);
- $data = str_replace("04","Right",$data);
- $data = str_replace("00","",$data);
- if(strlen($data)==0) $data = $temp;
- }
-
- } else {
- $data = bin2hex($data);
- if($intel==1) $data = intel2Moto($data);
-
- if($tag=="0083" && $model==1) { //Lens Type
- $data = hexdec(substr($data,0,2));
- if($data == 0) $data = (string) t("AF non D");
- else if($data == 1) $data = (string) t("Manual");
- else if($data == 2) $data = "AF-D or AF-S";
- else if($data == 6) $data = "AF-D G";
- else if($data == 10) $data = "AF-D VR";
- else $data = (string) t("Unknown").": ".$data;
- }
- if($tag=="0087" && $model==1) { //Flash type
- $data = hexdec(substr($data,0,2));
- if($data == 0) $data = (string) t("Did Not Fire");
- else if($data == 4) $data = (string) t("Unknown");
- else if($data == 7) $data = (string) t("External");
- else if($data == 9) $data = (string) t("On Camera");
- else $data = (string) t("Unknown").": ".$data;
- }
+ if($intel==1) $data = intel2Moto($data);
+ switch ($tag) {
+ case "0083":
+ if ($model==1) { //Lens Type
+ $data = hexdec(substr($data,0,2));
+ switch ($data) {
+ case 0: $data = (string) t("AF non D"); break;
+ case 1: $data = (string) t("Manual"); break;
+ case 2: $data = "AF-D or AF-S"; break;
+ case 6: $data = "AF-D G"; break;
+ case 10: $data = "AF-D VR"; break;
+ case 14: $data = "AF-D G VR"; break;
+ default: $data = (string) t("Unknown").": ".$data; break;
+ }
+ }
+ break;
+ case "0087":
+ if ($model==1) { //Flash type
+ $data = hexdec(substr($data,0,2));
+ if($data == 0) $data = (string) t("Did Not Fire");
+ else if($data == 4) $data = (string) t("Unknown");
+ else if($data == 7) $data = (string) t("External");
+ else if($data == 9) $data = (string) t("On Camera");
+ else $data = (string) t("Unknown").": ".$data;
+ }
+ break;
+ }
+ break;
}
-
return $data;
}
diff --git a/modules/exif/lib/makers/olympus.php b/modules/exif/lib/makers/olympus.php
index 17334bd8..3382fc79 100644
--- a/modules/exif/lib/makers/olympus.php
+++ b/modules/exif/lib/makers/olympus.php
@@ -57,24 +57,17 @@ function formatOlympusData($type,$tag,$intel,$data) {
if($type=="ASCII") {
} else if($type=="URATIONAL" || $type=="SRATIONAL") {
- $data = bin2hex($data);
+ $data = unRational($data,$type,$intel);
if($intel==1) $data = intel2Moto($data);
- $top = hexdec(substr($data,8,8));
- $bottom = hexdec(substr($data,0,8));
- if($bottom!=0) $data=$top/$bottom;
- else if($top==0) $data = 0;
- else $data=$top."/".$bottom;
if($tag=="0204") { //DigitalZoom
$data=$data."x";
}
if($tag=="0205") { //Unknown2
- $data=$top."/".$bottom;
+
}
} else if($type=="USHORT" || $type=="SSHORT" || $type=="ULONG" || $type=="SLONG" || $type=="FLOAT" || $type=="DOUBLE") {
- $data = bin2hex($data);
- if($intel==1) $data = intel2Moto($data);
- $data=hexdec($data);
+ $data = rational($data,$type,$intel);
if($tag=="0201") { //JPEGQuality
if($data == 1) $data = "SQ";
diff --git a/modules/exif/lib/makers/panasonic.php b/modules/exif/lib/makers/panasonic.php
index d82d374d..47a05996 100644
--- a/modules/exif/lib/makers/panasonic.php
+++ b/modules/exif/lib/makers/panasonic.php
@@ -85,18 +85,10 @@ function formatPanasonicData($type,$tag,$intel,$data) {
}
} else if($type=="URATIONAL" || $type=="SRATIONAL") {
- $data = bin2hex($data);
- if($intel==1) $data = intel2Moto($data);
- $top = hexdec(substr($data,8,8));
- $bottom = hexdec(substr($data,0,8));
- if($bottom!=0) $data=$top/$bottom;
- else if($top==0) $data = 0;
- else $data=$top."/".$bottom;
+ $data = unRational($data,$type,$intel);
} else if($type=="USHORT" || $type=="SSHORT" || $type=="ULONG" || $type=="SLONG" || $type=="FLOAT" || $type=="DOUBLE") {
- $data = bin2hex($data);
- if($intel==1) $data = intel2Moto($data);
- $data=hexdec($data);
+ $data = rational($data,$type,$intel);
if($tag=="0001") { //Image Quality
if($data == 2) $data = (string) t("High");
diff --git a/modules/exif/lib/makers/sanyo.php b/modules/exif/lib/makers/sanyo.php
index 661741dd..3eef201e 100644
--- a/modules/exif/lib/makers/sanyo.php
+++ b/modules/exif/lib/makers/sanyo.php
@@ -54,19 +54,10 @@ function formatSanyoData($type,$tag,$intel,$data) {
} else if($type=="URATIONAL" || $type=="SRATIONAL") {
- $data = bin2hex($data);
- if($intel==1) $data = intel2Moto($data);
- $top = hexdec(substr($data,8,8));
- $bottom = hexdec(substr($data,0,8));
- if($bottom!=0) $data=$top/$bottom;
- else if($top==0) $data = 0;
- else $data=$top."/".$bottom;
-
+ $data = unRational($data,$type,$intel);
} else if($type=="USHORT" || $type=="SSHORT" || $type=="ULONG" || $type=="SLONG" || $type=="FLOAT" || $type=="DOUBLE") {
- $data = bin2hex($data);
- if($intel==1) $data = intel2Moto($data);
- $data=hexdec($data);
+ $data = rational($data,$type,$intel);
if($tag=="0200") { //SpecialMode
if($data == 0) $data = (string) t("Normal");
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 14:26:56 +0000