Skip to content

Improved support writing attributes #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mikaelsundell wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Improved support writing attributes #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11448c7
Update to cmake_minimum_required
mikaelsundell Jun 29, 2023
c947160
Fixes for better attribute writes now ignores empty values
mikaelsundell Jun 30, 2023
eabe46c
Removed optional, dynamic and custom attribute booleans, no longer ne…
mikaelsundell Jul 16, 2023
e76e9db
Removed export PACKAGE to prevent install conflicts
mikaelsundell Jul 17, 2023
2fe5d70
Changed DEF_INSTALL_CMAKE_DIR from CMake to case sensitive cmake
mikaelsundell Jul 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[bB]uild/
.DS_Store

# CMake files
CMakeFiles/
Expand Down
13 changes: 3 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
# IMPLEMENTATION, OR APPLICATIONS THEREOF, HELD BY PARTIES OTHER THAN
# A.M.P.A.S., WHETHER DISCLOSED OR UNDISCLOSED.

cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.1)
project (AcesContainer)

include (GenerateExportHeader)
Expand All @@ -66,7 +66,7 @@ if( WIN32 AND NOT CYGWIN )
set(DEF_INSTALL_CMAKE_DIR CMake)
set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W0" )
else()
set(DEF_INSTALL_CMAKE_DIR lib/CMake/AcesContainer)
set(DEF_INSTALL_CMAKE_DIR lib/cmake/AcesContainer)
endif()
set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" )

Expand Down Expand Up @@ -135,14 +135,7 @@ include_directories(
# Add all targets to the build-tree export set
export(TARGETS AcesContainer
FILE "${PROJECT_BINARY_DIR}/AcesContainerTargets.cmake")
# export(TARGETS AcesContainer_lib
# FILE "${PROJECT_BINARY_DIR}/AcesContainerTargets.cmake")

# Export the package for use from the build-tree
# (this registers the build-tree with a global CMake-registry)
export(PACKAGE AcesContainer)
# export(PACKAGE AcesContainer_lib)

# Create the FooBarConfig.cmake and FooBarConfigVersion files
file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}"
"${INSTALL_INCLUDE_DIR}")
Expand All @@ -154,7 +147,7 @@ configure_file(config/AcesContainerConfig.cmake.in
"${PROJECT_BINARY_DIR}/AcesContainerConfig.cmake" @ONLY)

# ... for the install tree
set(CONF_INCLUDE_DIRS "\${AcesContainer_CMAKE_DIR}/${REL_INCLUDE_DIR}" "\${AcesContainer_CMAKE_DIR}/${REL_INCLUDE_DIR}/aces")
set(CONF_INCLUDE_DIRS "${INSTALL_INCLUDE_DIR}")
set(CONF_LIB_DIRS "${INSTALL_LIB_DIR}")
configure_file(config/AcesContainerConfig.cmake.in
"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/AcesContainerConfig.cmake" @ONLY)
Expand Down
2 changes: 0 additions & 2 deletions aces_attributestructs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ acesImageContainerFlag ( 1 ),
pixelAspectRatio ( 1.0f ),
screenWindowWidth ( 1.0f ),


// initialize optional attributes to "ignored" values
altitude ( 0.0f ),
aperture ( 0.0f ),
Expand All @@ -248,7 +247,6 @@ orientation ( 0 ),
originalImageFlag ( -1 ),
timecodeRate ( 0 ),
utcOffset ( 0.0f )

