diff -uNr molmol-2k.2.0/makedef molmol-2k.2.0.fink/makedef --- molmol-2k.2.0/makedef 1969-12-31 19:00:00.000000000 -0500 +++ molmol-2k.2.0.fink/makedef 2015-03-12 00:43:20.000000000 -0400 @@ -0,0 +1,60 @@ + TIFFDIR = @PREFIX@/lib + MESADIR = + JPEGDIR = @PREFIX@/lib + + PNGDIR = @PREFIX@/lib + ZLIBDIR = /usr/lib + +# If you configured any of the above three image formats, uncomment +# the following four lines, and delete the non-relevant parts if +# necessary, i. e. if you did not configure all three formats. +# + IMGDEF = -DTIFF_SUPPORT -DJPEG_SUPPORT -DPNG_SUPPORT + IMGINCL = -I$(TIFFDIR) -I$(JPEGDIR) -I$(PNGDIR) -I$(ZLIBDIR) + IMGLIB = $(TIFFDIR)/libtiff.dylib $(JPEGDIR)/libjpeg.dylib \ + $(PNGDIR)/libpng.dylib $(ZLIBDIR)/libz.dylib + +# Some systems do not have the float versions of various math functions, +# uncomment the following lines if this is the case + + MISSFUNC = -Dsqrtf=sqrt -Dexpf=exp -Dlogf=log \ + -Dsinf=sin -Dcosf=cos \ + -Dfabsf=fabs -DMAXINT=INT_MAX + + # -Dceilf=ceil + +CPP = /usr/bin/cpp + +MCPPFLAGS = -DMAXINT=INT_MAX -I$(TOP) -I@PREFIX@/include -I@X11DIR@/include + +CC = gcc + +MCFLAGS = -O -Wall -Wno-switch + +RANLIB = /usr/bin/ranlib + +WAIT = /bin/sleep 2 + +SHELL = /bin/sh + +SGDEVDIR = ogl x11 no pov rib vrml1 vrml2 ps fm + +SGDEVDEF = -DSG_DEV_OGL -DSG_DEV_X11 -DSG_DEV_NO -DSG_DEV_POV -DSG_DEV_RIB -DSG_DEV_VRML1 -DSG_DEV_VRML2 -DSG_DEV_PS -DSG_DEV_CPS -DSG_DEV_FM3 -DSG_DEV_FM4 + +PUDEVDIR = motif tty + +PUDEVDEF = -DPU_DEV_MOTIF -DPU_DEV_TTY + +IODEVDIR = motx11 motogl ttyno + +IODEVDEF = -DIO_DEV_MOTIF_X11 -DIO_DEV_MOTIF_OGL -DIO_DEV_TTY_NO + + +MOTIFDEF = -DFUNCPROTO + +SYSLIB = -L/usr/lib -L@PREFIX@/lib -L@X11DIR@/lib \ + -lX11 -lXm -lGLU -lGL /System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib @PREFIX@/lib/libGLw.dylib \ + -lXmu -lXt -lXpm -lX11 -lXext -lSM -lICE -lm -lc -lmx + +TOOLSDIR = $(TOP)/tools +SGDIR = $(TOP)/sg diff -uNr molmol-2k.2.0/molmol molmol-2k.2.0.fink/molmol --- molmol-2k.2.0/molmol 2003-01-20 20:44:58.000000000 -0500 +++ molmol-2k.2.0.fink/molmol 2015-03-12 00:43:20.000000000 -0400 @@ -1,9 +1,9 @@ -#!/bin/ksh +#!/bin/zsh -f # # startup script for MOLMOL # -MOLMOLHOME=/opt/group/MOLMOL +MOLMOLHOME=@PREFIX@/share/molmol;MOLMOLDEV="Motif/OpenGL" export MOLMOLHOME export MOLMOLDEV @@ -11,55 +11,8 @@ osrel=`uname -r` osmaj=`echo $osrel | awk -F. '{print $1}'` osmin=`echo $osrel | awk -F. '{print $2}'` -localdev= -glxdev= - -if [ $ostype = "IRIX" -o $ostype = "IRIX64" ]; then - if [ $osmaj -eq 6 -a $osmin -ge 2 -o $osmaj -gt 6 ]; then - arch=sgi6 - localdev=Motif/OpenGL - glxdev=Motif/OpenGL - elif [ $osmaj -eq 5 -a $osmin -ge 3 -o $osmaj -gt 5 ]; then - arch=sgi5 - localdev=Motif/OpenGL - glxdev=Motif/OpenGL - else - arch=sgi4 - localdev=Motif/GL - fi - MONITOR=72HZ; export MONITOR -elif [ $ostype = "AIX" ]; then - arch=aix - localdev=Motif/OpenGL -elif [ $ostype = "HP-UX" ]; then - arch=hp - localdev=Motif/OpenGL - glxdev=Motif/OpenGL -elif [ $ostype = "OSF1" ]; then - arch=dec - localdev=Motif/OpenGL -elif [ $ostype = "Linux" ]; then - arch=lnx - localdev=Motif/OpenGL -elif [ $ostype = "SunOS" ]; then - if [ $osmaj -eq 5 -a $osmin -ge 4 -o $osmaj -gt 5 ]; then - arch=sol - localdev=Motif/OpenGL - else - arch=sun - fi -else - arch=unknown -fi - -if [ $ostype = "SunOS" ]; then - xdpy=/usr/openwin/bin/xdpyinfo -elif [ $ostype = "HP-UX" ]; then - xdpy=/usr/contrib/bin/X11/xdpyinfo -else - xdpy=/usr/bin/X11/xdpyinfo -fi - +localdev=Motif/OpenGL +glxdev=Motif/OpenGL printUsage () { echo "Usage: molmol -ht2as [-o dev] [-r range] [-f macro] files" echo "" @@ -209,7 +162,7 @@ fi if [ "$input" = "-" -o -n "$nograph" ]; then - $MOLMOLHOME/molmol.$arch $xopt + echo "LineBond solid 1 " >>| $startmacro ; @PREFIX@/share/molmol/src/main/molmol $xopt else - $MOLMOLHOME/molmol.$arch $xopt < /dev/null + echo "LineBond solid 1 " >>| $startmacro ; @PREFIX@/share/molmol/src/main/molmol $xopt fi diff -uNr molmol-2k.2.0/src/calc/CalcRmsd.c molmol-2k.2.0.fink/src/calc/CalcRmsd.c --- molmol-2k.2.0/src/calc/CalcRmsd.c 2001-05-27 20:30:09.000000000 -0400 +++ molmol-2k.2.0.fink/src/calc/CalcRmsd.c 2015-03-12 00:43:20.000000000 -0400 @@ -1025,10 +1025,10 @@ } for (propI = 0; propI < 2; propI++) { - if (groupNo == 0 || propI == 0 && ! calc1) + if (groupNo == 0 || (propI == 0 && ! calc1)) continue; - if (groupNo == 0 || propI == 1 && ! calc2) + if (groupNo == 0 || (propI == 1 && ! calc2)) continue; Report("\nAverage RMSD, dev., min. and max of "); @@ -1052,8 +1052,8 @@ Report(" "); for (groupI2 = 0; groupI2 < groupNo; groupI2++) { - if (groupI1 < groupI2 && - groupInfoP[groupI1].membNo != groupInfoP[groupI2].membNo || + if (((groupI1 < groupI2) && + (groupInfoP[groupI1].membNo != groupInfoP[groupI2].membNo)) || groupInfoP[groupI1].membNo == 0 || groupInfoP[groupI2].membNo == 0) { groupInfoP[groupI2].stat.avg = 0.0f; diff -uNr molmol-2k.2.0/src/cmdfig/FigUtil.c molmol-2k.2.0.fink/src/cmdfig/FigUtil.c --- molmol-2k.2.0/src/cmdfig/FigUtil.c 2001-05-27 19:42:22.000000000 -0400 +++ molmol-2k.2.0.fink/src/cmdfig/FigUtil.c 2015-03-12 00:43:20.000000000 -0400 @@ -44,29 +44,29 @@ } TabEntry; static TabEntry GreekTab[] = { - "ALPHA", 'a', - "BETA", 'b', - "CHI", 'c', - "DELTA", 'd', - "EPSILON", 'e', - "PHI" , 'f', - "GAMMA", 'g', - "ETA", 'h', - "IOTA", 'i', - "KAPPA", 'k', - "LAMBDA", 'l', - "MU", 'm', - "NU", 'n', - "PI", 'p', - "THETA", 'q', - "RHO", 'r', - "SIGMA", 's', - "TAU", 't', - "UPSILON", 'u', - "OMEGA", 'w', - "XI", 'x', - "PSI", 'y', - "ZETA", 'z' + {"ALPHA", 'a'}, + {"BETA", 'b'}, + {"CHI", 'c'}, + {"DELTA", 'd'}, + {"EPSILON", 'e'}, + {"PHI" , 'f'}, + {"GAMMA", 'g'}, + {"ETA", 'h'}, + {"IOTA", 'i'}, + {"KAPPA", 'k'}, + {"LAMBDA", 'l'}, + {"MU", 'm'}, + {"NU", 'n'}, + {"PI", 'p'}, + {"THETA", 'q'}, + {"RHO", 'r'}, + {"SIGMA", 's'}, + {"TAU", 't'}, + {"UPSILON", 'u'}, + {"OMEGA", 'w'}, + {"XI", 'x'}, + {"PSI", 'y'}, + {"ZETA", 'z'} }; int diff -uNr molmol-2k.2.0/src/cmdio/ExPdb.c molmol-2k.2.0.fink/src/cmdio/ExPdb.c --- molmol-2k.2.0/src/cmdio/ExPdb.c 2001-05-27 19:30:08.000000000 -0400 +++ molmol-2k.2.0.fink/src/cmdio/ExPdb.c 2015-03-12 00:47:15.000000000 -0400 @@ -662,7 +662,7 @@ BOOL replace; DSTR name; int molNo, readNo; - DhMolP *molPA; + DhMolP *molPA = NULL; ErrCode errCode; DSTR errStr; diff -uNr molmol-2k.2.0/src/cmdio/ExReadDg.c molmol-2k.2.0.fink/src/cmdio/ExReadDg.c --- molmol-2k.2.0/src/cmdio/ExReadDg.c 2001-05-27 19:28:15.000000000 -0400 +++ molmol-2k.2.0.fink/src/cmdio/ExReadDg.c 2015-03-12 00:47:54.000000000 -0400 @@ -288,7 +288,7 @@ BOOL replace; DSTR fileName; int molNo, readNo; - DhMolP *molPA; + DhMolP *molPA = NULL; ErrCode errCode; DSTR errStr; diff -uNr molmol-2k.2.0/src/cmdio/ExWriteSec.c molmol-2k.2.0.fink/src/cmdio/ExWriteSec.c --- molmol-2k.2.0/src/cmdio/ExWriteSec.c 1997-02-17 11:09:08.000000000 -0500 +++ molmol-2k.2.0.fink/src/cmdio/ExWriteSec.c 2015-03-12 00:43:20.000000000 -0400 @@ -250,9 +250,9 @@ if (neighLStart != NO_RES) { if (num != neighLEnd + 1 || - neighNum != neighREnd + 1 && neighNum != neighREnd - 1 || - neighREnd > neighRStart && neighNum != neighREnd + 1 || - neighREnd < neighRStart && neighNum != neighREnd - 1) { + (neighNum != neighREnd + 1 && neighNum != neighREnd - 1) || + (neighREnd > neighRStart && neighNum != neighREnd + 1) || + (neighREnd < neighRStart && neighNum != neighREnd - 1)) { writeNeigh(neighLStart, neighLEnd, neighRStart, neighREnd); neighLStart = NO_RES; } else { diff -uNr molmol-2k.2.0/src/data/DataDist.c molmol-2k.2.0.fink/src/data/DataDist.c --- molmol-2k.2.0/src/data/DataDist.c 1999-10-30 20:28:28.000000000 -0400 +++ molmol-2k.2.0.fink/src/data/DataDist.c 2015-03-12 00:43:20.000000000 -0400 @@ -89,7 +89,7 @@ { TabEntryInter *entryP = p; - return ((unsigned) entryP->atom1P + (unsigned) entryP->atom2P) % size; + return ((unsigned)(uintptr_t) entryP->atom1P + (unsigned)(uintptr_t) entryP->atom2P) % size; } static int @@ -116,7 +116,7 @@ entryP->atom2I = DhAtomGetNumber(atom2P); if (entryP->res1I > entryP->res2I || - entryP->res1I == entryP->res2I && entryP->atom1I > entryP->atom2I) { + (entryP->res1I == entryP->res2I && entryP->atom1I > entryP->atom2I)) { t = entryP->res1I; entryP->res1I = entryP->res2I; entryP->res2I = t; diff -uNr molmol-2k.2.0/src/data/DataHand.c molmol-2k.2.0.fink/src/data/DataHand.c --- molmol-2k.2.0/src/data/DataHand.c 2001-05-27 17:07:42.000000000 -0400 +++ molmol-2k.2.0.fink/src/data/DataHand.c 2015-03-12 00:43:20.000000000 -0400 @@ -2043,8 +2043,8 @@ groupNum1 = getGroupNum(bondAddP->res1P->molP); groupNum2 = getGroupNum(bondAddP->res2P->molP); if (atom1P->state == AS_VALID && atom2P->state == AS_VALID && - (groupNum1 == groupNum && groupNum2 == groupNum || - groupNum < 0 && groupNum1 != groupNum2)) + ((groupNum1 == groupNum && groupNum2 == groupNum) || + (groupNum < 0 && groupNum1 != groupNum2))) applyF(bondP, atom1P, atom2P, clientData); } bondAddP = nextBondAddP; @@ -2367,8 +2367,8 @@ groupNum1 = getGroupNum(distP->res1P->molP); groupNum2 = getGroupNum(distP->res2P->molP); if (atom1P->state == AS_VALID && atom2P->state == AS_VALID && - (groupNum1 == groupNum && groupNum2 == groupNum || - groupNum < 0 && groupNum1 != groupNum2)) + ((groupNum1 == groupNum && groupNum2 == groupNum) || + (groupNum < 0 && groupNum1 != groupNum2))) applyF(distP, atom1P, atom2P, clientData); } } diff -uNr molmol-2k.2.0/src/expr/ExprScan.c molmol-2k.2.0.fink/src/expr/ExprScan.c --- molmol-2k.2.0/src/expr/ExprScan.c 2001-05-27 18:07:12.000000000 -0400 +++ molmol-2k.2.0.fink/src/expr/ExprScan.c 2015-03-12 00:43:20.000000000 -0400 @@ -221,7 +221,7 @@ for (;;) { if (isdigit(ch)) { DStrAppChar(StrVal, ch); - } else if (ch == '.' && ExprStr[1] != '.' || + } else if ((ch == '.' && ExprStr[1] != '.') || ch == 'e' || ch == 'E') { DStrAppChar(StrVal, ch); isFloat = TRUE; diff -uNr molmol-2k.2.0/src/iodev/IODev.c molmol-2k.2.0.fink/src/iodev/IODev.c --- molmol-2k.2.0/src/iodev/IODev.c 2001-05-27 17:03:30.000000000 -0400 +++ molmol-2k.2.0.fink/src/iodev/IODev.c 2015-03-12 00:43:20.000000000 -0400 @@ -44,7 +44,6 @@ #endif #ifdef IO_DEV_MOTIF_OGL extern void IOMotifOGLSetDev(void); -extern void IOMotifOGLDSetDev(void); #endif #ifdef IO_DEV_MOTIF_XGL extern void IOMotifXGLSetDev(void); @@ -76,7 +75,6 @@ #endif #ifdef IO_DEV_MOTIF_OGL {"Motif/OpenGL", IOMotifOGLSetDev}, - {"Motif/OpenGLD", IOMotifOGLDSetDev}, #endif #ifdef IO_DEV_MOTIF_XGL {"Motif/XGL", IOMotifXGLSetDev}, diff -uNr molmol-2k.2.0/src/motif/MotifDial.c molmol-2k.2.0.fink/src/motif/MotifDial.c --- molmol-2k.2.0/src/motif/MotifDial.c 2001-05-27 17:53:08.000000000 -0400 +++ molmol-2k.2.0.fink/src/motif/MotifDial.c 2015-03-12 00:45:01.000000000 -0400 @@ -1283,7 +1283,7 @@ addButtonCB(Widget dialFormW, char *name, GizmoCBInfo *cbInfoP) { WidgetInfo *wInfoP; - Widget *wP; + Widget *wP = NULL; wInfoP = getWidgetInfo(dialFormW); @@ -1323,7 +1323,7 @@ switch (type) { case PU_CT_ACTIVATE: - if (gType == GIZMO_TEXT_FIELD || GIZMO_TEXT) + if (gType == (GIZMO_TEXT_FIELD | GIZMO_TEXT)) XtAddCallback(gizmo, XmNactivateCallback, textActivateCB, infoP); else if (gType == GIZMO_BUTTON) XtAddCallback(gizmo, XmNactivateCallback, gizmoGenCB, infoP); diff -uNr molmol-2k.2.0/src/motif/MotifMainW.c molmol-2k.2.0.fink/src/motif/MotifMainW.c --- molmol-2k.2.0/src/motif/MotifMainW.c 2001-05-27 17:36:10.000000000 -0400 +++ molmol-2k.2.0.fink/src/motif/MotifMainW.c 2015-03-12 00:43:20.000000000 -0400 @@ -80,8 +80,8 @@ { Window *winP = (Window *) arg; - return eventP->type == ButtonPress && eventP->xbutton.window == *winP || - eventP->type == Expose && eventP->xexpose.window == *winP; + return (eventP->type == ButtonPress && eventP->xbutton.window == *winP) || + (eventP->type == Expose && eventP->xexpose.window == *winP); } static void diff -uNr molmol-2k.2.0/src/motogl/MotOGL.c molmol-2k.2.0.fink/src/motogl/MotOGL.c --- molmol-2k.2.0/src/motogl/MotOGL.c 2000-05-29 12:31:51.000000000 -0400 +++ molmol-2k.2.0.fink/src/motogl/MotOGL.c 2015-03-12 00:43:20.000000000 -0400 @@ -31,7 +31,7 @@ #include #define BOOL MOTIF_BOOL /* hack to avoid naming conflict */ -#include +#include "@PREFIX@/include/GL/GLwMDrawA.h" #undef BOOL #include diff -uNr molmol-2k.2.0/src/motogl/MotOGLDump.c molmol-2k.2.0.fink/src/motogl/MotOGLDump.c --- molmol-2k.2.0/src/motogl/MotOGLDump.c 2001-07-07 21:21:34.000000000 -0400 +++ molmol-2k.2.0.fink/src/motogl/MotOGLDump.c 2015-03-12 00:43:20.000000000 -0400 @@ -248,7 +248,7 @@ pngErrHand(png_structp pngStrucP, char *errMsg) { IORaiseError(errMsg); - longjmp(pngStrucP->jmpbuf, 1); + longjmp(png_jmpbuf(pngStrucP), 1); } #endif @@ -357,7 +357,7 @@ return IO_RES_ERR; } - if (setjmp(pngStrucP->jmpbuf)) { + if (setjmp(png_jmpbuf(pngStrucP))) { if (cBuf != NULL) free(cBuf); if (fBuf != NULL) @@ -368,10 +368,7 @@ png_init_io(pngStrucP, ImgFileP); - pngInfoP->width = imgW; - pngInfoP->height = imgH; - pngInfoP->bit_depth = 8; - pngInfoP->color_type = PNG_COLOR_TYPE_RGB; + png_set_IHDR(pngStrucP, pngInfoP, imgW, imgH, 8, PNG_COLOR_TYPE_RGB, 0, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); png_write_info(pngStrucP, pngInfoP); } #endif diff -uNr molmol-2k.2.0/src/os/GFile.c molmol-2k.2.0.fink/src/os/GFile.c --- molmol-2k.2.0/src/os/GFile.c 2001-06-17 14:59:17.000000000 -0400 +++ molmol-2k.2.0.fink/src/os/GFile.c 2015-03-12 00:43:20.000000000 -0400 @@ -38,7 +38,6 @@ const INT32 GFMagic = 0x3b7a12f9; #ifndef __linux__ -extern char *sys_errlist[]; #endif extern int errno; @@ -384,7 +383,7 @@ { if (gf->format == GF_FORMAT_MEMORY) return gf->currP == NULL || - gf->currP->nextP == NULL && gf->currPos == gf->currP->len; + (gf->currP->nextP == NULL && gf->currPos == gf->currP->len); else return feof(gf->fp); } diff -uNr molmol-2k.2.0/src/prim/PrimDraw.c molmol-2k.2.0.fink/src/prim/PrimDraw.c --- molmol-2k.2.0/src/prim/PrimDraw.c 2001-05-27 16:41:49.000000000 -0400 +++ molmol-2k.2.0.fink/src/prim/PrimDraw.c 2015-03-12 00:43:20.000000000 -0400 @@ -461,7 +461,7 @@ } if (partP->paint == RP_ATOM || - partP->paint == RP_ATOM_SMOOTH && partP->polyNo > 0) + (partP->paint == RP_ATOM_SMOOTH && partP->polyNo > 0)) SgSetColor(attrP->colR, attrP->colG, attrP->colB); if (partP->paint == RP_ATOM_SMOOTH) diff -uNr molmol-2k.2.0/src/prim/RibbonCalc.c molmol-2k.2.0.fink/src/prim/RibbonCalc.c --- molmol-2k.2.0/src/prim/RibbonCalc.c 2001-05-27 16:40:14.000000000 -0400 +++ molmol-2k.2.0.fink/src/prim/RibbonCalc.c 2015-03-12 00:43:20.000000000 -0400 @@ -907,7 +907,7 @@ getSplinePoints(partP, ribbonP, ePar, partP->endPar, ePNo + 1, parA + sPNo + mPNo - 1, xA + sPNo + mPNo - 1, dzA + sPNo + mPNo - 1); - if (partP->style == RS_ROUND && partP->midRad == 0.0f || + if ((partP->style == RS_ROUND && partP->midRad == 0.0f) || BreakInterrupted()) { /* draw only one line */ partP->traceNo = 1; @@ -1128,15 +1128,15 @@ Vec3Copy(partP->traceA[traceI].nvA[pointI], nv); } - if (pointI == 0 && partP->startStyle == RE_SHARP || - pointI == pointNo - ePNo && partP->endStyle == RE_ARROW) + if ((pointI == 0 && partP->startStyle == RE_SHARP) || + (pointI == pointNo - ePNo && partP->endStyle == RE_ARROW)) Vec3Copy(partP->polyA[polyI].xA[traceNo - 1 - traceI], x); else if (pointI == pointNo - 1 && partP->endStyle == RE_SHARP) Vec3Copy(partP->polyA[polyI].xA[traceI], x); } - if (pointI == 0 && partP->startStyle == RE_SHARP || - pointI == pointNo - ePNo && partP->endStyle == RE_ARROW) { + if ((pointI == 0 && partP->startStyle == RE_SHARP) || + (pointI == pointNo - ePNo && partP->endStyle == RE_ARROW)) { Vec3Copy(x, dy); Vec3Cross(x, dx); Vec3Copy(partP->polyA[polyI].nv, x); @@ -1327,7 +1327,7 @@ if (! partP->pointValid || prec != partP->prec || startRad != partP->startRad || - partP->style == RS_ROUND && midRad != partP->midRad || + (partP->style == RS_ROUND && midRad != partP->midRad) || endRad != partP->endRad || radChanged) { for (i = 0; i < partP->traceNo; i++) { free(partP->traceA[i].xA); diff -uNr molmol-2k.2.0/src/pudev/PuMainW.c molmol-2k.2.0.fink/src/pudev/PuMainW.c --- molmol-2k.2.0/src/pudev/PuMainW.c 1996-02-06 05:48:36.000000000 -0500 +++ molmol-2k.2.0.fink/src/pudev/PuMainW.c 2015-03-12 00:43:20.000000000 -0400 @@ -57,7 +57,7 @@ if (text[0] != LOCK_CHAR) return; text++; - if (text[0] == '\0' || text[0] == ' ' && text[1] == '\0') { + if (text[0] == '\0' || (text[0] == ' ' && text[1] == '\0')) { StatusLocked = FALSE; text = " "; } diff -uNr molmol-2k.2.0/src/tty/TTY.c molmol-2k.2.0.fink/src/tty/TTY.c --- molmol-2k.2.0/src/tty/TTY.c 2001-05-27 17:13:51.000000000 -0400 +++ molmol-2k.2.0.fink/src/tty/TTY.c 2015-03-12 00:43:20.000000000 -0400 @@ -164,7 +164,7 @@ void PuTTYSetTextField(PuTextFieldChoice fieldChoice, char *text) { - if (text[0] == '\0' || text[0] == ' ' && text[1] == '\0') + if (text[0] == '\0' || (text[0] == ' ' && text[1] == '\0')) return; switch (fieldChoice) { diff -uNr molmol-2k.2.0/tools/include/values.h molmol-2k.2.0.fink/tools/include/values.h --- molmol-2k.2.0/tools/include/values.h 1969-12-31 19:00:00.000000000 -0500 +++ molmol-2k.2.0.fink/tools/include/values.h 2015-03-12 00:43:20.000000000 -0400 @@ -0,0 +1,2 @@ +#include +#include diff -uNr molmol-2k.2.0/tools/src/IsoSurface.c molmol-2k.2.0.fink/tools/src/IsoSurface.c --- molmol-2k.2.0/tools/src/IsoSurface.c 2001-07-04 19:26:21.000000000 -0400 +++ molmol-2k.2.0.fink/tools/src/IsoSurface.c 2015-03-12 00:43:20.000000000 -0400 @@ -104,19 +104,19 @@ } Strip; static CubeDesc CubeEven = { - 0, 3, 5, 6, {{D_0, 1}, {D_0, 2}, {D_0, 3}, {D_0, 4}}, - 3, 0, 5, 1, {{D_0, 0}, {D_MZ, 4}, {D_MY, 1}, {D_PX, 2}}, - 0, 3, 6, 2, {{D_0, 0}, {D_MZ, 3}, {D_PY, 2}, {D_MX, 1}}, - 3, 5, 6, 7, {{D_0, 0}, {D_PX, 3}, {D_PZ, 1}, {D_PY, 4}}, - 5, 0, 6, 4, {{D_0, 0}, {D_MY, 3}, {D_MX, 4}, {D_PZ, 2}} + {{0, 3, 5, 6, {{D_0, 1}, {D_0, 2}, {D_0, 3}, {D_0, 4}}}, + {3, 0, 5, 1, {{D_0, 0}, {D_MZ, 4}, {D_MY, 1}, {D_PX, 2}}}, + {0, 3, 6, 2, {{D_0, 0}, {D_MZ, 3}, {D_PY, 2}, {D_MX, 1}}}, + {3, 5, 6, 7, {{D_0, 0}, {D_PX, 3}, {D_PZ, 1}, {D_PY, 4}}}, + {5, 0, 6, 4, {{D_0, 0}, {D_MY, 3}, {D_MX, 4}, {D_PZ, 2}}}} }; static CubeDesc CubeOdd = { - 1, 2, 7, 4, {{D_0, 1}, {D_0, 2}, {D_0, 3}, {D_0, 4}}, - 2, 1, 7, 3, {{D_0, 0}, {D_MZ, 3}, {D_PX, 2}, {D_PY, 1}}, - 1, 2, 4, 0, {{D_0, 0}, {D_MZ, 4}, {D_MX, 1}, {D_MY, 2}}, - 2, 7, 4, 6, {{D_0, 0}, {D_PY, 4}, {D_PZ, 2}, {D_MX, 3}}, - 7, 1, 4, 5, {{D_0, 0}, {D_PX, 4}, {D_MY, 3}, {D_PZ, 1}} + {{1, 2, 7, 4, {{D_0, 1}, {D_0, 2}, {D_0, 3}, {D_0, 4}}}, + {2, 1, 7, 3, {{D_0, 0}, {D_MZ, 3}, {D_PX, 2}, {D_PY, 1}}}, + {1, 2, 4, 0, {{D_0, 0}, {D_MZ, 4}, {D_MX, 1}, {D_MY, 2}}}, + {2, 7, 4, 6, {{D_0, 0}, {D_PY, 4}, {D_PZ, 2}, {D_MX, 3}}}, + {7, 1, 4, 5, {{D_0, 0}, {D_PX, 4}, {D_MY, 3}, {D_PZ, 1}}}} }; static BOOL Initialized = FALSE; @@ -158,7 +158,7 @@ static BOOL equalPair(int i00, int i01, int i10, int i11) { - return i00 == i10 && i01 == i11 || i00 == i11 && i01 == i10; + return (i00 == i10 && i01 == i11) || (i00 == i11 && i01 == i10); } static int