Update Canon SDK to v13.17.10
This commit is contained in:
parent
e8dfc81d79
commit
ed2ad035c6
10
.github/workflows/macOS_build.yml
vendored
10
.github/workflows/macOS_build.yml
vendored
|
@ -26,11 +26,11 @@ jobs:
|
||||||
- name: Get CanonSDK
|
- name: Get CanonSDK
|
||||||
if: ${{ github.repository_owner == 'tahoma2d' && github.event_name == 'push' }}
|
if: ${{ github.repository_owner == 'tahoma2d' && github.event_name == 'push' }}
|
||||||
run: |
|
run: |
|
||||||
wget --header="Authorization: token ${{ secrets.TAHOMA2D_TOKEN }}" --header="Accept:application/octet-stream" -O EDSDK_v131231_Macintosh.zip https://api.github.com/repos/tahoma2d/CanonSDK/releases/assets/25267390
|
wget --header="Authorization: token ${{ secrets.TAHOMA2D_TOKEN }}" --header="Accept:application/octet-stream" -O EDSDK_Macintosh.zip https://api.github.com/repos/tahoma2d/CanonSDK/releases/assets/132789028
|
||||||
unzip EDSDK_v131231_Macintosh.zip -d EDSDK_v131231_Macintosh
|
unzip EDSDK_Macintosh.zip -d EDSDK_Macintosh
|
||||||
unzip EDSDK_v131231_Macintosh/Macintosh.dmg.zip -d EDSDK_v131231_Macintosh
|
unzip EDSDK_Macintosh/Macintosh.dmg.zip -d EDSDK_Macintosh
|
||||||
7z x EDSDK_v131231_Macintosh/Macintosh.dmg -oEDSDK_v131231_Macintosh
|
7z x EDSDK_Macintosh/Macintosh.dmg -oEDSDK_Macintosh
|
||||||
mv EDSDK_v131231_Macintosh/Macintosh/EDSDK/* thirdparty/canon
|
mv EDSDK_Macintosh/Macintosh/EDSDK/* thirdparty/canon
|
||||||
cd thirdparty/canon/framework/EDSDK.framework/Versions
|
cd thirdparty/canon/framework/EDSDK.framework/Versions
|
||||||
rm Current
|
rm Current
|
||||||
ln -s A Current
|
ln -s A Current
|
||||||
|
|
10
.github/workflows/windows_build.yml
vendored
10
.github/workflows/windows_build.yml
vendored
|
@ -24,11 +24,11 @@ jobs:
|
||||||
- name: Get CanonSDK
|
- name: Get CanonSDK
|
||||||
if: ${{ github.repository_owner == 'tahoma2d' && github.event_name == 'push' }}
|
if: ${{ github.repository_owner == 'tahoma2d' && github.event_name == 'push' }}
|
||||||
run: |
|
run: |
|
||||||
curl -H "Authorization: token ${{ secrets.TAHOMA2D_TOKEN }}" -H "Accept:application/octet-stream" -fsSL -o EDSDK_v131231_Windows.zip https://api.github.com/repos/tahoma2d/CanonSDK/releases/assets/25267396
|
curl -H "Authorization: token ${{ secrets.TAHOMA2D_TOKEN }}" -H "Accept:application/octet-stream" -fsSL -o EDSDK_Windows.zip https://api.github.com/repos/tahoma2d/CanonSDK/releases/assets/132789036
|
||||||
7z x EDSDK_v131231_Windows.zip -oEDSDK_v131231_Windows
|
7z x EDSDK_Windows.zip -oEDSDK_Windows
|
||||||
move EDSDK_v131231_Windows\EDSDK\Header thirdparty\canon
|
move EDSDK_Windows\EDSDK\Header thirdparty\canon
|
||||||
move EDSDK_v131231_Windows\EDSDK_64\Dll thirdparty\canon
|
move EDSDK_Windows\EDSDK_64\Dll thirdparty\canon
|
||||||
move EDSDK_v131231_Windows\EDSDK_64\Library thirdparty\canon
|
move EDSDK_Windows\EDSDK_64\Library thirdparty\canon
|
||||||
- name: Get 3rd Party Apps
|
- name: Get 3rd Party Apps
|
||||||
run: |
|
run: |
|
||||||
ci-scripts\windows\tahoma-get3rdpartyapps.bat
|
ci-scripts\windows\tahoma-get3rdpartyapps.bat
|
||||||
|
|
|
@ -153,7 +153,7 @@ function checkLibFile() {
|
||||||
echo "Fixing $DEPFILE in $LIBFILE"
|
echo "Fixing $DEPFILE in $LIBFILE"
|
||||||
if [ "$X" != "" ]
|
if [ "$X" != "" ]
|
||||||
then
|
then
|
||||||
local Y=`echo $DEPFILE | sed -e"s/^.*\/\.\.\///"`
|
local Y=`echo $DEPFILE | sed -e"s/^.*\/\.\.\///" -e"s/@rpath.//"`
|
||||||
install_name_tool -change $DEPFILE @executable_path/../Frameworks/$Y $LIBFILE
|
install_name_tool -change $DEPFILE @executable_path/../Frameworks/$Y $LIBFILE
|
||||||
else
|
else
|
||||||
install_name_tool -change $DEPFILE @executable_path/../Frameworks/$Y $LIBFILE
|
install_name_tool -change $DEPFILE @executable_path/../Frameworks/$Y $LIBFILE
|
||||||
|
|
|
@ -2022,8 +2022,9 @@ StopMotionController::StopMotionController(QWidget *parent) : QWidget(parent) {
|
||||||
ret = ret && connect(m_stopMotion->m_gphotocam,
|
ret = ret && connect(m_stopMotion->m_gphotocam,
|
||||||
SIGNAL(liveViewOffsetChangedSignal(int)), this,
|
SIGNAL(liveViewOffsetChangedSignal(int)), this,
|
||||||
SLOT(onLiveViewCompensationChangedSignal(int)));
|
SLOT(onLiveViewCompensationChangedSignal(int)));
|
||||||
ret = ret && connect(m_stopMotion->m_canon, SIGNAL(focusCheckToggled(bool)),
|
ret =
|
||||||
this, SLOT(onFocusCheckToggled(bool)));
|
ret && connect(m_stopMotion->m_gphotocam, SIGNAL(focusCheckToggled(bool)),
|
||||||
|
this, SLOT(onFocusCheckToggled(bool)));
|
||||||
ret = ret &&
|
ret = ret &&
|
||||||
connect(m_stopMotion->m_gphotocam, SIGNAL(pickFocusCheckToggled(bool)),
|
connect(m_stopMotion->m_gphotocam, SIGNAL(pickFocusCheckToggled(bool)),
|
||||||
this, SLOT(onPickFocusCheckToggled(bool)));
|
this, SLOT(onPickFocusCheckToggled(bool)));
|
||||||
|
|
Loading…
Reference in a new issue