Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitea0e347

Browse files
committed
remove unnecesary codes
1 parenta09fcae commitea0e347

File tree

5 files changed

+1
-95
lines changed

5 files changed

+1
-95
lines changed

‎modules/highgui/include/opencv2/highgui.hpp‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,6 @@ typedef void (*MouseCallback)(int event, int x, int y, int flags, void* userdata
234234
*/
235235
typedefvoid (*TrackbarCallback)(int pos,void* userdata);
236236

237-
/** @brief Callback function defined to be called when initialized. See cv::setOpenGlInitCallback
238-
@param userdata The optional parameter.
239-
*/
240-
typedefvoid (*OpenGlInitCallback)(void* userdata);
241-
242237
/** @brief Callback function defined to be called every frame. See cv::setOpenGlDrawCallback
243238
@param userdata The optional parameter.
244239
*/
@@ -648,15 +643,6 @@ callback function below:
648643
}
649644
@endcode
650645
651-
@param winname Name of the window.
652-
@param onOpenGlInit Pointer to the function to be called every frame. This function should be
653-
prototyped as void Foo(void\*) .
654-
@param userdata Pointer passed to the callback function.(__Optional__)
655-
*/
656-
CV_EXPORTSvoidsetOpenGlInitCallback(const String& winname, OpenGlInitCallback onOpenGlInit,void* userdata =0);
657-
658-
/** @brief Sets the specified window as current OpenGL context.
659-
660646
@param winname Name of the window.
661647
@param onOpenGlDraw Pointer to the function to be called every frame. This function should be
662648
prototyped as void Foo(void\*) .

‎modules/highgui/include/opencv2/highgui/highgui_c.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,6 @@ CVAPI(int) cvWaitKey(int delay CV_DEFAULT(0));
207207

208208
// OpenGL support
209209

210-
typedefvoid (CV_CDECL*CvOpenGlInitCallback)(void*userdata);
211-
CVAPI(void)cvSetOpenGlInitCallback(constchar*window_name,CvOpenGlInitCallbackcallback,void*userdataCV_DEFAULT(NULL));
212210
typedefvoid (CV_CDECL*CvOpenGlDrawCallback)(void*userdata);
213211
CVAPI(void)cvSetOpenGlDrawCallback(constchar*window_name,CvOpenGlDrawCallbackcallback,void*userdataCV_DEFAULT(NULL));
214212

‎modules/highgui/src/window.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -931,12 +931,6 @@ int cv::startWindowThread()
931931

932932
// OpenGL support
933933

934-
voidcv::setOpenGlInitCallback(const String& name, OpenGlInitCallback callback,void* userdata)
935-
{
936-
CV_TRACE_FUNCTION();
937-
cvSetOpenGlInitCallback(name.c_str(), callback, userdata);
938-
}
939-
940934
voidcv::setOpenGlDrawCallback(const String& name, OpenGlDrawCallback callback,void* userdata)
941935
{
942936
CV_TRACE_FUNCTION();

‎modules/highgui/src/window_gtk.cpp‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ struct CvWindow : CvUIBase
572572
last_key(0), flags(0), status(0),
573573
on_mouse(NULL), on_mouse_param(NULL)
574574
#ifdef HAVE_OPENGL
575-
,useGl(false),glInitCallback(NULL),glDrawCallback(NULL), glDrawData(NULL), glArea(NULL)
575+
,useGl(false), glDrawCallback(NULL), glDrawData(NULL), glArea(NULL)
576576
#endif
577577
{
578578
CV_LOG_INFO(NULL,"OpenCV/UI: creating GTK window:" << window_name);
@@ -597,7 +597,6 @@ struct CvWindow : CvUIBase
597597
#ifdef HAVE_OPENGL
598598
bool useGl;
599599

600-
CvOpenGlInitCallback glInitCallback;
601600
CvOpenGlDrawCallback glDrawCallback;
602601
void* glDrawData;
603602
GtkWidget* glArea;
@@ -911,21 +910,15 @@ double cvGetOpenGlProp_GTK(const char* name)
911910
// OpenGL support
912911

913912
#ifdef HAVE_OPENGL
914-
#include<cmath>
915913
namespace
916914
{
917915

918916
#ifdef GTK_VERSION3
919917

920918
voidglRealizeCallback(GtkGLArea* area, gpointer user_data){
921-
CvWindow* window = (CvWindow*)user_data;
922919
gtk_gl_area_make_current(area);
923920
if (gtk_gl_area_get_error(area) !=NULL)
924921
CV_Error(cv::Error::OpenGlApiCallError,"OpenGL context is not initialized");
925-
if(window->glInitCallback) {
926-
std::cout <<"glinit" << std::endl;
927-
window->glInitCallback(window->glDrawData);
928-
}
929922
}
930923

931924
gbooleanglRenderCallback(GtkGLArea* area, GdkGLContext* context, gpointer user_data){
@@ -936,7 +929,6 @@ namespace
936929
returnFALSE;
937930
}
938931
if(window->glDrawCallback) {
939-
std::cout <<"gldraw" << std::endl;
940932
window->glDrawCallback(window->glDrawData);
941933
}
942934
// gtk_gl_area_queue_render(area);
@@ -976,11 +968,6 @@ namespace
976968
if (gtk_gl_area_get_error(gtkGlArea) !=NULL)
977969
CV_Error(cv::Error::OpenGlApiCallError,"Can't Activate The GL Rendering Context");
978970

979-
// g_signal_connect(window->glArea, "realize", G_CALLBACK(glRealizeCallback), window);
980-
// g_signal_connect(window->glArea, "render", G_CALLBACK(glRenderCallback), window);
981-
982-
if (window->glInitCallback)
983-
window->glInitCallback(window->glDrawData);
984971
if (window->glDrawCallback)
985972
window->glDrawCallback(window->glDrawData);
986973

@@ -1130,7 +1117,6 @@ static std::shared_ptr<CvWindow> namedWindow_(const std::string& name, int flags
11301117
if (flags & cv::WINDOW_OPENGL)
11311118
createGlContext(window);
11321119

1133-
window->glInitCallback =0;
11341120
window->glDrawCallback =0;
11351121
window->glDrawData =0;
11361122
#endif
@@ -1256,22 +1242,6 @@ CV_IMPL void cvUpdateWindow(const char* name)
12561242

12571243
}
12581244

1259-
CV_IMPLvoidcvSetOpenGlInitCallback(constchar* name, CvOpenGlInitCallback callback,void* userdata){
1260-
CV_Assert(name &&"NULL name string");
1261-
1262-
CV_LOCK_MUTEX();
1263-
1264-
auto window =icvFindWindowByName(name);
1265-
if( !window )
1266-
return;
1267-
1268-
if (!window->useGl)
1269-
CV_Error( cv::Error::OpenGlNotSupported,"Window was created without OpenGL context" );
1270-
1271-
window->glInitCallback = callback;
1272-
window->glDrawData = userdata;
1273-
}
1274-
12751245
CV_IMPLvoidcvSetOpenGlDrawCallback(constchar* name, CvOpenGlDrawCallback callback,void* userdata)
12761246
{
12771247
CV_Assert(name &&"NULL name string");

‎modules/highgui/test/test_gui.cpp‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -272,56 +272,17 @@ struct DrawData
272272
{
273273
GLuint vao, vbo, program;
274274
};
275-
//void init(void* userdata){
276-
// DrawData* data = static_cast<DrawData*>(userdata);
277-
// glEnable(GL_DEPTH_TEST);
278-
// const char *vertex_shader_source =
279-
// "#version 330 core\n"
280-
// "layout (location = 0) in vec3 position;\n"
281-
// "void main() {\n"
282-
// " gl_Position = vec4(position, 1.0);\n"
283-
// "}\n";
284-
// const char *fragment_shader_source =
285-
// "#version 330 core\n"
286-
// "out vec4 color;\n"
287-
// "void main() {\n"
288-
// " color = vec4(1.0, 1.0, 1.0, 1.0); // white\n"
289-
// "}\n";
290-
// GLuint vertex_shader = create_shader(vertex_shader_source, GL_VERTEX_SHADER);
291-
// GLuint fragment_shader = create_shader(fragment_shader_source, GL_FRAGMENT_SHADER);
292-
// data->program = glCreateProgram();
293-
// glAttachShader(data->program, vertex_shader);
294-
// glAttachShader(data->program, fragment_shader);
295-
// glLinkProgram(data->program);
296-
// glUseProgram(data->program);
297-
// GLfloat vertices[] = {
298-
// 0.0f, 0.5f, 0.0f,
299-
// -0.5f, -0.5f, 0.0f,
300-
// 0.5f, -0.5f, 0.0f
301-
// };
302-
// glGenVertexArrays(1, &data->vao);
303-
// glBindVertexArray(data->vao);
304-
// glGenBuffers(1, &data->vbo);
305-
// glBindBuffer(GL_ARRAY_BUFFER, data->vbo);
306-
// glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
307-
// glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(GLfloat), (GLvoid*)0);
308-
// glEnableVertexAttribArray(0);
309-
// glBindVertexArray(0);
310-
// std::cout << "test realize" << std::endl;
311-
//};
312275
voiddraw(void* userdata){
313276
DrawData* data =static_cast<DrawData*>(userdata);
314277
glBindVertexArray(data->vao);
315278
glDrawArrays(GL_TRIANGLES,0,3);
316279
glBindVertexArray(0);
317-
std::cout <<"test render" << std::endl;
318280
}
319281
TEST(Highgui_GUI, gl)
320282
#endif
321283
{
322284
const std::stringwindow_name("gl_test_window");
323285
const Sizeimage_size(800,600);
324-
325286
EXPECT_NO_THROW(destroyAllWindows());
326287
ASSERT_NO_THROW(namedWindow(window_name, WINDOW_OPENGL));
327288
ASSERT_NO_THROW(resizeWindow(window_name, image_size));
@@ -358,10 +319,7 @@ TEST(Highgui_GUI, gl)
358319
glVertexAttribPointer(0,3, GL_FLOAT, GL_FALSE,3 *sizeof(GLfloat), (GLvoid*)0);
359320
glEnableVertexAttribArray(0);
360321
glBindVertexArray(0);
361-
// ASSERT_NO_THROW(setOpenGlInitCallback(window_name, init, &data));
362-
363322
ASSERT_NO_THROW(setOpenGlDrawCallback(window_name, draw, &data));
364-
// ASSERT_NO_THROW(imshow(window_name, m));
365323
EXPECT_NO_THROW(waitKey(10000));
366324
EXPECT_NO_THROW(setOpenGlDrawCallback(window_name,0));
367325
EXPECT_NO_THROW(destroyAllWindows());

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp