GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Multiple fixes and extensions for exif builder

Browse Source
This commit is contained in:
Georg Hagen
2025-02-13 23:25:42 +01:00
parent 3384bc1209
commit c8599c0631
2 changed files with 117 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
openVulkanoCpp/Image/ExifBuilder.cpp
View File

@@ -5,6 +5,8 @@
*/
#include "ExifBuilder.hpp"
#include "Extensions/FmtFormatter.hpp"
#include "Math/Math.hpp"
#include <array>
#include <algorithm>
#include <bit>
@@ -35,6 +37,8 @@ namespace
SOFTWARE_USED = 0x0131,
DATE_TAKEN = 0x0132,
EXPOSURE_TIME = 0x829a,
F_NUMBER = 0x829d,
FOCAL_LENGTH = 0x920a,
GPS_INFO_OFFSET = 0x8825,
};
@@ -292,7 +296,16 @@ namespace OpenVulkano::Image
{
}
void ExifBuilder::SetAltitude(float level)
void ExifBuilder::SetOrientation(float orientationRad)
{
orientationRad = Math::Utils::NormalizeAngleRad(orientationRad);
if (orientationRad > 0.78f && orientationRad < 2.35f) orientation = 8;
else if (orientationRad < 3.93f && orientationRad >= 2.35f) orientation = 3;
else if (orientationRad < 5.5f) orientation = 6;
else orientation = 1;
}
void GPSInfo::SetAltitude(const float level)
{
altitudeIsAboveSeaLevel = level >= 0;
altitude = std::abs(level);
@@ -316,16 +329,19 @@ namespace OpenVulkano::Image
AppendVector<EXIF_HEADER_SIZE>(result, EXIF_HEADER_AND_PADDING);
AppendVector<TIFF_HEADER_SIZE>(result, TIFF_HEADER);
int numberOfMainTags = 1; // 1 is for GPS Info tag
int numberOfMainTags = 0; // 1 is for GPS Info tag
numberOfMainTags += orientation != 0;
numberOfMainTags += make != "";
numberOfMainTags += model != "";
numberOfMainTags += xResolution.nominator || xResolution.denominator;
numberOfMainTags += yResolution.nominator || yResolution.denominator;
numberOfMainTags += (bool)xResolution;
numberOfMainTags += (bool)yResolution;
numberOfMainTags += resolutionUnit != 0;
numberOfMainTags += exposureTime.nominator || exposureTime.denominator;
numberOfMainTags += (bool)exposureTime;
numberOfMainTags += softwareUsed != "";
numberOfMainTags += dateTaken != "";
numberOfMainTags += gpsInfo.has_value();
numberOfMainTags += (bool)fNumber;
numberOfMainTags += (bool)focalLength;
AppendU32(result, 8); // Append offset to the ifd
AppendU16(result, numberOfMainTags);
@@ -343,25 +359,35 @@ namespace OpenVulkano::Image
offsets.push_back(AppendTagValueTypeAndString(result, IFDTag::MODEL, data, model));
}
if (orientation != 0)
if (orientation)
{
AppendTagValueTypeAndShort(result, IFDTag::ORIENTATION, orientation);
}
if (xResolution.nominator || xResolution.denominator)
if (xResolution)
{
offsets.push_back(AppendTagValueTypeAndRational(result, IFDTag::X_RESOLUTION, data, xResolution));
}
if (yResolution.nominator || yResolution.denominator)
if (yResolution)
{
offsets.push_back(AppendTagValueTypeAndRational(result, IFDTag::Y_RESOLUTION, data, yResolution));
}
if (exposureTime.nominator || exposureTime.denominator)
if (exposureTime)
{
offsets.push_back(AppendTagValueTypeAndRational(result, IFDTag::EXPOSURE_TIME, data, exposureTime));
}
if (fNumber)
{
offsets.push_back(AppendTagValueTypeAndRational(result, IFDTag::F_NUMBER, data, fNumber));
}
if (focalLength)
{
offsets.push_back(AppendTagValueTypeAndRational(result, IFDTag::FOCAL_LENGTH, data, focalLength));
}
if (resolutionUnit != 0)
{
@@ -377,11 +403,14 @@ namespace OpenVulkano::Image
// Even though other software does provide this information without a problem
offsets.push_back(AppendTagValueTypeAndString(result, IFDTag::DATE_TAKEN, data, dateTaken));
// GPS Info offset
AppendTagAndValueType(result, (uint16_t) IFDTag::GPS_INFO_OFFSET, (uint16_t) IFDValueType::LONG_);
AppendU32(result, 1); // num components
gpsInfoOffset = AppendU32(result, 0);
if (gpsInfo)
{
// GPS Info offset
AppendTagAndValueType(result, (uint16_t) IFDTag::GPS_INFO_OFFSET, (uint16_t) IFDValueType::LONG_);
AppendU32(result, 1); // num components
gpsInfoOffset = AppendU32(result, 0);
}
// next ifd offset
AppendU32(result, 0);
@@ -397,76 +426,70 @@ namespace OpenVulkano::Image
}
}
// Resolve GPS info offset
if (gpsInfo)
{
int ifdAndSubdataSize = result.size();
uint32_t *ptr = (uint32_t *) (result.data() + gpsInfoOffset);
*ptr = EndianSwap((uint32_t)(ifdAndSubdataSize - EXIF_HEADER_SIZE));
}
// Resolve GPS info offset
{
int ifdAndSubdataSize = result.size();
uint32_t *ptr = (uint32_t *) (result.data() + gpsInfoOffset);
*ptr = EndianSwap((uint32_t)(ifdAndSubdataSize - EXIF_HEADER_SIZE));
}
// Writing GPS Info structure
int numberOfGPSInfoTags = 8;
AppendU16(result, numberOfGPSInfoTags);
offsets.resize(0);
// Writing GPS Info structure
constexpr int numberOfGPSInfoTags = 8;
AppendU16(result, numberOfGPSInfoTags);
offsets.resize(0);
// Latitude Ref
char latitudeRef = CoordRefToChar(latitude.ref);
AppendTagValueTypeAndByte(result, IFDGPSTag::LATITUDE_REF, IFDValueType::ASCII, latitudeRef);
// Latitude Ref
char latitudeRef = CoordRefToChar(gpsInfo->latitude.ref);
AppendTagValueTypeAndByte(result, IFDGPSTag::LATITUDE_REF, IFDValueType::ASCII, latitudeRef);
// Latitude
offsets.push_back(AppendTagValueTypeAndGPSRational(result, IFDGPSTag::LATITUDE, 3, 0)); // 0 * sizeof(RationalValue)
// Latitude
offsets.push_back(AppendTagValueTypeAndGPSRational(result, IFDGPSTag::LATITUDE, 3, 0)); // 0 * sizeof(RationalValue)
// Longitude Ref
char longitudeRef = CoordRefToChar(longitude.ref);
AppendTagValueTypeAndByte(result, IFDGPSTag::LONGITUDE_REF, IFDValueType::ASCII, longitudeRef);
// Longitude Ref
char longitudeRef = CoordRefToChar(gpsInfo->longitude.ref);
AppendTagValueTypeAndByte(result, IFDGPSTag::LONGITUDE_REF, IFDValueType::ASCII, longitudeRef);
// Longitude
offsets.push_back(AppendTagValueTypeAndGPSRational(result, IFDGPSTag::LONGITUDE, 3, 24)); // 3 * sizeof(RationalValue)
// Longitude
offsets.push_back(AppendTagValueTypeAndGPSRational(result, IFDGPSTag::LONGITUDE, 3, 24)); // 3 * sizeof(RationalValue)
// Altitude Ref
AppendTagValueTypeAndByte(result, IFDGPSTag::ALTITUDE_REF, IFDValueType::BYTE, altitudeIsAboveSeaLevel ? 0 : 1);
// Altitude Ref
AppendTagValueTypeAndByte(result, IFDGPSTag::ALTITUDE_REF, IFDValueType::BYTE, gpsInfo->altitudeIsAboveSeaLevel ? 0 : 1);
// Altitude
offsets.push_back(AppendTagValueTypeAndGPSRational(result, IFDGPSTag::ALTITUDE, 1, 48)); // 6 * sizeof(RationalValue)
// Altitude
offsets.push_back(AppendTagValueTypeAndGPSRational(result, IFDGPSTag::ALTITUDE, 1, 48)); // 6 * sizeof(RationalValue)
// Track Ref
AppendTagValueTypeAndByte(result, IFDGPSTag::TRACK_REF, IFDValueType::ASCII, (trackRef == GPSTrackRef::TRUE_NORTH) ? 'T' : 'M');
// Track Ref
AppendTagValueTypeAndByte(result, IFDGPSTag::TRACK_REF, IFDValueType::ASCII, (gpsInfo->trackRef == GPSTrackRef::TRUE_NORTH) ? 'T' : 'M');
// Track
offsets.push_back(AppendTagValueTypeAndGPSRational(result, IFDGPSTag::TRACK, 1, 56)); // 7 * sizeof(RationalValue)
// Track
offsets.push_back(AppendTagValueTypeAndGPSRational(result, IFDGPSTag::TRACK, 1, 56)); // 7 * sizeof(RationalValue)
//
{
int sizeOfResultSoFar = result.size();
const int valueToAdd = sizeOfResultSoFar - EXIF_HEADER_SIZE;
for(const auto &offset : offsets)
{
AddValueToU32AndEndianSwap(result.data() + offset, valueToAdd);
}
AppendGPSCoords(result, gpsInfo->latitude);
AppendGPSCoords(result, gpsInfo->longitude);
AppendU32(result, gpsInfo->altitude);
AppendU32(result, 1); // denominator for altitude
constexpr int TRACK_PRECISION = 10000;
AppendU32(result, gpsInfo->track * TRACK_PRECISION);
AppendU32(result, TRACK_PRECISION);
}
//
AppendGPSCoords(result, latitude);
AppendGPSCoords(result, longitude);
AppendU32(result, altitude);
AppendU32(result, 1); // denominator for altitude
constexpr int TRACK_PRECISION = 10000;
AppendU32(result, track * TRACK_PRECISION);
AppendU32(result, TRACK_PRECISION);
return result;
}
std::string ExifBuilder::StringFromTime(std::time_t time)
{
std::tm* timeInfo = std::localtime(&time);
std::ostringstream oss;
oss << std::put_time(timeInfo, "%Y:%m:%d %H:%M:%S");
return oss.str();
return fmt::format("{:%Y:%m:%d %H:%M:%S}", fmt::localtime(time));
}
std::string ExifBuilder::GetCurrentTimestamp()
@@ -475,4 +498,4 @@ namespace OpenVulkano::Image
std::time_t currentTime = std::chrono::system_clock::to_time_t(now);
return StringFromTime(currentTime);
}
}
}