springmeyer

Index: include/mapnik/timer.hpp
===================================================================
--- include/mapnik/timer.hpp	(revision 3246)
+++ include/mapnik/timer.hpp	(working copy)
@@ -40,14 +40,14 @@
 
     void restart() 
     {   
-        _wall_clock_end = NULL;
-        _cpu_end = NULL;

springmeyer

include/mapnik/timer.hpp:59:13: error: member function 'stop' not viable: 'this' argument has type 'const mapnik::timer', but function
      is not marked const
            stop();
            ^~~~
include/mapnik/timer.hpp:49:18: note: 'stop' declared here
    virtual void stop()
                 ^
include/mapnik/timer.hpp:68:13: error: member function 'stop' not viable: 'this' argument has type 'const mapnik::timer', but function
      is not marked const
            stop();

springmeyer

2 core 2.66 Ghz mac:

$ nik2img.py tests/data/good_maps/agg_poly_gamma_map.xml t.png

//-- starting rendering timer...
8.95ms (cpu 8.24ms)         | rendering style #1 for layer: 'world' and style 'style'
9.04ms (cpu 8.34ms)         | rendering total for layer: 'world'
percent rendered: 96.3265% - 236 rendered for 245 queried for  layer 'world' and style 'style'
9.13ms (cpu 8.42ms)         | total map rendering
//-- rendering timer stopped...

springmeyer

<!-- renders: http://cl.ly/0t3p3D0a320x0I0M2o2S -->

<Map srs="+init=epsg:4269">

    <Style name="terrain">
        <Rule>
          <RasterSymbolizer>
            <!-- http://trac.mapnik.org/wiki/RasterColorizer -->
            <RasterColorizer default-mode="linear">
              <stop color="#35A86E" value = "1003"/>

springmeyer

Index: generate_tiles.py
===================================================================
--- generate_tiles.py	(revision 26571)
+++ generate_tiles.py	(working copy)
@@ -1,15 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 from math import pi,cos,sin,log,exp,atan
 from subprocess import call
 import sys, os

springmeyer

$ svn st
?      mapnik/results/jmeter_summary.txt
?      qgisms/qgisms-vector-3857-seed-pg.jmx
?      qgisms/qgisms-vector-3857-pg.jmx
A      qgisms
A  +   qgisms/servername-vector-3857-seed-pg.jmx
A  +   qgisms/servername-vector-3857-pg.jmx
?      mapserver/results
?      mapserver/windows
?      mapserver/csv

springmeyer

# After updating to svn r139135 from r138729 I'm now seeing:

[ 2/17] cxx: src/mapnik_map.cpp -> build/default/src/mapnik_map_1.o
clang: warning: argument unused during compilation: '-compatibility_version 1'
clang: warning: argument unused during compilation: '-current_version 1'
0  clang             0x0000000101283c32 llvm::SmallVectorImpl<llvm_regmatch_t>::resize(unsigned int) + 2498
1  clang             0x0000000101284229 llvm::SmallVectorImpl<llvm_regmatch_t>::resize(unsigned int) + 4025
2  libSystem.B.dylib 0x00007fff8304e1ba _sigtramp + 26
3  libSystem.B.dylib 0x0000000101a8ca00 _sigtramp + 2124671072
4  clang             0x00000001011e09da llvm::StringMapEntry<llvm::MDString*>& llvm::StringMap<llvm::MDString*, llvm::MallocAllocator>::GetOrCreateValue<llvm::MDString*>(llvm::StringRef, llvm::MDString*) + 42

springmeyer

Index: include/mapnik/palette.hpp
===================================================================
--- include/mapnik/palette.hpp	(revision 3274)
+++ include/mapnik/palette.hpp	(working copy)
@@ -161,8 +161,6 @@
     std::vector<unsigned> alpha_pal_;
 };
 
-static rgba_palette _rgba_palette;

springmeyer

Index: plugins/input/sqlite/sqlite_datasource.cpp
===================================================================
--- plugins/input/sqlite/sqlite_datasource.cpp	(revision 3280)
+++ plugins/input/sqlite/sqlite_datasource.cpp	(working copy)
@@ -632,11 +632,12 @@
               Use rtree to limit record id's to a given bbox
               then a btree to pull the records for those ids.        
            */
+
            std::ostringstream spatial_sql;

springmeyer

Setup:

  sudo opcontrol --reset
  sudo opcontrol --separate=lib --separate=library
  sudo opcontrol --start


Then after running:

  sudo opcontrol --stop