VideoSubFinder_6.10.0

eritpchy · Oct 12, 2023 · 7d0d43c · 7d0d43c
2 parents 837da37 + c3d19ab
commit 7d0d43c
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 72 deletions.
diff --git a/.github/workflows/build-darwin-x64.yml b/.github/workflows/build-darwin-x64.yml
@@ -187,6 +187,8 @@ jobs:
           cp -fv /usr/local/lib/libpcre2-8.0.dylib lib/ || true; \
           cp -fv ../Interfaces/VideoSubFinderCli/VideoSubFinderCli . && \
           cp -rfv ../Darwin_x64/* . && \
+          mkdir ./settings && \
+          cp -rf ../../Settings/general.cfg ./settings/ && \
           true
       -
         name: Archive artifacts

diff --git a/Build/Darwin_x64/settings/general.cfg b/Build/Darwin_x64/settings/general.cfg
diff --git a/Build/Docker/cpu/build.Dockerfile b/Build/Docker/cpu/build.Dockerfile
@@ -2,6 +2,7 @@ FROM eritpchy/videosubfinder-build:base
 COPY . /tmp/work/videosubfinder-src
 RUN cd /tmp/work/videosubfinder-src \
     && cp -rf ./Build/Linux_x64/* /tmp/work/ \
+    && mkdir /tmp/work/settings && cp -rf ./Settings/general.cfg /tmp/work/settings/ \
     && rm -rf linux_build \
     && mkdir -p linux_build \
     && cd linux_build/ \

diff --git a/Build/Docker/cpu_static/build.Dockerfile b/Build/Docker/cpu_static/build.Dockerfile
@@ -2,6 +2,7 @@ FROM eritpchy/videosubfinder-build:base-cpu-static as builder
 COPY . /tmp/work/videosubfinder-src
 RUN cd /tmp/work/videosubfinder-src \
     && cp -rf ./Build/Linux_x64/* /tmp/work/ \
+    && mkdir /tmp/work/settings && cp -rf ./Settings/general.cfg /tmp/work/settings/ \
     && rm -rf linux_build \
     && mkdir -p linux_build \
     && cd linux_build/ \

diff --git a/Build/Linux_x64/settings/general.cfg b/Build/Linux_x64/settings/general.cfg
diff --git a/Components/IPAlgorithms/SSAlgorithms.cpp b/Components/IPAlgorithms/SSAlgorithms.cpp
@@ -1221,7 +1221,7 @@ s64 FastSearchSubtitles(CVideo *pV, s64 Begin, s64 End)
 	simple_buffer<u8> ImFSP(size * 3, (u8)0); //image for save prev
 	simple_buffer<u8> ImNES(size, (u8)0), ImNESP(size, (u8)0);
 	simple_buffer<u16> ImYInt(size, (u16)0), ImYS(size, (u16)0), ImYSP(size, (u16)0), * pImYInt, * pImY;
-    simple_buffer<u8>* pImBGR;
+	simple_buffer<u8>* pImBGR;
 	simple_buffer<u8> *pIm, *pImInt, *pImNE;
 	simple_buffer<u8> prevImBGR(size * 3, (u8)0);
 	simple_buffer<u8> prevImNE(size, (u8)0), prevIm(size, (u8)0);

diff --git a/Components/OCVVideo/OCVVideo.h b/Components/OCVVideo/OCVVideo.h
@@ -58,7 +58,7 @@ class OCVVideo: public CVideo
 	int		m_type; //video open type
 	bool	m_show_video;
 #ifdef USE_GUI
-	wxBitmap	*m_pBmp;	
+	wxBitmap	*m_pBmp;
 	wxBitmap	*m_pBmpScaled;
 #endif
 	double m_frameNumbers;

diff --git a/Interfaces/VideoSubFinderWXW/VideoSubFinderWXW.cpp b/Interfaces/VideoSubFinderWXW/VideoSubFinderWXW.cpp
@@ -23,6 +23,7 @@
 #ifdef USE_GUI
 #include <X11/Xlib.h>
 #endif
+
 #endif
 #include "DataTypes.h"