Add -fPIC -std=c++11 + don't set font pool
authorDmitriy Morozov <dmitriy@mrzv.org>
Mon, 04 Jan 2016 22:35:58 -0800
changeset 21 b714decd7d5b
parent 20 5c5b7b225081
child 22 c62a23291b60
Add -fPIC -std=c++11 + don't set font pool
Makefile
canvasview.cpp
mainwindow.cpp
--- a/Makefile	Wed Nov 04 10:45:32 2015 -0800
+++ b/Makefile	Mon Jan 04 22:35:58 2016 -0800
@@ -4,7 +4,7 @@
 
 CXX=g++
 
-QT_CFLAGS = -I/usr/include/qt/QtGui -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtCore -I/usr/include/qt
+QT_CFLAGS = -fPIC -std=c++11 -I/usr/include/qt/QtGui -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtCore -I/usr/include/qt
 QT_LIBS = -lQt5Gui -lQt5Core -lQt5Widgets
 CPPFLAGS += $(QT_CFLAGS)
 LIBS += -lipecanvas -lipecairo -lipe $(QT_LIBS) $(CAIRO_LIBS)
--- a/canvasview.cpp	Wed Nov 04 10:45:32 2015 -0800
+++ b/canvasview.cpp	Mon Jan 04 22:35:58 2016 -0800
@@ -101,7 +101,7 @@
     iDoc = doc;
 
     // iDoc->page(iPageNo)->setSelect(0, EPrimarySelected);
-    iCanvas->setFontPool(iDoc->fontPool());
+    //iCanvas->setFontPool(iDoc->fontPool());
     iCanvas->setPage(iDoc->page(iPageNo), iPageNo, iViewNo, iDoc->cascade());
     iCanvas->setPan(Vector(300, 400));
     static_cast<CanvasBase*>(iCanvas)->update();
--- a/mainwindow.cpp	Wed Nov 04 10:45:32 2015 -0800
+++ b/mainwindow.cpp	Mon Jan 04 22:35:58 2016 -0800
@@ -198,8 +198,8 @@
     iViewNo = 0;
 
     // iDoc->page(iPageNo)->setSelect(0, EPrimarySelected);
-    currentViewCanvas->setFontPool(iDoc->fontPool());
-    nextViewCanvas->setFontPool(iDoc->fontPool());
+    //currentViewCanvas->setFontPool(iDoc->fontPool());
+    //nextViewCanvas->setFontPool(iDoc->fontPool());
 
     currentViewCanvas->setPage(iDoc->page(iPageNo), iPageNo, iViewNo, iDoc->cascade());
     currentViewCanvas->setPan(Vector(300, 400));