Skip to content

Commit 01c0ee4

Browse files
committed
More windows fixes (this time to the Segraph demo)
1 parent be277f1 commit 01c0ee4

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/SeExpr/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ ENDIF(NOT WIN32)
103103
## Install binary and includes
104104
FILE(GLOB public_includes "*.h")
105105
IF (NOT DEFINED CMAKE_INSTALL_LIBDIR)
106-
SET(CMAKE_INSTALL_LIBDIR "lib64")
106+
SET(CMAKE_INSTALL_LIBDIR "lib")
107107
ENDIF (NOT DEFINED CMAKE_INSTALL_LIBDIR)
108108
INSTALL (TARGETS SeExpr SeExpr-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
109109
INSTALL (FILES ${public_includes} DESTINATION include)

src/demos/segraph/Graph.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@
3333
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
3434
*/
3535
#include "Graph.h"
36-
#include <fenv.h>
37-
36+
#ifndef SEEXPR_WIN32
37+
# include <fenv.h>
38+
#endif
39+
#include <cmath>
3840
Graph::
3941
Graph(Functions* functions,QStatusBar* status)
4042
:funcs(*functions),operationCode(NONE),rootShow(false),minShow(false),dragging(false),scaling(false),
@@ -264,8 +266,8 @@ mouseMoveEvent(QMouseEvent* event)
264266
float width=(xmax-xmin)/2.,height=(ymax-ymin)/2.;
265267
float xcenter=(xmax+xmin)/2.,ycenter=(ymax+ymin)/2.;
266268

267-
width*=pow(10.,-dx/(xmax-xmin));
268-
height*=pow(10.,-dy/(ymax-ymin));
269+
width*=pow(10.f,-dx/(xmax-xmin));
270+
height*=pow(10.f,-dy/(ymax-ymin));
269271
xmin=xcenter-width;
270272
ymin=ycenter-height;
271273
xmax=xcenter+width;

src/demos/segraph/Graph.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class Graph:public QWidget
9090
//! Draw y-axis
9191
void drawY(QPainter& painter,int power,bool label=false);
9292
//! Draw graph
93-
void paintEvent(QPaintEvent */*event*/);
93+
void paintEvent(QPaintEvent * /*event*/);
9494
//! Plot a single function
9595
void plot(QPainter& painter,int funcId);
9696

0 commit comments

Comments
 (0)