Fixing some cpp_test complaints

OpenShot · Oct 19, 2020 · 2f4aba4 · 2f4aba4
1 parent d3d604c
commit 2f4aba4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/Clip.cpp b/src/Clip.cpp
@@ -1154,7 +1154,7 @@ void Clip::apply_keyframes(std::shared_ptr<Frame> frame, int width, int height)
 		float alpha_value = alpha.GetValue(frame->number);
 
 		// Get source image's pixels
-		unsigned char *pixels = (unsigned char *) source_image->bits();
+		unsigned char *pixels = source_image->bits();
 
 		// Loop through pixels
 		for (int pixel = 0, byte_index=0; pixel < source_image->width() * source_image->height(); pixel++, byte_index+=4)
@@ -1166,6 +1166,7 @@ void Clip::apply_keyframes(std::shared_ptr<Frame> frame, int width, int height)
 			pixels[byte_index + 2] *= alpha_value;
 			pixels[byte_index + 3] *= alpha_value;
 		}
+		pixels = NULL;
 
 		// Debug output
 		ZmqLogger::Instance()->AppendDebugMethod("Clip::apply_keyframes (Set Alpha & Opacity)", "alpha_value", alpha_value, "frame->number", frame->number);

diff --git a/tests/FrameMapper_Tests.cpp b/tests/FrameMapper_Tests.cpp
@@ -287,13 +287,8 @@ TEST(FrameMapper_AudioSample_Distribution)
 	c2.End(10.0);
 
 	// Add clips
-
 	t1.AddClip(&c1);
 	t1.AddClip(&c2);
-
-	std::string json_val = t1.Json();
-
-	//std::cout << json_val << std::endl;
 
 	//t1.SetJson(t1.Json());
 	t1.Open();