From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 17 Mar 2019 18:15:13 +0000 (+0100)
Subject: Fix more repetition of the Userdata cast.
X-Git-Tag: 1.8.5~18
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=f08eaef2d7c9f6815f7010a221302daccb57fda1

Fix more repetition of the Userdata cast.
---

diff --git a/nageru/pbo_frame_allocator.cpp b/nageru/pbo_frame_allocator.cpp
index 1904cf1..4c1a55b 100644
--- a/nageru/pbo_frame_allocator.cpp
+++ b/nageru/pbo_frame_allocator.cpp
@@ -216,9 +216,10 @@ PBOFrameAllocator::~PBOFrameAllocator()
 
 void PBOFrameAllocator::destroy_frame(Frame *frame)
 {
+	Userdata *ud = (Userdata *)frame->userdata;
 	delete[] frame->data_copy;
 
-	GLuint pbo = ((Userdata *)frame->userdata)->pbo;
+	GLuint pbo = ud->pbo;
 	glBindBuffer(buffer, pbo);
 	check_error();
 	glUnmapBuffer(buffer);
@@ -229,27 +230,27 @@ void PBOFrameAllocator::destroy_frame(Frame *frame)
 	check_error();
 	switch (pixel_format) {
 	case bmusb::PixelFormat_10BitYCbCr:
-		glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_v210);
+		glDeleteTextures(2, ud->tex_v210);
 		check_error();
-		glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_444);
+		glDeleteTextures(2, ud->tex_444);
 		check_error();
 		break;
 	case bmusb::PixelFormat_8BitYCbCr:
-		glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_y);
+		glDeleteTextures(2, ud->tex_y);
 		check_error();
-		glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_cbcr);
+		glDeleteTextures(2, ud->tex_cbcr);
 		check_error();
 		break;
 	case bmusb::PixelFormat_8BitBGRA:
-		glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_rgba);
+		glDeleteTextures(2, ud->tex_rgba);
 		check_error();
 		break;
 	case bmusb::PixelFormat_8BitYCbCrPlanar:
-		glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_y);
+		glDeleteTextures(2, ud->tex_y);
 		check_error();
-		glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_cb);
+		glDeleteTextures(2, ud->tex_cb);
 		check_error();
-		glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_cr);
+		glDeleteTextures(2, ud->tex_cr);
 		check_error();
 		break;
 	default: