diff --git a/CMakeLists.txt b/CMakeLists.txt index 1696765..6b3c591 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ endif() set(SICKJUMPS_MAJOR 0) set(SICKJUMPS_MINOR 1) -set(SICKJUMPS_PATCH 0) +set(SICKJUMPS_PATCH 1) set(SICKJUMPS_VERSION ${SICKJUMPS_MAJOR}.${SICKJUMPS_MINOR}.${SICKJUMPS_PATCH}) set(SICKJUMPS_AUTHOR "Robert Martens") set(SICKJUMPS_AUTHOR_EMAIL "") diff --git a/README.md b/README.md index 8bff88e..fd54855 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ - SickJumps 0.1.0 + SickJumps 0.1.1 =============== A speed ramping plugin for [Avisynth](http://www.avisynth.nl). @@ -14,7 +14,7 @@ ### Usage ### SickJumps(clip c, int "first_frame", int "last_frame", - float "start_multiplier", float full_multiplier", + float "start_multiplier", float "full_multiplier", float "up_seconds", float "down_seconds", string "script_variable", float "end_multiplier") diff --git a/src/SickJumps.rc.in b/src/SickJumps.rc.in index af1ff77..cb65285 100644 --- a/src/SickJumps.rc.in +++ b/src/SickJumps.rc.in @@ -15,12 +15,12 @@ { VALUE "CompanyName", "${SICKJUMPS_AUTHOR} ${SICKJUMPS_AUTHOR_EMAIL}" VALUE "FileDescription", "${SICKJUMPS_DESCRIPTION}" - VALUE "FileVersion", "${SICKJUMPS_VERSION}.0" + VALUE "FileVersion", "${SICKJUMPS_VERSION}" VALUE "InternalName", "${PROJECT_NAME}" VALUE "LegalCopyright", "2017 ${SICKJUMPS_AUTHOR}" VALUE "OriginalFilename", "${PROJECT_NAME}.dll" VALUE "ProductName", "${PROJECT_NAME}" - VALUE "ProductVersion", "${SICKJUMPS_VERSION}.0" + VALUE "ProductVersion", "${SICKJUMPS_VERSION}" } } BLOCK "VarFileInfo" diff --git a/src/SickJumpsCore.cpp b/src/SickJumpsCore.cpp index b13c36a..4cea200 100644 --- a/src/SickJumpsCore.cpp +++ b/src/SickJumpsCore.cpp @@ -64,7 +64,6 @@ SickJumpsCore::SickJumpsCore(int _frameCount, int _firstFrame, int _lastFrame, d // down ramp remains the same. To fit the new input frame count into the same // output frame count, the down ramp needs its own multiplier tweaked as well. int downDistanceOutput = rampDownOutputFrames - 1; - int calculatedDownDistanceInput = static_cast(std::round(downDistanceOutput * downAverageVideoMultiplier)); double originalDownAverageMultiplier = downAverageVideoMultiplier; int expectedDownDistanceInputFrames = rampDownLastInputFrame - rampDownFirstInputFrame; downAverageVideoMultiplier = static_cast(expectedDownDistanceInputFrames) / static_cast(downDistanceOutput); diff --git a/test/src/frames.cpp b/test/src/frames.cpp index cbb72cd..8e1d6db 100644 --- a/test/src/frames.cpp +++ b/test/src/frames.cpp @@ -108,7 +108,6 @@ TEST_CASE("Ramps start and end on proper input frames with a full multiplier of CHECK(c.fullSpeedFirstOutputFrame == 10120); CHECK(c.fullSpeedLastOutputFrame == 29969); CHECK(c.rampDownFirstOutputFrame == 29970); - //CHECK(c.rampDownLastOutputFrame == ); CHECK(c.rampUpFirstInputFrame == 10000); CHECK(c.rampUpLastInputFrame == 10298);