Changeset 90


Ignore:
Timestamp:
Jun 3, 2009, 11:25:36 PM (5 years ago)
Author:
simon
Message:

use MemphisMap? in main.c

Location:
branches/client-library-split
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/client-library-split/SConstruct

    r88 r90  
    4141    'textpath.c', 
    4242    'mlib.c', 
    43     'memphis-data-pool.c' 
     43    'memphis-data-pool.c', 
     44    'memphis-map.c', 
     45    'memphis-rule-set.c', 
     46    'memphis-renderer.c' 
    4447] 
    4548 
  • branches/client-library-split/main.c

    r88 r90  
    164164        return(-1); 
    165165 
    166     osm = (osmFile *) osmRead(opts->osmfn, opts->debug); 
    167     if(ruleset == NULL) 
     166    //osm = (osmFile *) osmRead(opts->osmfn, opts->debug); 
     167    MemphisMap *map = memphis_map_new_from_file (opts->osmfn); 
     168    if(map == NULL) 
    168169        return(-1); 
    169170 
    170     renderCairo(ruleset, osm); 
     171    renderCairo(ruleset, map->map); 
    171172 
    172     osmFree(osm); 
     173    memphis_map_free (map); 
    173174    rulesetFree(ruleset); 
    174175 
  • branches/client-library-split/memphis-map.h

    r87 r90  
    4545typedef struct { 
    4646  GObject parent; 
    47   struct osmFile_ *map; // FIXME: osmFile *map; 
     47  osmFile *map; 
    4848  gint8 debug_level; 
    4949/* 0: Be quiet 
  • branches/client-library-split/memphis.h

    r82 r90  
    2323#include "memphis-rule-set.h" 
    2424#include "memphis-renderer.h" 
     25#include "memphis-data-pool.h" 
Note: See TracChangeset for help on using the changeset viewer.