# ver. 0.9.3.6

# xy-VSSppf 0.1.2.2 * bugfix: crashed at transparent subtitle frames
subelf · May 6, 2016 · d7226e9 · d7226e9
1 parent 8e0ac90
commit d7226e9
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 10 deletions.
diff --git a/Spp2Pgs/res/Spp2Pgs.rc b/Spp2Pgs/res/Spp2Pgs.rc
diff --git a/Spp2PgsNet/res/app.rc b/Spp2PgsNet/res/app.rc
diff --git a/libspp2pgs/inc/BgraFrame.h b/libspp2pgs/inc/BgraFrame.h
@@ -36,7 +36,7 @@ namespace spp2pgs
 
 		int ReadNextOf(FrameStream * stream);
 
-		inline int GetFrameIndex() { return this->index; }
+		inline int GetFrameIndex() const { return this->index; }
 
 		bool IsIdenticalTo(BgraFrame *frame);
 		bool IsBlank();

diff --git a/libspp2pgs/inc/StillImage.h b/libspp2pgs/inc/StillImage.h
@@ -66,7 +66,7 @@ namespace spp2pgs
 		void Erase(Rect const& rect) { this->ExplicitErase(rect); };
 
 		void RegisterRrawnRects(Rect const& rect) { 
-			AnnounceDirty();
+			AnnounceModified();
 			this->drawnRects.push_back(rect);
 		}
 

diff --git a/libspp2pgs/res/libspp2pgs.rc b/libspp2pgs/res/libspp2pgs.rc
diff --git a/libspp2pgs/src/BgraSubPicStream.cpp b/libspp2pgs/src/BgraSubPicStream.cpp
@@ -81,7 +81,7 @@ namespace spp2pgs
 			if (SUCCEEDED(hr))
 			{
 				bgraImage->AnnounceModified();
-				bgraImage->AnnounceNormalized();
+				bgraImage->AnnounceNonNormalized();
 				if (isAnnouncedBlank == 0)
 				{
 					bgraImage->AnnounceDirty();

diff --git a/libspp2pgs/src/SppAdvisor.cpp b/libspp2pgs/src/SppAdvisor.cpp
@@ -99,13 +99,15 @@ int SppAdvisor::IsBlank(int index) const
 
 	if (seg == sq.end() || (*seg).b > iIndex) return 1;	//beyond the end or outside of segments
 
-	if ((*seg).b <= iIndex && !(*seg).a) return 0;	//inside of a static segment
+	//if ((*seg).b <= iIndex && !(*seg).a) return 0;	//inside of a static segment //may be alpha==&HFF&
 
 	return -1;
 }
 
 int SppAdvisor::IsIdentical(int index1, int index2) const
 {
+	if (index1 == index2) return 1;
+
 	int const &iIndex1 = index1 - this->offset;
 	int const &iIndex2 = index2 - this->offset;
 
@@ -127,15 +129,15 @@ int SppAdvisor::IsIdentical(int index1, int index2) const
 	{
 		auto const& seg1 = std::lower_bound(sq.begin(), sq.end(), iIndex1, cmp);
 		if (seg1 == sq.end() || (*seg1).b > iIndex1) blank1 = 1;	//beyond the end or outside of segments
-		if ((*seg1).b <= iIndex1 && !(*seg1).a) blank1 = 0;
+		if ((*seg1).b <= iIndex1) blank1 = -2;
 
 		auto const& seg2 = std::lower_bound(sq.begin(), sq.end(), iIndex2, cmp);
 		if (seg2 == sq.end() || (*seg2).b > iIndex2) blank2 = 1;
-		if ((*seg2).b <= iIndex2 && !(*seg2).a) blank2 = 0;
+		if ((*seg2).b <= iIndex2) blank2 = -2;
 
 		if (blank1 == 1 && blank2 == 1) return 1;	//[1, 1], both are blank img
-		if (blank1 + blank2 == 1) return 0;	//[0, 1] or [1, 0], different
-		if (blank1 == 0 && blank2 == 0 && seg1 == seg2)	//inside the same static segment
+		//if (blank1 + blank2 == 1) return 0;	//[0, 1] or [1, 0], different
+		if (seg1 == seg2 && blank1 + blank2 == -4 && !(*seg1).a)	//inside the same static segment
 		{
 			return 1;
 		}

diff --git a/libspp2pgs/src/StillImage.cpp b/libspp2pgs/src/StillImage.cpp
@@ -120,7 +120,7 @@ namespace spp2pgs
 			return;
 
 		ExplicitEraseTransparents();
-		InvalidateRrawnRects();
+		//InvalidateRrawnRects();
 		this->isNormalized = true;
 	}
 }
diff --git a/misc/xy-VSFilter/src b/misc/xy-VSFilter/src
+39 −29		src/sppfactory/SubPicProviderAlfa.cpp
+ −		src/sppfactory/sppfactory.rc