luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

graphics/grTkCommon.c: remove OGL includes 

No references to OpenGL here, so headers not needed.
While there, replace panic() with TxError() + MainExit (+ include
utils/main.h for C99 compat).
This commit is contained in:
Alessandro De Laurenzis 2022-10-25 05:51:50 +02:00
parent b306a39560
commit 1c343584e9
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
graphics/grTkCommon.c
View File

@ -16,6 +16,7 @@
#include "tcltk/tclmagic.h" #include "tcltk/tclmagic.h"
#include "utils/magic.h" #include "utils/magic.h"
#include "utils/main.h"
#include "utils/styles.h" #include "utils/styles.h"
#include "utils/geometry.h" #include "utils/geometry.h"
#include "utils/hash.h" #include "utils/hash.h"
@ -32,14 +33,6 @@
#include "graphics/grTkCommon.h" #include "graphics/grTkCommon.h"
#include "graphics/glyphs.h" #include "graphics/glyphs.h"
/* C99 compat
* GL headers must be included after graphics/grTOGLInt.h
*/
#include <GL/gl.h>
#include <GL/glx.h>
#include <GL/glu.h>
#include <mach/mach.h> /* Needed to define panic */
#include "textio/textio.h" #include "textio/textio.h"
/* Variables declared by grClip.c */ /* Variables declared by grClip.c */
@ -1260,7 +1253,8 @@ ImgLayerCmd(clientData, interp, objc, objv)
return code; return code;
} }
default: { default: {
panic("bad const entries to layerOptions in ImgLayerCmd"); TxError("bad const entries to layerOptions in ImgLayerCmd\n");
MainExit(1);
} }
} }
return TCL_OK; return TCL_OK;
@ -1462,7 +1456,8 @@ ImgLayerDelete(masterData)
LayerMaster *masterPtr = (LayerMaster *) masterData; LayerMaster *masterPtr = (LayerMaster *) masterData;
if (masterPtr->instancePtr != NULL) { if (masterPtr->instancePtr != NULL) {
panic("tried to delete layer image when instances still exist"); TxError("tried to delete layer image when instances still exist\n");
MainExit(1);
} }
masterPtr->tkMaster = NULL; masterPtr->tkMaster = NULL;
if (masterPtr->imageCmd != NULL) { if (masterPtr->imageCmd != NULL) {