Commit 9c7faedc authored by stoutjesdijk's avatar stoutjesdijk 🎧
Browse files

merge fixes

parent a3493912

apps/renderer.c

+0 −13
Original line number Diff line number Diff line
@@ -160,9 +160,6 @@ typedef struct 
#ifdef SPLIT_REND_WITH_HEAD_ROT

    char splitRendBFIFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

    char splitRendBFIFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

#endif

#ifdef FIX_319_ADD_OTR_EXPORT

    char mainOrientationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char trkRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
@@ -2690,16 +2687,6 @@ static void parseOption( 
            assert( numOptionValues == 1 );

            strncpy( args->trkRotationFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

            break;

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

        case CmdLnOptionId_outputMetadata:

            assert( numOptionValues == 1 );

            strncpy( args->outMetadataFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

            break;

        case CmdLnOptionId_SplitRendBFIFile:

            assert( numOptionValues == 1 );

            strncpy( args->splitRendBFIFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

            break;

#endif

        case CmdLnOptionId_referenceVectorFile:

            assert( numOptionValues == 1 );