{
// initialize required attributes to required values
Chromaticities = ChromaticitiesForACES;
Expand Down
1 change: 0 additions & 1 deletion aces_attributestructs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@ struct acesHeaderInfo {
timecode timeCode; // TIFF tag 51043
string uuid; // TIFF tag 42016 ImageUniqueID


// sample custom (TIFF/EP) attributes not defined in the ACES spec
string artist; // TIFF tag 315 artist
string copyright; // TIFF tag 33432 copyright
Expand Down
103 changes: 92 additions & 11 deletions aces_writeattributes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,31 @@

#include <cassert>

#define check_wrtAttr(condition, attribute, value) \
if (condition) wrtAttr(attribute, value)

#define check_multiview(value) ((value).size() > 0)

#define check_keycode(value) ((value).filmMfcCode > 0 || \
(value).filmType > 0 || \
(value).prefix > 0 || \
(value).count > 0 || \
(value).perfOffset > 0 || \
(value).perfsPerFrame > 0 || \
(value).perfsPerCount > 0)

#define check_timecode(value) ((value).timeAndFlags > 0 || \
(value).userData > 0)

#define check_v3f(value) ((value).x != 0.0 || \
(value).y != 0.0 || \
(value).z != 0.0)

#define check_float(value) (value != 0.0f)
#define check_int32(value) (value != 0)
#define check_string(value) ((value).size())
#define check_srational(value) (value.d != 0.0)

using namespace std;

