Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #276 from jmakovicka/64bitfix

Browse source 
minor fixes for 64 bit linux build
This commit is contained in:
vshcherb 2012-07-11 14:58:50 -07:00
commit 1622f20d4a
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Osmand-kernel/Makefile.vars
View file

@ -133,6 +133,9 @@ ifeq ($(ARCH),)
ARCH := i386
else
ARCH := $(shell uname -i)
ifeq ($(ARCH),unknown)
ARCH := $(shell uname -m)
endif
endif
endif
@ -142,9 +145,9 @@ ifeq ($(ARCH),i386)
CXXFLAGS += -m32
LDFLAGS += -m32
else ifeq ($(ARCH),x86_64)
CFLAGS += -m64
CXXFLAGS += -m64
LDFLAGS += -m64
CFLAGS += -m64 -fPIC
CXXFLAGS += -m64 -fPIC
LDFLAGS += -m64 -fPIC
else ifeq ($(ARCH),armv6)
else
$(error Undefined ARCH $(ARCH))

28
Osmand-kernel/osmand/src/rendering.cpp
View file

@ -261,10 +261,16 @@ SkPaint* oneWayPaint(){
}
void drawOneWayPaints(RenderingContext* rc, SkCanvas* cv, SkPath* p, int oneway) {
if (oneWayPaints.size() == 0) {
SkPathEffect* arrowDashEffect1 = new SkDashPathEffect((float []) {0, 12, 10, 152}, 4, 0);
SkPathEffect* arrowDashEffect2 = new SkDashPathEffect((float[]) {0, 12, 9, 153}, 4, 1);
SkPathEffect* arrowDashEffect3 = new SkDashPathEffect((float[]) {0, 18, 2, 154}, 4, 1);
SkPathEffect* arrowDashEffect4 = new SkDashPathEffect((float[]) {0, 18, 1, 155}, 4, 1);
const float intervals_oneway[4][4] = {
{0, 12, 10, 152},
{0, 12, 9, 153},
{0, 18, 2, 154},
{0, 18, 1, 155}
};
SkPathEffect* arrowDashEffect1 = new SkDashPathEffect(intervals_oneway[0], 4, 0);
SkPathEffect* arrowDashEffect2 = new SkDashPathEffect(intervals_oneway[1], 4, 1);
SkPathEffect* arrowDashEffect3 = new SkDashPathEffect(intervals_oneway[2], 4, 1);
SkPathEffect* arrowDashEffect4 = new SkDashPathEffect(intervals_oneway[3], 4, 1);
SkPaint* p = oneWayPaint();
p->setStrokeWidth(1);
@ -291,10 +297,16 @@ void drawOneWayPaints(RenderingContext* rc, SkCanvas* cv, SkPath* p, int oneway)
delete p;
}
if (reverseWayPaints.size() == 0) {
SkPathEffect* arrowDashEffect1 = new SkDashPathEffect((float []) {0, 12, 10, 152}, 4, 0);
SkPathEffect* arrowDashEffect2 = new SkDashPathEffect((float[]) {0, 13, 9, 152}, 4, 1);
SkPathEffect* arrowDashEffect3 = new SkDashPathEffect((float[]) {0, 14, 2, 158}, 4, 1);
SkPathEffect* arrowDashEffect4 = new SkDashPathEffect((float[]) {0, 15, 1, 158}, 4, 1);
const float intervals_reverse[4][4] = {
{0, 12, 10, 152},
{0, 13, 9, 152},
{0, 14, 2, 158},
{0, 15, 1, 158}
};
SkPathEffect* arrowDashEffect1 = new SkDashPathEffect(intervals_reverse[0], 4, 0);
SkPathEffect* arrowDashEffect2 = new SkDashPathEffect(intervals_reverse[1], 4, 1);
SkPathEffect* arrowDashEffect3 = new SkDashPathEffect(intervals_reverse[2], 4, 1);
SkPathEffect* arrowDashEffect4 = new SkDashPathEffect(intervals_reverse[3], 4, 1);
SkPaint* p = oneWayPaint();
p->setStrokeWidth(1);
p->setPathEffect(arrowDashEffect1)->unref();