// =====================================================================
Expand Down Expand Up @@ -616,17 +641,73 @@ void aces_writeattributes:: writeHeader ( acesHeaderInfo & hi,
writeMagicNumberAndVersion ();

// required aces attributes
wrtAttr ( "acesImageContainerFlag", hi.acesImageContainerFlag );
wrtAttr ( "channels", hi.channels );
wrtAttr ( "chromaticities", hi.Chromaticities );
wrtAttr ( "compression", hi.Compression );
wrtAttr ( "dataWindow", hi.dataWindow );
wrtAttr ( "displayWindow", hi.displayWindow );
wrtAttr ( "lineOrder", hi.LineOrder );
wrtAttr ( "pixelAspectRatio", hi.pixelAspectRatio );
wrtAttr ( "screenWindowCenter", hi.screenWindowCenter );
wrtAttr ( "screenWindowWidth", hi.screenWindowWidth );

wrtAttr ( "acesImageContainerFlag", hi.acesImageContainerFlag );
wrtAttr ( "channels", hi.channels );
wrtAttr ( "chromaticities", hi.Chromaticities );
wrtAttr ( "compression", hi.Compression );
wrtAttr ( "dataWindow", hi.dataWindow );
wrtAttr ( "displayWindow", hi.displayWindow );
wrtAttr ( "lineOrder", hi.LineOrder );
wrtAttr ( "pixelAspectRatio", hi.pixelAspectRatio );
wrtAttr ( "screenWindowCenter", hi.screenWindowCenter );
wrtAttr ( "screenWindowWidth", hi.screenWindowWidth );

// aces conditional attributes
check_wrtAttr(check_float(hi.altitude), "altitude", hi.altitude);
check_wrtAttr(check_float(hi.aperture), "aperture", hi.aperture);
check_wrtAttr(check_string(hi.cameraFirmwareVersion), "cameraFirmwareVersion", hi.cameraFirmwareVersion);
check_wrtAttr(check_string(hi.cameraIdentifier), "cameraIdentifier", hi.cameraIdentifier);
check_wrtAttr(check_string(hi.cameraLabel), "cameraLabel", hi.cameraLabel);
check_wrtAttr(check_string(hi.cameraMake), "cameraMake", hi.cameraMake);
check_wrtAttr(check_string(hi.cameraModel), "cameraModel", hi.cameraModel);
check_wrtAttr(check_v3f(hi.cameraUpDirection), "cameraUpDirection", hi.cameraUpDirection);
check_wrtAttr(check_v3f(hi.cameraViewingDirection), "cameraUpDirection", hi.cameraUpDirection);
check_wrtAttr(check_v3f(hi.cameraPosition), "cameraUpDirection", hi.cameraUpDirection);
check_wrtAttr(check_string(hi.cameraSerialNumber), "cameraUpDirection", hi.cameraUpDirection);
check_wrtAttr(check_srational(hi.captureRate), "captureRate", hi.captureRate);
check_wrtAttr(check_float(hi.convergenceDistance), "convergenceDistance", hi.convergenceDistance);
check_wrtAttr(check_float(hi.expTime), "expTime", hi.expTime);
check_wrtAttr(check_float(hi.focalLength), "focalLength", hi.focalLength);
check_wrtAttr(check_float(hi.focus), "focus", hi.focus);
check_wrtAttr(check_srational(hi.framesPerSecond), "framesPerSecond", hi.framesPerSecond);
check_wrtAttr(check_string(hi.free), "free", hi.free);
check_wrtAttr(check_string(hi.headerChecksum), "headerChecksum", hi.headerChecksum);
check_wrtAttr(check_string(hi.imageChecksum), "imageChecksum", hi.imageChecksum);
check_wrtAttr(check_float(hi.imageRotation), "imageRotation", hi.imageRotation);
check_wrtAttr(check_float(hi.interocularDistance), "interocularDistance", hi.interocularDistance);
check_wrtAttr(check_float(hi.isoSpeed), "isoSpeed", hi.isoSpeed);
check_wrtAttr(check_float(hi.latitude), "latitude", hi.latitude);
check_wrtAttr(check_string(hi.lensAttributes), "lensAttributes", hi.lensAttributes);
check_wrtAttr(check_string(hi.lensMake), "lensMake", hi.lensMake);
check_wrtAttr(check_string(hi.lensModel), "lensModel", hi.lensModel);
check_wrtAttr(check_string(hi.lensSerialNumber), "lensSerialNumber", hi.lensSerialNumber);
check_wrtAttr(check_float(hi.longitude), "longitude", hi.longitude);
check_wrtAttr(check_multiview(hi.multiView), "multiView", hi.multiView);
check_wrtAttr(check_int32(hi.originalImageFlag), "originalImageFlag", hi.originalImageFlag);
check_wrtAttr(check_string(hi.owner), "owner", hi.owner);
check_wrtAttr(check_string(hi.recorderFirmwareVersion), "recorderFirmwareVersion", hi.recorderFirmwareVersion);
check_wrtAttr(check_string(hi.recorderMake), "recorderMake", hi.recorderMake);
check_wrtAttr(check_string(hi.recorderModel), "recorderModel", hi.recorderModel);
check_wrtAttr(check_string(hi.recorderSerialNumber), "recorderSerialNumber", hi.recorderSerialNumber);
check_wrtAttr(check_string(hi.reelName), "reelName", hi.reelName);
check_wrtAttr(check_string(hi.storageMediaSerialNumber),"storageMediaSerialNumber", hi.storageMediaSerialNumber);
check_wrtAttr(check_int32(hi.timecodeRate), "timecodeRate", hi.timecodeRate);
check_wrtAttr(check_float(hi.utcOffset), "utcOffset", hi.utcOffset);

// aces conditional dynamic attributes
check_wrtAttr(check_string(hi.capDate), "capDate", hi.capDate);
check_wrtAttr(check_int32(hi.imageCounter), "imageCounter", hi.imageCounter);
check_wrtAttr(check_keycode(hi.keyCode), "keyCode", hi.keyCode);
check_wrtAttr(check_timecode(hi.timeCode), "timeCode", hi.timeCode);
check_wrtAttr(check_string(hi.uuid), "lensAttributes", hi.lensAttributes);

// aces conditional custom (TIFF/EP) attributes
check_wrtAttr(check_string(hi.artist), "artist", hi.artist);
check_wrtAttr(check_string(hi.copyright), "copyright", hi.copyright);
check_wrtAttr(check_string(hi.dateTime), "dateTime", hi.dateTime);
check_wrtAttr(check_int32(hi.orientation), "orientation", hi.orientation);
check_wrtAttr(check_string(hi.software), "software", hi.software);

// terminator
writeChar ( 0 );

Expand Down