Menu
▾
▴
navit-cvs-commit — CVS commit mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
(59) |
Sep
(43) |
Oct
(95) |
Nov
(135) |
Dec
(108) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(229) |
Feb
(141) |
Mar
(59) |
Apr
(70) |
May
(64) |
Jun
(87) |
Jul
(57) |
Aug
(108) |
Sep
(74) |
Oct
(203) |
Nov
(141) |
Dec
(108) |
| 2009 |
Jan
(114) |
Feb
(91) |
Mar
(101) |
Apr
(69) |
May
(54) |
Jun
(82) |
Jul
(49) |
Aug
(109) |
Sep
(81) |
Oct
(93) |
Nov
(100) |
Dec
(79) |
| 2010 |
Jan
(46) |
Feb
(36) |
Mar
(135) |
Apr
(103) |
May
(116) |
Jun
(130) |
Jul
(52) |
Aug
(31) |
Sep
(46) |
Oct
(48) |
Nov
(98) |
Dec
(110) |
| 2011 |
Jan
(234) |
Feb
(184) |
Mar
(150) |
Apr
(43) |
May
(53) |
Jun
(52) |
Jul
(112) |
Aug
(72) |
Sep
(79) |
Oct
(23) |
Nov
(6) |
Dec
(30) |
| 2012 |
Jan
(39) |
Feb
(37) |
Mar
(49) |
Apr
(60) |
May
(63) |
Jun
(38) |
Jul
(33) |
Aug
(24) |
Sep
(20) |
Oct
(14) |
Nov
(23) |
Dec
(50) |
| 2013 |
Jan
(30) |
Feb
(32) |
Mar
(27) |
Apr
(41) |
May
(59) |
Jun
(21) |
Jul
(10) |
Aug
(73) |
Sep
(23) |
Oct
(60) |
Nov
(14) |
Dec
(15) |
| 2014 |
Jan
(4) |
Feb
(8) |
Mar
(11) |
Apr
(6) |
May
(27) |
Jun
(4) |
Jul
(29) |
Aug
(62) |
Sep
(11) |
Oct
(17) |
Nov
(58) |
Dec
(9) |
| 2015 |
Jan
(23) |
Feb
(3) |
Mar
(26) |
Apr
(47) |
May
(8) |
Jun
(28) |
Jul
(10) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sl...@us...> - 2013-08-19 19:57:01
|
Revision: 5580
http://sourceforge.net/p/navit/code/5580
Author: sleske
Date: 2013-08-19 19:56:58 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
Fix:core:Fix warning for undeclared use of textdomain.
Modified Paths:
--------------
trunk/navit/navit/main.c
trunk/navit/navit/navit_nls.c
trunk/navit/navit/navit_nls.h
trunk/navit/navit/start_real.c
Modified: trunk/navit/navit/main.c
===================================================================
--- trunk/navit/navit/main.c 2013-08-19 19:56:48 UTC (rev 5579)
+++ trunk/navit/navit/main.c 2013-08-19 19:56:58 UTC (rev 5580)
@@ -412,16 +412,3 @@
}
}
-void
-main_init_nls(void)
-{
-#ifdef USE_NATIVE_LANGUAGE_SUPPORT
-#ifdef FORCE_LOCALE
-#define STRINGIFY2(x) #x
-#define STRINGIFY(x) STRINGIFY2(x)
- setlocale(LC_MESSAGES,STRINGIFY(FORCE_LOCALE));
-#endif
- navit_nls_add_textdomain(PACKAGE, getenv("NAVIT_LOCALEDIR"));
- textdomain(PACKAGE);
-#endif
-}
Modified: trunk/navit/navit/navit_nls.c
===================================================================
--- trunk/navit/navit/navit_nls.c 2013-08-19 19:56:48 UTC (rev 5579)
+++ trunk/navit/navit/navit_nls.c 2013-08-19 19:56:58 UTC (rev 5580)
@@ -1,6 +1,10 @@
#include "config.h"
#include "debug.h"
#include <glib.h>
+#include <stdlib.h>
+#ifdef HAVE_API_WIN32_CE
+#include "libc.h"
+#endif
#ifdef USE_LIBGNUINTL
#include <libgnuintl.h>
@@ -73,3 +77,17 @@
return msgid_plural;
}
}
+
+void
+navit_nls_main_init(void)
+{
+#ifdef USE_NATIVE_LANGUAGE_SUPPORT
+#ifdef FORCE_LOCALE
+#define STRINGIFY2(x) #x
+#define STRINGIFY(x) STRINGIFY2(x)
+ setlocale(LC_MESSAGES,STRINGIFY(FORCE_LOCALE));
+#endif
+ navit_nls_add_textdomain(PACKAGE, getenv("NAVIT_LOCALEDIR"));
+ textdomain(PACKAGE);
+#endif
+}
Modified: trunk/navit/navit/navit_nls.h
===================================================================
--- trunk/navit/navit/navit_nls.h 2013-08-19 19:56:48 UTC (rev 5579)
+++ trunk/navit/navit/navit_nls.h 2013-08-19 19:56:58 UTC (rev 5580)
@@ -4,6 +4,7 @@
char *navit_nls_remove_textdomain(const char *package);
const char *navit_nls_gettext(const char *msgid);
const char *navit_nls_ngettext(const char *msgid, const char *msgid_plural, unsigned long int n);
+void navit_nls_main_init(void);
#define _(STRING) navit_nls_gettext(STRING)
#define gettext_noop(String) String
Modified: trunk/navit/navit/start_real.c
===================================================================
--- trunk/navit/navit/start_real.c 2013-08-19 19:56:48 UTC (rev 5579)
+++ trunk/navit/navit/start_real.c 2013-08-19 19:56:58 UTC (rev 5580)
@@ -90,7 +90,7 @@
#endif
atom_init();
main_init(argv[0]);
- main_init_nls();
+ navit_nls_main_init();
debug_init(argv[0]);
cp = getenv("NAVIT_LOGFILE");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-19 19:56:50
|
Revision: 5579
http://sourceforge.net/p/navit/code/5579
Author: sleske
Date: 2013-08-19 19:56:48 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
Fix:graphics/qt_qpainter:Fix warnings for treating string literals as writable.
Modified Paths:
--------------
trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
Modified: trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
===================================================================
--- trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp 2013-08-19 19:56:34 UTC (rev 5578)
+++ trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp 2013-08-19 19:56:48 UTC (rev 5579)
@@ -607,7 +607,7 @@
static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h,int alpha, int wraparound);
static int argc=1;
-static char *argv[]={(char *)"navit",NULL,NULL};
+static char *argv[]={NULL,NULL,NULL};
static int
fullscreen(struct window *win, int on)
@@ -951,10 +951,13 @@
else
QApplication::setGraphicsSystem("raster");
#endif
+ argv[0]=(char*)malloc(255);
+ strcpy(argv[0], "navit");
if ((attr=attr_search(attrs, NULL, attr_flags)))
ret->flags=attr->u.num;
if (ret->flags & 1) {
- argv[1]="-qws";
+ argv[1]=(char*)malloc(255);
+ strcpy(argv[1], "-qws");
argc++;
}
#ifndef QT_QPAINTER_NO_APP
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-19 19:56:39
|
Revision: 5578
http://sourceforge.net/p/navit/code/5578
Author: sleske
Date: 2013-08-19 19:56:34 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
Fix:maptool:Fix warning about uninitialized variable.
Modified Paths:
--------------
trunk/navit/navit/maptool/osm.c
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2013-08-19 19:56:19 UTC (rev 5577)
+++ trunk/navit/navit/maptool/osm.c 2013-08-19 19:56:34 UTC (rev 5578)
@@ -1919,16 +1919,16 @@
attrs[a-2].u.str=name;
}
}
+ if(b->admin_centre && b->admin_centre==node_id) {
+ if(!max_adm_level || max_adm_level<a){
+ max_adm_level=a;
+ }
+ }
}
if (postal) {
attrs[0].type=attr_town_postal;
attrs[0].u.str=postal;
}
- if(b->admin_centre && b->admin_centre==node_id) {
- if(!max_adm_level || max_adm_level<a)
- max_adm_level=a;
- }
-
l=g_list_next(l);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-19 19:56:24
|
Revision: 5577
http://sourceforge.net/p/navit/code/5577
Author: sleske
Date: 2013-08-19 19:56:19 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
Fix:core:Fix warnings by using xml_context* instead of void*.|Replaces provisional fix from rev.5576.
Modified Paths:
--------------
trunk/navit/navit/gui/internal/gui_internal_html.c
trunk/navit/navit/xmlconfig.c
trunk/navit/navit/xmlconfig.h
Modified: trunk/navit/navit/gui/internal/gui_internal_html.c
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal_html.c 2013-08-13 22:00:32 UTC (rev 5576)
+++ trunk/navit/navit/gui/internal/gui_internal_html.c 2013-08-19 19:56:19 UTC (rev 5577)
@@ -46,8 +46,8 @@
while (*names) {
if (!g_ascii_strcasecmp(*names, name))
return *values;
- names+=xml_attr_distance;
- values+=xml_attr_distance;
+ names+=XML_ATTR_DISTANCE;
+ values+=XML_ATTR_DISTANCE;
}
return NULL;
}
@@ -209,7 +209,7 @@
}
static void
-gui_internal_html_start(void *dummy, const char *tag_name, const char **names, const char **values, void *data, void *error)
+gui_internal_html_start(xml_context *dummy, const char *tag_name, const char **names, const char **values, void *data, GError **error)
{
struct gui_priv *this=data;
int i;
@@ -310,7 +310,7 @@
}
static void
-gui_internal_html_end(void *dummy, const char *tag_name, void *data, void *error)
+gui_internal_html_end(xml_context *dummy, const char *tag_name, void *data, GError **error)
{
struct gui_priv *this=data;
struct html *html;
@@ -401,7 +401,7 @@
}
static void
-gui_internal_html_text(void *dummy, const char *text, int len, void *data, void *error)
+gui_internal_html_text(xml_context *dummy, const char *text, gsize len, void *data, GError **error)
{
struct gui_priv *this=data;
struct widget *w;
Modified: trunk/navit/navit/xmlconfig.c
===================================================================
--- trunk/navit/navit/xmlconfig.c 2013-08-13 22:00:32 UTC (rev 5576)
+++ trunk/navit/navit/xmlconfig.c 2013-08-19 19:56:19 UTC (rev 5577)
@@ -27,7 +27,6 @@
#include <string.h>
#include <ctype.h>
#include "debug.h"
-#include "config.h"
#include "file.h"
#include "coord.h"
#include "item.h"
@@ -58,33 +57,6 @@
#define unsetenv(a) putenv(a "=")
#endif
-#ifndef USE_EZXML
-#ifdef HAVE_GLIB
-#define USE_EZXML 0
-#else
-#define USE_EZXML 1
-#endif
-#endif
-
-#if !USE_EZXML
-#define ATTR_DISTANCE 1
-const int xml_attr_distance=1;
-typedef GMarkupParseContext xml_context;
-#else
-#include "ezxml.h"
-const int xml_attr_distance=2;
-#define ATTR_DISTANCE 2
-#undef G_MARKUP_ERROR
-#undef G_MARKUP_ERROR_INVALID_CONTENT
-#undef G_MARKUP_ERROR_PARSE
-#undef G_MARKUP_ERROR_UNKNOWN_ELEMENT
-#define G_MARKUP_ERROR 0
-#define G_MARKUP_ERROR_INVALID_CONTENT 0
-#define G_MARKUP_ERROR_PARSE 0
-#define G_MARKUP_ERROR_UNKNOWN_ELEMENT 0
-typedef void * xml_context;
-#endif
-
struct xistate {
struct xistate *parent;
struct xistate *child;
@@ -960,15 +932,15 @@
struct xmldocument *doc=user_data;
struct xistate *xistate;
int i,count=0;
- while (attribute_names[count++*ATTR_DISTANCE]);
+ while (attribute_names[count++*XML_ATTR_DISTANCE]);
xistate=g_new0(struct xistate, 1);
xistate->element=element_name;
xistate->attribute_names=g_new0(const char *, count);
xistate->attribute_values=g_new0(const char *, count);
for (i = 0 ; i < count ; i++) {
- if (attribute_names[i*ATTR_DISTANCE] && attribute_values[i*ATTR_DISTANCE]) {
- xistate->attribute_names[i]=g_strdup(attribute_names[i*ATTR_DISTANCE]);
- xistate->attribute_values[i]=g_strdup(attribute_values[i*ATTR_DISTANCE]);
+ if (attribute_names[i*XML_ATTR_DISTANCE] && attribute_values[i*XML_ATTR_DISTANCE]) {
+ xistate->attribute_names[i]=g_strdup(attribute_names[i*XML_ATTR_DISTANCE]);
+ xistate->attribute_values[i]=g_strdup(attribute_values[i*XML_ATTR_DISTANCE]);
}
}
xistate->parent=doc->last;
@@ -1083,10 +1055,10 @@
#endif
void
-xml_parse_text(const char *document, void *data, void (*start)(void *, const char *, const char **, const char **, void *, void *),
- void (*end)(void *, const char *, void *, void *),
- void (*text)(void *, const char *, int, void *, void *))
-{
+xml_parse_text(const char *document, void *data,
+ void (*start)(xml_context *, const char *, const char **, const char **, void *, GError **),
+ void (*end)(xml_context *, const char *, void *, GError **),
+ void (*text)(xml_context *, const char *, gsize, void *, GError **)) {
#if !USE_EZXML
GMarkupParser parser = { start, end, text, NULL, NULL};
xml_context *context;
Modified: trunk/navit/navit/xmlconfig.h
===================================================================
--- trunk/navit/navit/xmlconfig.h 2013-08-13 22:00:32 UTC (rev 5576)
+++ trunk/navit/navit/xmlconfig.h 2013-08-19 19:56:19 UTC (rev 5577)
@@ -24,6 +24,33 @@
extern "C" {
#endif
+#include "config.h"
+
+#ifndef USE_EZXML
+#ifdef HAVE_GLIB
+#define USE_EZXML 0
+#else
+#define USE_EZXML 1
+#endif
+#endif
+
+#if !USE_EZXML
+#define XML_ATTR_DISTANCE 1
+typedef GMarkupParseContext xml_context;
+#else
+#include "ezxml.h"
+#define XML_ATTR_DISTANCE 2
+#undef G_MARKUP_ERROR
+#undef G_MARKUP_ERROR_INVALID_CONTENT
+#undef G_MARKUP_ERROR_PARSE
+#undef G_MARKUP_ERROR_UNKNOWN_ELEMENT
+#define G_MARKUP_ERROR 0
+#define G_MARKUP_ERROR_INVALID_CONTENT 0
+#define G_MARKUP_ERROR_PARSE 0
+#define G_MARKUP_ERROR_UNKNOWN_ELEMENT 0
+typedef void * xml_context;
+#endif
+
typedef void *(*object_func_new)(struct attr *parent, struct attr **attrs);
typedef int (*object_func_get_attr)(void *, enum attr_type type, struct attr *attr, struct attr_iter *iter);
typedef struct attr_iter *(*object_func_iter_new)(void *);
@@ -78,12 +105,10 @@
typedef GError xmlerror;
-extern const int xml_attr_distance;
-
/* prototypes */
enum attr_type;
struct object_func *object_func_lookup(enum attr_type type);
-void xml_parse_text(const char *document, void *data, void (*start)(void *, const char *, const char **, const char **, void *, void *), void (*end)(void *, const char *, void *, void *), void (*text)(void *, const char *, int, void *, void *));
+void xml_parse_text(const char *document, void *data, void (*start)(xml_context *, const char *, const char **, const char **, void *, GError **), void (*end)(xml_context *, const char *, void *, GError **), void (*text)(xml_context*, const char *, gsize, void *, GError **));
gboolean config_load(const char *filename, xmlerror **error);
//static void xinclude(GMarkupParseContext *context, const gchar **attribute_names, const gchar **attribute_values, struct xmldocument *doc_old, xmlerror **error);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-13 22:00:36
|
Revision: 5576
http://sourceforge.net/p/navit/code/5576
Author: sleske
Date: 2013-08-13 22:00:32 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
Fix:core:Partially revert rev. 5571 to fix builds which use support/glib.
Modified Paths:
--------------
trunk/navit/navit/gui/internal/gui_internal_html.c
trunk/navit/navit/xmlconfig.c
trunk/navit/navit/xmlconfig.h
Modified: trunk/navit/navit/gui/internal/gui_internal_html.c
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal_html.c 2013-08-11 22:39:54 UTC (rev 5575)
+++ trunk/navit/navit/gui/internal/gui_internal_html.c 2013-08-13 22:00:32 UTC (rev 5576)
@@ -209,7 +209,7 @@
}
static void
-gui_internal_html_start(GMarkupParseContext *dummy, const char *tag_name, const char **names, const char **values, void *data, GError **error)
+gui_internal_html_start(void *dummy, const char *tag_name, const char **names, const char **values, void *data, void *error)
{
struct gui_priv *this=data;
int i;
@@ -310,7 +310,7 @@
}
static void
-gui_internal_html_end(GMarkupParseContext *dummy, const char *tag_name, void *data, GError **error)
+gui_internal_html_end(void *dummy, const char *tag_name, void *data, void *error)
{
struct gui_priv *this=data;
struct html *html;
@@ -401,7 +401,7 @@
}
static void
-gui_internal_html_text(GMarkupParseContext *dummy, const char *text, gsize len, void *data, GError **error)
+gui_internal_html_text(void *dummy, const char *text, int len, void *data, void *error)
{
struct gui_priv *this=data;
struct widget *w;
Modified: trunk/navit/navit/xmlconfig.c
===================================================================
--- trunk/navit/navit/xmlconfig.c 2013-08-11 22:39:54 UTC (rev 5575)
+++ trunk/navit/navit/xmlconfig.c 2013-08-13 22:00:32 UTC (rev 5576)
@@ -1083,10 +1083,10 @@
#endif
void
-xml_parse_text(const char *document, void *data,
- void (*start)(GMarkupParseContext *, const char *, const char **, const char **, void *, GError **),
- void (*end)(GMarkupParseContext *, const char *, void *, GError **),
- void (*text)(GMarkupParseContext*, const char *, gsize, void *, GError **)) {
+xml_parse_text(const char *document, void *data, void (*start)(void *, const char *, const char **, const char **, void *, void *),
+ void (*end)(void *, const char *, void *, void *),
+ void (*text)(void *, const char *, int, void *, void *))
+{
#if !USE_EZXML
GMarkupParser parser = { start, end, text, NULL, NULL};
xml_context *context;
Modified: trunk/navit/navit/xmlconfig.h
===================================================================
--- trunk/navit/navit/xmlconfig.h 2013-08-11 22:39:54 UTC (rev 5575)
+++ trunk/navit/navit/xmlconfig.h 2013-08-13 22:00:32 UTC (rev 5576)
@@ -83,7 +83,7 @@
/* prototypes */
enum attr_type;
struct object_func *object_func_lookup(enum attr_type type);
-void xml_parse_text(const char *document, void *data, void (*start)(GMarkupParseContext *, const char *, const char **, const char **, void *, GError **), void (*end)(GMarkupParseContext *, const char *, void *, GError **), void (*text)(GMarkupParseContext*, const char *, gsize, void *, GError **));
+void xml_parse_text(const char *document, void *data, void (*start)(void *, const char *, const char **, const char **, void *, void *), void (*end)(void *, const char *, void *, void *), void (*text)(void *, const char *, int, void *, void *));
gboolean config_load(const char *filename, xmlerror **error);
//static void xinclude(GMarkupParseContext *context, const gchar **attribute_names, const gchar **attribute_values, struct xmldocument *doc_old, xmlerror **error);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-11 22:39:57
|
Revision: 5575
http://sourceforge.net/p/navit/code/5575
Author: sleske
Date: 2013-08-11 22:39:54 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Fix:core:Fix buffer overflow in drawing code.
Modified Paths:
--------------
trunk/navit/navit/graphics.c
Modified: trunk/navit/navit/graphics.c
===================================================================
--- trunk/navit/navit/graphics.c 2013-08-11 20:26:52 UTC (rev 5574)
+++ trunk/navit/navit/graphics.c 2013-08-11 22:39:54 UTC (rev 5575)
@@ -1613,7 +1613,7 @@
draw_begin(&ctx,&pnt[i]);
}
}
- draw_shape(&ctx, pnt+count-1, *width++);
+ ctx.prev_shape=ctx.shape;
draw_end(&ctx,&pnt[count-1]);
ctx.res[ctx.npos]=ctx.res[ctx.ppos-1];
draw(gra_priv, gc_priv, ctx.res+ctx.npos, ctx.ppos-ctx.npos);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-11 20:26:54
|
Revision: 5574
http://sourceforge.net/p/navit/code/5574
Author: sleske
Date: 2013-08-11 20:26:52 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Fix:core:Fix last const warnings by casting. Ugly, but the best solution right now.|Concludes #1154. Now we build without warnings under -Wall, yeah!
Modified Paths:
--------------
trunk/navit/navit/country.c
trunk/navit/navit/vehicle.c
Modified: trunk/navit/navit/country.c
===================================================================
--- trunk/navit/navit/country.c 2013-08-11 20:26:37 UTC (rev 5573)
+++ trunk/navit/navit/country.c 2013-08-11 20:26:52 UTC (rev 5574)
@@ -30,10 +30,10 @@
struct country {
int id;
- char *car;
- char *iso2;
- char *iso3;
- char *name;
+ const char *car;
+ const char *iso2;
+ const char *iso3;
+ const char *name;
};
/* List of all known countries and their codes.
@@ -317,8 +317,10 @@
return 1;
}
return 0;
+ // Cast to char* necessary but safe, because our callers know
+ // not to modify attr->u.str (hopefully).
case attr_label:
- attr->u.str=navit_nls_gettext(country->name);
+ attr->u.str=(char*)navit_nls_gettext(country->name);
this_->attr_next=attr_country_id;
return 1;
case attr_country_id:
@@ -326,19 +328,19 @@
this_->attr_next=country->car ? attr_country_car : attr_country_iso2;
return 1;
case attr_country_car:
- attr->u.str=country->car;
+ attr->u.str=(char*)country->car;
this_->attr_next=attr_country_iso2;
return attr->u.str ? 1 : 0;
case attr_country_iso2:
- attr->u.str=country->iso2;
+ attr->u.str=(char*)country->iso2;
this_->attr_next=attr_country_iso3;
return 1;
case attr_country_iso3:
- attr->u.str=country->iso3;
+ attr->u.str=(char*)country->iso3;
this_->attr_next=attr_country_name;
return 1;
case attr_country_name:
- attr->u.str=navit_nls_gettext(country->name);
+ attr->u.str=(char*)navit_nls_gettext(country->name);
this_->attr_next=attr_none;
return 1;
default:
Modified: trunk/navit/navit/vehicle.c
===================================================================
--- trunk/navit/navit/vehicle.c 2013-08-11 20:26:37 UTC (rev 5573)
+++ trunk/navit/navit/vehicle.c 2013-08-11 20:26:52 UTC (rev 5574)
@@ -391,7 +391,8 @@
struct attr default_name;
if (!attr_search(this_->attrs, NULL, attr_name)) {
default_name.type=attr_name;
- default_name.u.str=_("Unnamed vehicle");
+ // Safe cast: attr_generic_set_attr does not modify its parameter.
+ default_name.u.str=(char*)_("Unnamed vehicle");
this_->attrs=attr_generic_set_attr(this_->attrs, &default_name);
dbg(0, "Incomplete vehicle definition: missing attribute 'name'. Default name set.\n");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-11 20:26:43
|
Revision: 5573
http://sourceforge.net/p/navit/code/5573
Author: sleske
Date: 2013-08-11 20:26:37 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Fix:core:Fix const warnings.|Part of #1154.
Modified Paths:
--------------
trunk/navit/navit/gui/gtk/datawindow.c
trunk/navit/navit/gui/gtk/gui_gtk.h
trunk/navit/navit/gui/gtk/gui_gtk_statusbar.c
trunk/navit/navit/gui.c
trunk/navit/navit/gui.h
trunk/navit/navit/messages.c
trunk/navit/navit/messages.h
trunk/navit/navit/navigation.c
trunk/navit/navit/navit.c
trunk/navit/navit/navit.h
trunk/navit/navit/param.c
trunk/navit/navit/param.h
Modified: trunk/navit/navit/gui/gtk/datawindow.c
===================================================================
--- trunk/navit/navit/gui/gtk/datawindow.c 2013-08-11 20:26:25 UTC (rev 5572)
+++ trunk/navit/navit/gui/gtk/datawindow.c 2013-08-11 20:26:37 UTC (rev 5573)
@@ -182,7 +182,7 @@
};
struct datawindow_priv *
-gui_gtk_datawindow_new(struct gui_priv *gui, char *name, struct callback *click, struct callback *close, struct datawindow_methods *meth)
+gui_gtk_datawindow_new(struct gui_priv *gui, const char *name, struct callback *click, struct callback *close, struct datawindow_methods *meth)
{
struct datawindow_priv *win;
Modified: trunk/navit/navit/gui/gtk/gui_gtk.h
===================================================================
--- trunk/navit/navit/gui/gtk/gui_gtk.h 2013-08-11 20:26:25 UTC (rev 5572)
+++ trunk/navit/navit/gui/gtk/gui_gtk.h 2013-08-11 20:26:37 UTC (rev 5573)
@@ -56,7 +56,7 @@
struct menu_priv *gui_gtk_menubar_new(struct gui_priv *gui, struct menu_methods *meth);
struct statusbar_priv *gui_gtk_statusbar_new(struct gui_priv *gui);
struct menu_priv *gui_gtk_popup_new(struct gui_priv *gui, struct menu_methods *meth);
-struct datawindow_priv *gui_gtk_datawindow_new(struct gui_priv *gui, char *name, struct callback *click, struct callback *close, struct datawindow_methods *meth);
+struct datawindow_priv *gui_gtk_datawindow_new(struct gui_priv *gui, const char *name, struct callback *click, struct callback *close, struct datawindow_methods *meth);
void gui_gtk_datawindow_destroy(struct datawindow_priv *win);
void gui_gtk_datawindow_set_button(struct datawindow_priv *this_, GtkWidget *btn);
Modified: trunk/navit/navit/gui/gtk/gui_gtk_statusbar.c
===================================================================
--- trunk/navit/navit/gui/gtk/gui_gtk_statusbar.c 2013-08-11 20:26:25 UTC (rev 5572)
+++ trunk/navit/navit/gui/gtk/gui_gtk_statusbar.c 2013-08-11 20:26:37 UTC (rev 5573)
@@ -68,7 +68,7 @@
}
#endif
-static char *status_fix2str(int type)
+static const char *status_fix2str(int type)
{
switch(type) {
case 0: return _("No");
@@ -94,8 +94,8 @@
double lng, lat, direction=0, height=0, speed=0, hdop=0;
int sats=0, qual=0;
int status=0;
- char *dirs[]={_("N"),_("NE"),_("E"),_("SE"),_("S"),_("SW"),_("W"),_("NW"),_("N")};
- char *dir;
+ const char *dirs[]={_("N"),_("NE"),_("E"),_("SE"),_("S"),_("SW"),_("W"),_("NW"),_("N")};
+ const char *dir;
int dir_idx;
if (navit)
Modified: trunk/navit/navit/gui.c
===================================================================
--- trunk/navit/navit/gui.c 2013-08-11 20:26:25 UTC (rev 5572)
+++ trunk/navit/navit/gui.c 2013-08-11 20:26:37 UTC (rev 5573)
@@ -127,7 +127,7 @@
}
struct datawindow *
-gui_datawindow_new(struct gui *gui, char *name, struct callback *click, struct callback *close)
+gui_datawindow_new(struct gui *gui, const char *name, struct callback *click, struct callback *close)
{
struct datawindow *this_;
if (! gui->meth.datawindow_new)
Modified: trunk/navit/navit/gui.h
===================================================================
--- trunk/navit/navit/gui.h 2013-08-11 20:26:25 UTC (rev 5572)
+++ trunk/navit/navit/gui.h 2013-08-11 20:26:37 UTC (rev 5573)
@@ -37,7 +37,7 @@
struct menu_priv *(*popup_new)(struct gui_priv *priv, struct menu_methods *meth);
int (*set_graphics)(struct gui_priv *priv, struct graphics *gra);
int (*run_main_loop)(struct gui_priv *priv);
- struct datawindow_priv *(*datawindow_new)(struct gui_priv *priv, char *name, struct callback *click, struct callback *close, struct datawindow_methods *meth);
+ struct datawindow_priv *(*datawindow_new)(struct gui_priv *priv, const char *name, struct callback *click, struct callback *close, struct datawindow_methods *meth);
int (*add_bookmark)(struct gui_priv *priv, struct pcoord *c, char *description);
void (*disable_suspend)(struct gui_priv *priv);
int (*get_attr)(struct gui_priv *priv, enum attr_type type, struct attr *attr);
@@ -62,7 +62,7 @@
int gui_add_attr(struct gui *this_, struct attr *attr);
struct menu *gui_menubar_new(struct gui *gui);
struct menu *gui_popup_new(struct gui *gui);
-struct datawindow *gui_datawindow_new(struct gui *gui, char *name, struct callback *click, struct callback *close);
+struct datawindow *gui_datawindow_new(struct gui *gui, const char *name, struct callback *click, struct callback *close);
int gui_add_bookmark(struct gui *gui, struct pcoord *c, char *description);
int gui_set_graphics(struct gui *this_, struct graphics *gra);
void gui_disable_suspend(struct gui *this_);
Modified: trunk/navit/navit/messages.c
===================================================================
--- trunk/navit/navit/messages.c 2013-08-11 20:26:25 UTC (rev 5572)
+++ trunk/navit/navit/messages.c 2013-08-11 20:26:37 UTC (rev 5573)
@@ -34,7 +34,7 @@
};
int
-message_new(struct messagelist *this_, char *message)
+message_new(struct messagelist *this_, const char *message)
{
struct message *msg;
Modified: trunk/navit/navit/messages.h
===================================================================
--- trunk/navit/navit/messages.h 2013-08-11 20:26:25 UTC (rev 5572)
+++ trunk/navit/navit/messages.h 2013-08-11 20:26:37 UTC (rev 5573)
@@ -32,7 +32,7 @@
/* Prototypes */
struct attr;
-int message_new(struct messagelist *this_, char *message);
+int message_new(struct messagelist *this_, const char *message);
int message_delete(struct messagelist *this_, int mid);
struct messagelist *messagelist_new(struct attr **attrs);
void messagelist_init(struct messagelist *this_);
Modified: trunk/navit/navit/navigation.c
===================================================================
--- trunk/navit/navit/navigation.c 2013-08-11 20:26:25 UTC (rev 5572)
+++ trunk/navit/navit/navigation.c 2013-08-11 20:26:37 UTC (rev 5573)
@@ -315,7 +315,7 @@
return ret;
}
-static char
+static const char
*get_count_str(int n)
{
switch (n) {
@@ -339,7 +339,7 @@
}
}
-static char
+static const char
*get_exit_count_str(int n)
{
switch (n) {
@@ -1525,7 +1525,7 @@
show_maneuver(struct navigation *nav, struct navigation_itm *itm, struct navigation_command *cmd, enum attr_type type, int connect)
{
/* TRANSLATORS: right, as in 'Turn right' */
- char *dir=_("right"),*strength="";
+ const char *dir=_("right"),*strength="";
int distance=itm->dest_length-cmd->itm->dest_length;
char *d,*ret=NULL;
int delta=cmd->delta;
Modified: trunk/navit/navit/navit.c
===================================================================
--- trunk/navit/navit/navit.c 2013-08-11 20:26:25 UTC (rev 5572)
+++ trunk/navit/navit/navit.c 2013-08-11 20:26:37 UTC (rev 5573)
@@ -1447,7 +1447,7 @@
}
void
-navit_add_message(struct navit *this_, char *message)
+navit_add_message(struct navit *this_, const char *message)
{
message_new(this_->messages, message);
}
@@ -1816,7 +1816,7 @@
}
void
-navit_say(struct navit *this_, char *text)
+navit_say(struct navit *this_, const char *text)
{
struct attr attr;
if(this_->speech) {
Modified: trunk/navit/navit/navit.h
===================================================================
--- trunk/navit/navit/navit.h 2013-08-11 20:26:25 UTC (rev 5572)
+++ trunk/navit/navit/navit.h 2013-08-11 20:26:37 UTC (rev 5573)
@@ -72,7 +72,7 @@
void navit_zoom_in_cursor(struct navit *this_, int factor);
void navit_zoom_out_cursor(struct navit *this_, int factor);
struct navit *navit_new(struct attr *parent, struct attr **attrs);
-void navit_add_message(struct navit *this_, char *message);
+void navit_add_message(struct navit *this_, const char *message);
struct message *navit_get_messages(struct navit *this_);
struct graphics *navit_get_graphics(struct navit *this_);
struct vehicleprofile *navit_get_vehicleprofile(struct navit *this_);
@@ -91,7 +91,7 @@
void navit_textfile_debug_log(struct navit *this_, const char *fmt, ...);
void navit_textfile_debug_log_at(struct navit *this_, struct pcoord *pc, const char *fmt, ...);
int navit_speech_estimate(struct navit *this_, char *str);
-void navit_say(struct navit *this_, char *text);
+void navit_say(struct navit *this_, const char *text);
void navit_speak(struct navit *this_);
void navit_window_roadbook_destroy(struct navit *this_);
void navit_window_roadbook_new(struct navit *this_);
Modified: trunk/navit/navit/param.c
===================================================================
--- trunk/navit/navit/param.c 2013-08-11 20:26:25 UTC (rev 5572)
+++ trunk/navit/navit/param.c 2013-08-11 20:26:37 UTC (rev 5573)
@@ -23,13 +23,18 @@
#include "param.h"
void
-param_add_string(char *name, char *value, struct param_list **param, int *count)
+param_add_string(const char *name, const char *value, struct param_list **param, int *count)
{
+ char *param_name;
+ char *param_value;
if (*count > 0) {
- (*param)->name=malloc(strlen(value)+strlen(name)+2);
- (*param)->value=(*param)->name+strlen(name)+1;
- strcpy((*param)->name, name);
- strcpy((*param)->value, value);
+ param_name=malloc(strlen(value)+strlen(name)+2);
+ param_value=param_name+strlen(name)+1;
+ strcpy(param_name, name);
+ strcpy(param_value, value);
+ (*param)->name=param_name;
+ (*param)->value=param_value;
+
(*count)--;
(*param)++;
}
@@ -37,7 +42,7 @@
}
void
-param_add_dec(char *name, unsigned long value, struct param_list **param, int *count)
+param_add_dec(const char *name, unsigned long value, struct param_list **param, int *count)
{
char buffer[1024];
sprintf(buffer, "%ld", value);
@@ -46,7 +51,7 @@
void
-param_add_hex(char *name, unsigned long value, struct param_list **param, int *count)
+param_add_hex(const char *name, unsigned long value, struct param_list **param, int *count)
{
char buffer[1024];
sprintf(buffer, "0x%lx", value);
@@ -54,7 +59,7 @@
}
void
-param_add_hex_sig(char *name, long value, struct param_list **param, int *count)
+param_add_hex_sig(const char *name, long value, struct param_list **param, int *count)
{
char buffer[1024];
if (value < 0)
Modified: trunk/navit/navit/param.h
===================================================================
--- trunk/navit/navit/param.h 2013-08-11 20:26:25 UTC (rev 5572)
+++ trunk/navit/navit/param.h 2013-08-11 20:26:37 UTC (rev 5573)
@@ -21,14 +21,14 @@
#define NAVIT_PARAM_H
struct param_list {
- char *name;
- char *value;
+ const char *name;
+ const char *value;
};
-void param_add_string(char *name, char *value, struct param_list **param, int *count);
-void param_add_dec(char *name, unsigned long value, struct param_list **param, int *count);
-void param_add_hex(char *name, unsigned long value, struct param_list **param, int *count);
-void param_add_hex_sig(char *name, long value, struct param_list **param, int *count);
+void param_add_string(const char *name, const char *value, struct param_list **param, int *count);
+void param_add_dec(const char *name, unsigned long value, struct param_list **param, int *count);
+void param_add_hex(const char *name, unsigned long value, struct param_list **param, int *count);
+void param_add_hex_sig(const char *name, long value, struct param_list **param, int *count);
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-11 20:26:27
|
Revision: 5572
http://sourceforge.net/p/navit/code/5572
Author: sleske
Date: 2013-08-11 20:26:25 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Fix:core:Fix warnings by not using g_str(n)casecmp; new function navit_utf8_strcasecmp.|Part of #1154.
Modified Paths:
--------------
trunk/navit/navit/file.c
trunk/navit/navit/linguistics.c
trunk/navit/navit/navigation.c
trunk/navit/navit/search.c
trunk/navit/navit/speech/cmdline/speech_cmdline.c
trunk/navit/navit/util.c
trunk/navit/navit/util.h
trunk/navit/navit/vehicle/file/vehicle_file.c
Modified: trunk/navit/navit/file.c
===================================================================
--- trunk/navit/navit/file.c 2013-08-11 20:26:14 UTC (rev 5571)
+++ trunk/navit/navit/file.c 2013-08-11 20:26:25 UTC (rev 5572)
@@ -795,7 +795,7 @@
if (d) {
*p++='/';
while ((filename=file_readdir(d))) {
- if (!g_strcasecmp(filename, p)) {
+ if (!g_ascii_strcasecmp(filename, p)) {
strcpy(p, filename);
ret=file_create(dirname, options);
if (ret)
Modified: trunk/navit/navit/linguistics.c
===================================================================
--- trunk/navit/navit/linguistics.c 2013-08-11 20:26:14 UTC (rev 5571)
+++ trunk/navit/navit/linguistics.c 2013-08-11 20:26:25 UTC (rev 5572)
@@ -458,13 +458,13 @@
int
linguistics_search(const char *str)
{
- if (!g_strcasecmp(str,"str"))
+ if (!g_ascii_strcasecmp(str,"str"))
return 0;
- if (!g_strcasecmp(str,"str."))
+ if (!g_ascii_strcasecmp(str,"str."))
return 0;
- if (!g_strcasecmp(str,"strasse"))
+ if (!g_ascii_strcasecmp(str,"strasse"))
return 0;
- if (!g_strcasecmp(str,"weg"))
+ if (!g_ascii_strcasecmp(str,"weg"))
return 0;
return 1;
}
Modified: trunk/navit/navit/navigation.c
===================================================================
--- trunk/navit/navit/navigation.c 2013-08-11 20:26:14 UTC (rev 5571)
+++ trunk/navit/navit/navigation.c 2013-08-11 20:26:25 UTC (rev 5572)
@@ -40,6 +40,7 @@
#include "vehicleprofile.h"
#include "plugin.h"
#include "navit_nls.h"
+#include "util.h"
/* #define DEBUG */
@@ -1407,7 +1408,7 @@
return 0;
if (strlen(name) < strlen(suffix))
return 0;
- return !g_strcasecmp(name+strlen(name)-strlen(suffix), suffix);
+ return !navit_utf8_strcasecmp(name+strlen(name)-strlen(suffix), suffix);
}
static char *
Modified: trunk/navit/navit/search.c
===================================================================
--- trunk/navit/navit/search.c 2013-08-11 20:26:14 UTC (rev 5571)
+++ trunk/navit/navit/search.c 2013-08-11 20:26:25 UTC (rev 5572)
@@ -33,6 +33,7 @@
#include "country.h"
#include "linguistics.h"
#include "geom.h"
+#include "util.h"
#if HAVE_API_ANDROID
#include "android.h"
@@ -732,9 +733,9 @@
search_match(char *str, char *search, int partial)
{
if (!partial)
- return (!g_strcasecmp(str, search));
+ return (!g_ascii_strcasecmp(str, search));
else
- return (!g_strncasecmp(str, search, strlen(search)));
+ return (!g_ascii_strncasecmp(str, search, strlen(search)));
}
static struct pcoord *
@@ -1168,15 +1169,7 @@
if(le->parent && has_street_name) {
struct search_list_street *street=this_->levels[level-1].last->data;
- char *s1,*s2;
- int cmpres;
- s1=g_utf8_casefold(street->name,-1);
- s2=g_utf8_casefold(attr2.u.str,-1);
- cmpres=strcmp(s1,s2);
- dbg(1,"Compared %s with %s, got %d\n",s1,s2,cmpres);
- g_free(s1);
- g_free(s2);
- if(cmpres) {
+ if(navit_utf8_strcasecmp(street->name, attr2.u.str)) {
search_list_house_number_destroy(p);
//this_->item=NULL;
continue;
Modified: trunk/navit/navit/speech/cmdline/speech_cmdline.c
===================================================================
--- trunk/navit/navit/speech/cmdline/speech_cmdline.c 2013-08-11 20:26:14 UTC (rev 5571)
+++ trunk/navit/navit/speech/cmdline/speech_cmdline.c 2013-08-11 20:26:25 UTC (rev 5572)
@@ -68,7 +68,11 @@
if (decode)
snd=urldecode(snd);
snd_len=strlen(snd)-suffix_len;
- if (!g_strncasecmp(s, snd, snd_len)) {
+ // TODO: Here we compare UTF-8 text with a filename.
+ // It's unclear how a case-insensitive comparison should
+ // work in general, so for now we only do it for ASCII
+ // text.
+ if (!g_ascii_strncasecmp(s, snd, snd_len)) {
const char *ss=s+snd_len;
while (*ss == ' ' || *ss == ',')
ss++;
Modified: trunk/navit/navit/util.c
===================================================================
--- trunk/navit/navit/util.c 2013-08-11 20:26:14 UTC (rev 5571)
+++ trunk/navit/navit/util.c 2013-08-11 20:26:25 UTC (rev 5572)
@@ -53,6 +53,19 @@
*dest='\0';
}
+int
+navit_utf8_strcasecmp(const char *s1, const char *s2)
+{
+ char *s1_folded,*s2_folded;
+ int cmpres;
+ s1_folded=g_utf8_casefold(s1,-1);
+ s2_folded=g_utf8_casefold(s2,-1);
+ cmpres=strcmp(s1_folded,s2_folded);
+ dbg(3,"Compared %s with %s, got %d\n",s1_folded,s2_folded,cmpres);
+ g_free(s1_folded);
+ g_free(s2_folded);
+ return cmpres;
+}
static void
hash_callback(gpointer key, gpointer value, gpointer user_data)
Modified: trunk/navit/navit/util.h
===================================================================
--- trunk/navit/navit/util.h 2013-08-11 20:26:14 UTC (rev 5571)
+++ trunk/navit/navit/util.h 2013-08-11 20:26:25 UTC (rev 5572)
@@ -25,6 +25,7 @@
void strtoupper(char *dest, const char *src);
void strtolower(char *dest, const char *src);
+int navit_utf8_strcasecmp(const char *s1, const char *s2);
GList * g_hash_to_list(GHashTable *h);
GList * g_hash_to_list_keys(GHashTable *h);
gchar * g_strconcat_printf(gchar *buffer, gchar *fmt, ...);
Modified: trunk/navit/navit/vehicle/file/vehicle_file.c
===================================================================
--- trunk/navit/navit/vehicle/file/vehicle_file.c 2013-08-11 20:26:14 UTC (rev 5571)
+++ trunk/navit/navit/vehicle/file/vehicle_file.c 2013-08-11 20:26:25 UTC (rev 5572)
@@ -464,7 +464,7 @@
lat -= priv->geo.lat * 100;
priv->geo.lat += lat / 60;
- if (!g_strcasecmp(item[3],"S"))
+ if (!g_ascii_strcasecmp(item[3],"S"))
priv->geo.lat=-priv->geo.lat;
lng = g_ascii_strtod(item[4], NULL);
@@ -472,7 +472,7 @@
lng -= priv->geo.lng * 100;
priv->geo.lng += lng / 60;
- if (!g_strcasecmp(item[5],"W"))
+ if (!g_ascii_strcasecmp(item[5],"W"))
priv->geo.lng=-priv->geo.lng;
priv->valid=attr_position_valid_valid;
dbg(2, "latitude '%2.4f' longitude %2.4f\n", priv->geo.lat, priv->geo.lng);
@@ -1005,9 +1005,9 @@
ret->checksum_ignore=checksum_ignore->u.num;
ret->attrs = attrs;
on_eof = attr_search(attrs, NULL, attr_on_eof);
- if (on_eof && !g_strcasecmp(on_eof->u.str, "stop"))
+ if (on_eof && !g_ascii_strcasecmp(on_eof->u.str, "stop"))
ret->on_eof=1;
- if (on_eof && !g_strcasecmp(on_eof->u.str, "exit"))
+ if (on_eof && !g_ascii_strcasecmp(on_eof->u.str, "exit"))
ret->on_eof=2;
dbg(0,"on_eof=%d\n", ret->on_eof);
*meth = vehicle_file_methods;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-11 20:26:16
|
Revision: 5571
http://sourceforge.net/p/navit/code/5571
Author: sleske
Date: 2013-08-11 20:26:14 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Fix:core:Fix warnings from pointer type problems.|Part of #1154.
Modified Paths:
--------------
trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
trunk/navit/navit/graphics/opengl/graphics_opengl.c
trunk/navit/navit/gui/internal/gui_internal_html.c
trunk/navit/navit/layout.c
trunk/navit/navit/map/textfile/textfile.c
trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c
trunk/navit/navit/xmlconfig.c
trunk/navit/navit/xmlconfig.h
Modified: trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
===================================================================
--- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2013-08-11 20:26:02 UTC (rev 5570)
+++ trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2013-08-11 20:26:14 UTC (rev 5571)
@@ -1203,8 +1203,7 @@
font_freetype_new(&this->freetype_methods);
*meth=graphics_methods;
meth->font_new=(struct graphics_font_priv *(*)(struct graphics_priv *, struct graphics_font_methods *, char *, int, int))this->freetype_methods.font_new;
- meth->get_text_bbox=this->freetype_methods.get_text_bbox;
-
+ meth->get_text_bbox=(void(*)(struct graphics_priv*, struct graphics_font_priv *, char *, int, int, struct point *, int))this->freetype_methods.get_text_bbox;
return this;
}
Modified: trunk/navit/navit/graphics/opengl/graphics_opengl.c
===================================================================
--- trunk/navit/navit/graphics/opengl/graphics_opengl.c 2013-08-11 20:26:02 UTC (rev 5570)
+++ trunk/navit/navit/graphics/opengl/graphics_opengl.c 2013-08-11 20:26:14 UTC (rev 5571)
@@ -452,7 +452,7 @@
if ((*w != width || *h != height) && 0 < *w && 0 < *h) {
FIBITMAP *image2;
- image2 = FreeImage_Rescale(image, *w, *h, NULL);
+ image2 = FreeImage_Rescale(image, *w, *h, FILTER_BOX);
FreeImage_Unload(image);
image = image2;
width = *w;
@@ -1186,12 +1186,14 @@
#ifndef USE_OPENGLES
/*filters call to redraw in overlay enabled(map) mode*/
-static void
-redraw_filter(struct graphics_priv *gr)
+static gboolean
+redraw_filter(gpointer data)
{
+ struct graphics_priv *gr = (struct graphics_priv*) data;
if (gr->overlay_enabled && gr->dirty) {
redraw_screen(gr);
}
+ return 0;
}
#endif
@@ -1264,7 +1266,7 @@
#endif
static void *
-get_data(struct graphics_priv *this, char *type)
+get_data(struct graphics_priv *this, const char *type)
{
/*TODO initialize gtkglext context when type=="gtk_widget" */
if (!strcmp(type, "gtk_widget")) {
@@ -1457,8 +1459,9 @@
(struct graphics_font_priv *
(*)(struct graphics_priv *, struct graphics_font_methods *,
char *, int, int)) this->freetype_methods.font_new;
- meth->get_text_bbox = this->freetype_methods.get_text_bbox;
-
+ meth->get_text_bbox =
+ (void (*) (struct graphics_priv *, struct graphics_font_priv *,
+ char *, int, int, struct point*, int)) this->freetype_methods.get_text_bbox;
return this;
}
@@ -1739,7 +1742,7 @@
static void
event_opengl_main_loop_run(void)
{
- dbg(0, "enter\n");
+ dbg(2, "enter\n");
}
static void
Modified: trunk/navit/navit/gui/internal/gui_internal_html.c
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal_html.c 2013-08-11 20:26:02 UTC (rev 5570)
+++ trunk/navit/navit/gui/internal/gui_internal_html.c 2013-08-11 20:26:14 UTC (rev 5571)
@@ -209,7 +209,7 @@
}
static void
-gui_internal_html_start(void *dummy, const char *tag_name, const char **names, const char **values, void *data, void *error)
+gui_internal_html_start(GMarkupParseContext *dummy, const char *tag_name, const char **names, const char **values, void *data, GError **error)
{
struct gui_priv *this=data;
int i;
@@ -310,7 +310,7 @@
}
static void
-gui_internal_html_end(void *dummy, const char *tag_name, void *data, void *error)
+gui_internal_html_end(GMarkupParseContext *dummy, const char *tag_name, void *data, GError **error)
{
struct gui_priv *this=data;
struct html *html;
@@ -401,7 +401,7 @@
}
static void
-gui_internal_html_text(void *dummy, const char *text, int len, void *data, void *error)
+gui_internal_html_text(GMarkupParseContext *dummy, const char *text, gsize len, void *data, GError **error)
{
struct gui_priv *this=data;
struct widget *w;
Modified: trunk/navit/navit/layout.c
===================================================================
--- trunk/navit/navit/layout.c 2013-08-11 20:26:02 UTC (rev 5570)
+++ trunk/navit/navit/layout.c 2013-08-11 20:26:14 UTC (rev 5571)
@@ -258,7 +258,7 @@
iter=obj->func->iter_new(obj);
while (obj->func->get_attr(obj, attr_layer, &layer, iter)) {
if (!strcmp(layer.u.layer->name, attr->u.str)) {
- l->ref=navit_object_ref(layer.u.navit_object);
+ l->ref=(struct layer*)navit_object_ref(layer.u.navit_object);
break;
}
}
Modified: trunk/navit/navit/map/textfile/textfile.c
===================================================================
--- trunk/navit/navit/map/textfile/textfile.c 2013-08-11 20:26:02 UTC (rev 5570)
+++ trunk/navit/navit/map/textfile/textfile.c 2013-08-11 20:26:14 UTC (rev 5571)
@@ -40,7 +40,7 @@
static void
remove_comment_line(char* line){
- if (line==TEXTFILE_COMMENT_CHAR){
+ if (line[0]==TEXTFILE_COMMENT_CHAR){
line='\0';
}
}
Modified: trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c
===================================================================
--- trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c 2013-08-11 20:26:02 UTC (rev 5570)
+++ trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c 2013-08-11 20:26:14 UTC (rev 5571)
@@ -823,7 +823,7 @@
unsigned i;
const uint32_t *ini = in;
for (i = 0; i < N; i++)
- fixed32_pack (ini[i], (uint32_t*)out + i);
+ fixed32_pack (ini[i], (uint8_t*)out + 4*i);
#endif
}
static void
@@ -835,7 +835,7 @@
unsigned i;
const uint64_t *ini = in;
for (i = 0; i < N; i++)
- fixed64_pack (ini[i], (uint64_t*)out + i);
+ fixed64_pack (ini[i], (uint8_t*)out + 8*i);
#endif
}
Modified: trunk/navit/navit/xmlconfig.c
===================================================================
--- trunk/navit/navit/xmlconfig.c 2013-08-11 20:26:02 UTC (rev 5570)
+++ trunk/navit/navit/xmlconfig.c 2013-08-11 20:26:14 UTC (rev 5571)
@@ -1083,10 +1083,10 @@
#endif
void
-xml_parse_text(const char *document, void *data, void (*start)(void *, const char *, const char **, const char **, void *, void *),
- void (*end)(void *, const char *, void *, void *),
- void (*text)(void *, const char *, int, void *, void *))
-{
+xml_parse_text(const char *document, void *data,
+ void (*start)(GMarkupParseContext *, const char *, const char **, const char **, void *, GError **),
+ void (*end)(GMarkupParseContext *, const char *, void *, GError **),
+ void (*text)(GMarkupParseContext*, const char *, gsize, void *, GError **)) {
#if !USE_EZXML
GMarkupParser parser = { start, end, text, NULL, NULL};
xml_context *context;
Modified: trunk/navit/navit/xmlconfig.h
===================================================================
--- trunk/navit/navit/xmlconfig.h 2013-08-11 20:26:02 UTC (rev 5570)
+++ trunk/navit/navit/xmlconfig.h 2013-08-11 20:26:14 UTC (rev 5571)
@@ -83,7 +83,7 @@
/* prototypes */
enum attr_type;
struct object_func *object_func_lookup(enum attr_type type);
-void xml_parse_text(const char *document, void *data, void (*start)(void *, const char *, const char **, const char **, void *, void *), void (*end)(void *, const char *, void *, void *), void (*text)(void *, const char *, int, void *, void *));
+void xml_parse_text(const char *document, void *data, void (*start)(GMarkupParseContext *, const char *, const char **, const char **, void *, GError **), void (*end)(GMarkupParseContext *, const char *, void *, GError **), void (*text)(GMarkupParseContext*, const char *, gsize, void *, GError **));
gboolean config_load(const char *filename, xmlerror **error);
//static void xinclude(GMarkupParseContext *context, const gchar **attribute_names, const gchar **attribute_values, struct xmldocument *doc_old, xmlerror **error);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-11 20:26:04
|
Revision: 5570
http://sourceforge.net/p/navit/code/5570
Author: sleske
Date: 2013-08-11 20:26:02 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Fix:core:Fix warnings for unused functions, usually by removing them.|Part of #1154.
Modified Paths:
--------------
trunk/navit/navit/file.c
trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
trunk/navit/navit/graphics/opengl/graphics_opengl.c
trunk/navit/navit/gui/internal/gui_internal.c
trunk/navit/navit/map/csv/csv.c
trunk/navit/navit/maptool/boundaries.c
trunk/navit/navit/maptool/ch.c
trunk/navit/navit/maptool/osm_protobufdb.c
Modified: trunk/navit/navit/file.c
===================================================================
--- trunk/navit/navit/file.c 2013-08-11 20:25:49 UTC (rev 5569)
+++ trunk/navit/navit/file.c 2013-08-11 20:26:02 UTC (rev 5570)
@@ -882,15 +882,6 @@
int
-file_get_param(struct file *file, struct param_list *param, int count)
-{
- int i=count;
- param_add_string("Filename", file->name, ¶m, &count);
- param_add_hex("Size", file->size, ¶m, &count);
- return i-count;
-}
-
-int
file_version(struct file *file, int mode)
{
#ifndef HAVE_API_WIN32_BASE
Modified: trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
===================================================================
--- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2013-08-11 20:25:49 UTC (rev 5569)
+++ trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2013-08-11 20:26:02 UTC (rev 5570)
@@ -112,24 +112,6 @@
};
static void
-graphics_destroy_image(gpointer data)
-{
- struct graphics_image_priv *priv = (struct graphics_image_priv*)data;
-
-#ifdef HAVE_IMLIB2
- if (priv->image) {
- imlib_context_set_image(priv->image);
- imlib_free_image();
- }
-
-#endif
-
- if (priv->pixbuf)
- g_object_unref(priv->pixbuf);
- g_free(priv);
-}
-
-static void
graphics_destroy(struct graphics_priv *gr)
{
dbg(3,"enter parent %p\n",gr->parent);
Modified: trunk/navit/navit/graphics/opengl/graphics_opengl.c
===================================================================
--- trunk/navit/navit/graphics/opengl/graphics_opengl.c 2013-08-11 20:25:49 UTC (rev 5569)
+++ trunk/navit/navit/graphics/opengl/graphics_opengl.c 2013-08-11 20:26:02 UTC (rev 5570)
@@ -208,7 +208,9 @@
*meth);
static void display(void);
static void resize_callback(int w, int h);
+#ifdef USE_OPENGLES
static void click_notify_do(struct graphics_priv *priv, int button, int state, int x, int y);
+#endif
static void motion_notify_do(struct graphics_priv *priv, int x, int y);
static void resize_callback_do(struct graphics_priv *priv, int w, int h);
static void glut_close();
@@ -1488,6 +1490,7 @@
}
+#ifdef USE_OPENGLES
static void
click_notify_do(struct graphics_priv *priv, int button, int state, int x, int y)
{
@@ -1495,6 +1498,7 @@
dbg(0,"enter state %d button %d\n",state,button);
callback_list_call_attr_3(priv->cbl, attr_button, (void *) state, (void *)button, (void *) &p);
}
+#endif
static void
click_notify(int button, int state, int x, int y)
Modified: trunk/navit/navit/gui/internal/gui_internal.c
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal.c 2013-08-11 20:25:49 UTC (rev 5569)
+++ trunk/navit/navit/gui/internal/gui_internal.c 2013-08-11 20:26:02 UTC (rev 5570)
@@ -110,7 +110,6 @@
static void gui_internal_cmd_view_in_browser(struct gui_priv *this, struct widget *wm, void *data);
static int gui_internal_is_active_vehicle(struct gui_priv *this, struct vehicle *vehicle);
-static void gui_internal_destroy(struct gui_priv *this);
/*
* * Display image scaled to specific size
@@ -3308,24 +3307,3 @@
{
plugin_register_gui_type("internal", gui_internal_new);
}
-
-static void
-gui_internal_destroy(struct gui_priv *this)
-{
- graphics_font_destroy(this->fonts[0]);
- graphics_font_destroy(this->fonts[1]);
- graphics_font_destroy(this->fonts[2]);
- graphics_gc_destroy(this->background);
- graphics_gc_destroy(this->background2);
- graphics_gc_destroy(this->highlight_background);
- graphics_gc_destroy(this->foreground);
- graphics_gc_destroy(this->text_background);
- graphics_gc_destroy(this->text_foreground);
- attr_free(this->click_coord_geo);
- attr_free(this->position_coord_geo);
- g_free(this->country_iso2);
- g_free(this->href);
- g_free(this->html_text);
- g_free(this->on_map_click);
- g_free(this);
-}
Modified: trunk/navit/navit/map/csv/csv.c
===================================================================
--- trunk/navit/navit/map/csv/csv.c 2013-08-11 20:25:49 UTC (rev 5569)
+++ trunk/navit/navit/map/csv/csv.c 2013-08-11 20:26:02 UTC (rev 5570)
@@ -474,6 +474,9 @@
g_free(data);
}
+/**
+ * Dump all map data (including deleted items) to the log.
+ */
static void map_csv_debug_dump(struct map_priv *map)
{
GList *l=g_hash_table_get_values(map->qitem_hash);
@@ -502,12 +505,9 @@
struct coord_geo rl;
struct quadtree_iter *res = NULL;
dbg(1,"map_rect_new_csv\n");
-
-#if 0
- /* Set above value to 1 to have all map data dumped (including deleted items) to the log at each maprect creation */
- map_csv_debug_dump(map);
-#endif
-
+ if(debug_level_get("map_csv")>2) {
+ map_csv_debug_dump(map);
+ }
mr=g_new0(struct map_rect_priv, 1);
mr->m=map;
mr->bStarted = 0;
Modified: trunk/navit/navit/maptool/boundaries.c
===================================================================
--- trunk/navit/navit/maptool/boundaries.c 2013-08-11 20:25:49 UTC (rev 5569)
+++ trunk/navit/navit/maptool/boundaries.c 2013-08-11 20:26:02 UTC (rev 5570)
@@ -35,11 +35,13 @@
return NULL;
}
+#if 0
static char *
osm_tag_name(struct item_bin *ib)
{
return osm_tag_value(ib, "name");
}
+#endif
osmid
boundary_relid(struct boundary *b)
Modified: trunk/navit/navit/maptool/ch.c
===================================================================
--- trunk/navit/navit/maptool/ch.c 2013-08-11 20:25:49 UTC (rev 5569)
+++ trunk/navit/navit/maptool/ch.c 2013-08-11 20:26:02 UTC (rev 5570)
@@ -409,6 +409,7 @@
}
}
+#if 0
static void
ch_remove_tempfiles(char *suffix, int count)
{
@@ -420,6 +421,7 @@
tempfile_unlink(suffix, name);
}
}
+#endif
static void
ch_copy_to_tiles(char *suffix, int count, struct tile_info *info, FILE *ref)
Modified: trunk/navit/navit/maptool/osm_protobufdb.c
===================================================================
--- trunk/navit/navit/maptool/osm_protobufdb.c 2013-08-11 20:25:49 UTC (rev 5569)
+++ trunk/navit/navit/maptool/osm_protobufdb.c 2013-08-11 20:26:02 UTC (rev 5570)
@@ -177,6 +177,7 @@
return 1;
}
+#if 0
static int
osm_protobufdb_start_densenode(struct osm_protobufdb_context *ctx)
{
@@ -204,6 +205,7 @@
pb->primitivegroup=realloc(pb->primitivegroup,(pb->n_primitivegroup+1)*sizeof(OSMPBF__PrimitiveGroup *));
pb->primitivegroup[pb->n_primitivegroup++]=pg;
}
+#endif
#define insert(struct, member, pos) {\
@@ -215,6 +217,7 @@
struct->n_##member++;\
}
+#if 0
static int
osm_protobufdb_insert_densenode(long long id, OSMPBF__Node *offset, OSMPBF__Info *offseti, OSMPBF__DenseNodes *dn)
{
@@ -274,6 +277,7 @@
dn->denseinfo->user_sid[pos]=info->user_sid-offseti->user_sid;
dn->denseinfo->uid[pos]=info->uid-offseti->uid;
}
+#endif
static int
osm_protobufdb_insert_node(long long id, OSMPBF__PrimitiveGroup *pg)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-11 20:25:52
|
Revision: 5569
http://sourceforge.net/p/navit/code/5569
Author: sleske
Date: 2013-08-11 20:25:49 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Fix:maptool:Fix warning about invalid shift by making osmid a long long.|Part of #1154.
Modified Paths:
--------------
trunk/navit/navit/maptool/maptool.h
trunk/navit/navit/maptool/osm.c
Modified: trunk/navit/navit/maptool/maptool.h
===================================================================
--- trunk/navit/navit/maptool/maptool.h 2013-08-11 20:25:41 UTC (rev 5568)
+++ trunk/navit/navit/maptool/maptool.h 2013-08-11 20:25:49 UTC (rev 5569)
@@ -111,7 +111,12 @@
struct country_table;
-typedef unsigned long int osmid;
+/**
+ * Data type for the ID of an OSM element (node/way/relation).
+ * Must be at least 64 bit wide because IDs will soon exceed 32 bit.
+ */
+typedef unsigned long long int osmid;
+#define OSMID_FMT LONGLONG_FMT
/* boundaries.c */
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2013-08-11 20:25:41 UTC (rev 5568)
+++ trunk/navit/navit/maptool/osm.c 2013-08-11 20:25:49 UTC (rev 5569)
@@ -1484,7 +1484,7 @@
debug_attr_buffer[0]='\0';
osmid_attr_value=id;
if (wayid < wayid_last && !way_hash) {
- fprintf(stderr,"INFO: Ways out of sequence (new %lu vs old %lu), adding hash\n", wayid, wayid_last);
+ fprintf(stderr,"INFO: Ways out of sequence (new "OSMID_FMT" vs old "OSMID_FMT"), adding hash\n", wayid, wayid_last);
way_hash=g_hash_table_new(NULL, NULL);
}
wayid_last=wayid;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-11 20:25:43
|
Revision: 5568
http://sourceforge.net/p/navit/code/5568
Author: sleske
Date: 2013-08-11 20:25:41 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Refactor:maptool:Fix whitespace.
Modified Paths:
--------------
trunk/navit/navit/maptool/osm.c
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2013-08-11 20:25:31 UTC (rev 5567)
+++ trunk/navit/navit/maptool/osm.c 2013-08-11 20:25:41 UTC (rev 5568)
@@ -1282,188 +1282,188 @@
void
osm_add_node(osmid id, double lat, double lon)
{
- in_node=1;
- if (node_buffer.size + sizeof(struct node_item) > node_buffer.malloced)
- extend_buffer(&node_buffer);
- attr_strings_clear();
- node_is_tagged=0;
- nodeid=id;
- item.type=type_point_unkn;
- debug_attr_buffer[0]='\0';
- is_in_buffer[0]='\0';
- debug_attr_buffer[0]='\0';
- osmid_attr.type=attr_osm_nodeid;
- osmid_attr.len=3;
- osmid_attr_value=id;
- if (node_buffer.size + sizeof(struct node_item) > slice_size) {
- flush_nodes(0);
- }
- ni=(struct node_item *)(node_buffer.base+node_buffer.size);
- ni->id=id;
- ni->ref_node=0;
- ni->ref_way=0;
- ni->ref_ref=0;
- ni->dummy=0;
- ni->c.x=lon*6371000.0*M_PI/180;
- ni->c.y=log(tan(M_PI_4+lat*M_PI/360))*6371000.0;
- node_buffer.size+=sizeof(struct node_item);
- if (! node_hash) {
- if (ni->id > nodeid_last) {
- nodeid_last=ni->id;
- } else {
- fprintf(stderr,"INFO: Nodes out of sequence (new %d vs old %d), adding hash\n", ni->id, nodeid_last);
- node_hash=g_hash_table_new(NULL, NULL);
- node_buffer_to_hash();
- }
- } else
- if (!g_hash_table_lookup(node_hash, (gpointer)(long)(ni->id)))
- g_hash_table_insert(node_hash, (gpointer)(long)(ni->id), (gpointer)(long)(ni-(struct node_item *)node_buffer.base));
- else {
- node_buffer.size-=sizeof(struct node_item);
- nodeid=0;
- }
+ in_node=1;
+ if (node_buffer.size + sizeof(struct node_item) > node_buffer.malloced)
+ extend_buffer(&node_buffer);
+ attr_strings_clear();
+ node_is_tagged=0;
+ nodeid=id;
+ item.type=type_point_unkn;
+ debug_attr_buffer[0]='\0';
+ is_in_buffer[0]='\0';
+ debug_attr_buffer[0]='\0';
+ osmid_attr.type=attr_osm_nodeid;
+ osmid_attr.len=3;
+ osmid_attr_value=id;
+ if (node_buffer.size + sizeof(struct node_item) > slice_size) {
+ flush_nodes(0);
+ }
+ ni=(struct node_item *)(node_buffer.base+node_buffer.size);
+ ni->id=id;
+ ni->ref_node=0;
+ ni->ref_way=0;
+ ni->ref_ref=0;
+ ni->dummy=0;
+ ni->c.x=lon*6371000.0*M_PI/180;
+ ni->c.y=log(tan(M_PI_4+lat*M_PI/360))*6371000.0;
+ node_buffer.size+=sizeof(struct node_item);
+ if (! node_hash) {
+ if (ni->id > nodeid_last) {
+ nodeid_last=ni->id;
+ } else {
+ fprintf(stderr,"INFO: Nodes out of sequence (new %d vs old %d), adding hash\n", ni->id, nodeid_last);
+ node_hash=g_hash_table_new(NULL, NULL);
+ node_buffer_to_hash();
+ }
+ } else
+ if (!g_hash_table_lookup(node_hash, (gpointer)(long)(ni->id)))
+ g_hash_table_insert(node_hash, (gpointer)(long)(ni->id), (gpointer)(long)(ni-(struct node_item *)node_buffer.base));
+ else {
+ node_buffer.size-=sizeof(struct node_item);
+ nodeid=0;
+ }
}
void
clear_node_item_buffer(void)
{
- int j,count=node_buffer.size/sizeof(struct node_item);
- struct node_item *ni=(struct node_item *)(node_buffer.base);
- for (j = 0 ; j < count ; j++) {
- ni[j].ref_way=0;
- }
+ int j,count=node_buffer.size/sizeof(struct node_item);
+ struct node_item *ni=(struct node_item *)(node_buffer.base);
+ for (j = 0 ; j < count ; j++) {
+ ni[j].ref_way=0;
+ }
}
static struct node_item *
node_item_get(int id)
{
- struct node_item *ni=(struct node_item *)(node_buffer.base);
- int count=node_buffer.size/sizeof(struct node_item);
- int interval=count/4;
- int p=count/2;
- if(interval==0) {
- // If fewer than 4 nodes defined so far set interval to 1 to
- // avoid infinite loop
- interval = 1;
- }
- if (node_hash) {
- int i;
- i=(int)(long)(g_hash_table_lookup(node_hash, (gpointer)(long)(unsigned int)id));
- return ni+i;
- }
- if (ni[0].id > id)
- return NULL;
- if (ni[count-1].id < id)
- return NULL;
- while (ni[p].id != id) {
+ struct node_item *ni=(struct node_item *)(node_buffer.base);
+ int count=node_buffer.size/sizeof(struct node_item);
+ int interval=count/4;
+ int p=count/2;
+ if(interval==0) {
+ // If fewer than 4 nodes defined so far set interval to 1 to
+ // avoid infinite loop
+ interval = 1;
+ }
+ if (node_hash) {
+ int i;
+ i=(int)(long)(g_hash_table_lookup(node_hash, (gpointer)(long)(unsigned int)id));
+ return ni+i;
+ }
+ if (ni[0].id > id)
+ return NULL;
+ if (ni[count-1].id < id)
+ return NULL;
+ while (ni[p].id != id) {
#if 0
- fprintf(stderr,"p=%d count=%d interval=%d id=%d ni[p].id=%d\n", p, count, interval, id, ni[p].id);
+ fprintf(stderr,"p=%d count=%d interval=%d id=%d ni[p].id=%d\n", p, count, interval, id, ni[p].id);
#endif
- if (ni[p].id < id) {
- p+=interval;
- if (interval == 1) {
- if (p >= count)
- return NULL;
- if (ni[p].id > id)
- return NULL;
- } else {
- if (p >= count)
- p=count-1;
- }
- } else {
- p-=interval;
- if (interval == 1) {
- if (p < 0)
- return NULL;
- if (ni[p].id < id)
- return NULL;
- } else {
- if (p < 0)
- p=0;
- }
- }
- if (interval > 1)
- interval/=2;
- }
- return &ni[p];
+ if (ni[p].id < id) {
+ p+=interval;
+ if (interval == 1) {
+ if (p >= count)
+ return NULL;
+ if (ni[p].id > id)
+ return NULL;
+ } else {
+ if (p >= count)
+ p=count-1;
+ }
+ } else {
+ p-=interval;
+ if (interval == 1) {
+ if (p < 0)
+ return NULL;
+ if (ni[p].id < id)
+ return NULL;
+ } else {
+ if (p < 0)
+ p=0;
+ }
+ }
+ if (interval > 1)
+ interval/=2;
+ }
+ return &ni[p];
}
static int
load_node(FILE *coords, int p, struct node_item *ret)
{
- fseek(coords, p*sizeof(struct node_item), SEEK_SET);
- if (fread(ret, sizeof(*ret), 1, coords) != 1) {
- fprintf(stderr,"read failed\n");
- return 0;
- }
- return 1;
+ fseek(coords, p*sizeof(struct node_item), SEEK_SET);
+ if (fread(ret, sizeof(*ret), 1, coords) != 1) {
+ fprintf(stderr,"read failed\n");
+ return 0;
+ }
+ return 1;
}
static int
node_item_get_from_file(FILE *coords, int id, struct node_item *ret)
{
- int count;
- int interval;
- int p;
- if (node_hash) {
- int i;
- i=(int)(long)(g_hash_table_lookup(node_hash, (gpointer)(long)id));
- fseek(coords, i*sizeof(*ret), SEEK_SET);
- if (fread(ret, sizeof(*ret), 1, coords) == 1)
- return 1;
- else
- return 0;
- }
+ int count;
+ int interval;
+ int p;
+ if (node_hash) {
+ int i;
+ i=(int)(long)(g_hash_table_lookup(node_hash, (gpointer)(long)id));
+ fseek(coords, i*sizeof(*ret), SEEK_SET);
+ if (fread(ret, sizeof(*ret), 1, coords) == 1)
+ return 1;
+ else
+ return 0;
+ }
- fseek(coords, 0, SEEK_END);
- count=ftell(coords)/sizeof(struct node_item);
- interval=count/4;
- p=count/2;
- if(interval==0) {
- // If fewer than 4 nodes defined so far set interval to 1 to
- // avoid infinite loop
- interval = 1;
- }
- if (!load_node(coords, p, ret))
- return 0;
- for (;;) {
- if (ret->id == id)
- return 1;
- if (ret->id < id) {
- p+=interval;
- if (interval == 1) {
- if (p >= count)
- return 0;
- if (!load_node(coords, p, ret))
- return 0;
- if (ret->id > id)
- return 0;
- } else {
- if (p >= count)
- p=count-1;
- if (!load_node(coords, p, ret))
- return 0;
- }
- } else {
- p-=interval;
- if (interval == 1) {
- if (p < 0)
- return 0;
- if (!load_node(coords, p, ret))
- return 0;
- if (ret->id < id)
- return 0;
- } else {
- if (p < 0)
- p=0;
- if (!load_node(coords, p, ret))
- return 0;
- }
- }
- if (interval > 1)
- interval/=2;
- }
+ fseek(coords, 0, SEEK_END);
+ count=ftell(coords)/sizeof(struct node_item);
+ interval=count/4;
+ p=count/2;
+ if(interval==0) {
+ // If fewer than 4 nodes defined so far set interval to 1 to
+ // avoid infinite loop
+ interval = 1;
+ }
+ if (!load_node(coords, p, ret))
+ return 0;
+ for (;;) {
+ if (ret->id == id)
+ return 1;
+ if (ret->id < id) {
+ p+=interval;
+ if (interval == 1) {
+ if (p >= count)
+ return 0;
+ if (!load_node(coords, p, ret))
+ return 0;
+ if (ret->id > id)
+ return 0;
+ } else {
+ if (p >= count)
+ p=count-1;
+ if (!load_node(coords, p, ret))
+ return 0;
+ }
+ } else {
+ p-=interval;
+ if (interval == 1) {
+ if (p < 0)
+ return 0;
+ if (!load_node(coords, p, ret))
+ return 0;
+ if (ret->id < id)
+ return 0;
+ } else {
+ if (p < 0)
+ p=0;
+ if (!load_node(coords, p, ret))
+ return 0;
+ }
+ }
+ if (interval > 1)
+ interval/=2;
+ }
}
void
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-11 20:25:34
|
Revision: 5567
http://sourceforge.net/p/navit/code/5567
Author: sleske
Date: 2013-08-11 20:25:31 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Fix:core:Fix miscellaneous warnings.|Part of #1154.
Modified Paths:
--------------
trunk/navit/navit/file.c
trunk/navit/navit/file.h
trunk/navit/navit/graphics/opengl/graphics_opengl.c
trunk/navit/navit/graphics/sdl/graphics_sdl.c
trunk/navit/navit/navit_nls.c
Modified: trunk/navit/navit/file.c
===================================================================
--- trunk/navit/navit/file.c 2013-08-11 20:25:01 UTC (rev 5566)
+++ trunk/navit/navit/file.c 2013-08-11 20:25:31 UTC (rev 5567)
@@ -485,7 +485,7 @@
}
int
-file_data_write(struct file *file, long long offset, int size, unsigned char *data)
+file_data_write(struct file *file, long long offset, int size, const void *data)
{
file_data_flush(file, offset, size);
lseek(file->fd, offset, SEEK_SET);
Modified: trunk/navit/navit/file.h
===================================================================
--- trunk/navit/navit/file.h 2013-08-11 20:25:01 UTC (rev 5566)
+++ trunk/navit/navit/file.h 2013-08-11 20:25:31 UTC (rev 5567)
@@ -73,7 +73,7 @@
unsigned char *file_data_read_special(struct file *file, int size, int *size_ret);
unsigned char *file_data_read_all(struct file *file);
void file_data_flush(struct file *file, long long offset, int size);
-int file_data_write(struct file *file, long long offset, int size, unsigned char *data);
+int file_data_write(struct file *file, long long offset, int size, const void *data);
int file_get_contents(char *name, unsigned char **buffer, int *size);
unsigned char *file_data_read_compressed(struct file *file, long long offset, int size, int size_uncomp);
unsigned char *file_data_read_encrypted(struct file *file, long long offset, int size, int size_uncomp, int compressed, char *passwd);
Modified: trunk/navit/navit/graphics/opengl/graphics_opengl.c
===================================================================
--- trunk/navit/navit/graphics/opengl/graphics_opengl.c 2013-08-11 20:25:01 UTC (rev 5566)
+++ trunk/navit/navit/graphics/opengl/graphics_opengl.c 2013-08-11 20:25:31 UTC (rev 5567)
@@ -104,6 +104,9 @@
#define glScalef glScalex
#define glColor4f glColor4x
#endif
+#ifdef FREEGLUT
+#include <GL/freeglut_ext.h>
+#endif
#define SCREEN_WIDTH 700
#define SCREEN_HEIGHT 700
@@ -1103,7 +1106,7 @@
{
#ifdef USE_OPENGLES
#else
- static locked = 0;
+ static int locked = 0;
if (!locked) {
locked = 1;
} else {
Modified: trunk/navit/navit/graphics/sdl/graphics_sdl.c
===================================================================
--- trunk/navit/navit/graphics/sdl/graphics_sdl.c 2013-08-11 20:25:01 UTC (rev 5566)
+++ trunk/navit/navit/graphics/sdl/graphics_sdl.c 2013-08-11 20:25:31 UTC (rev 5567)
@@ -50,7 +50,6 @@
#undef ALPHA
#undef SDL_TTF
-#define SDL_IMAGE
#undef LINUX_TOUCHSCREEN
#ifdef USE_WEBOS
Modified: trunk/navit/navit/navit_nls.c
===================================================================
--- trunk/navit/navit/navit_nls.c 2013-08-11 20:25:01 UTC (rev 5566)
+++ trunk/navit/navit/navit_nls.c 2013-08-11 20:25:31 UTC (rev 5567)
@@ -19,6 +19,8 @@
bind_textdomain_codeset(package, "UTF-8");
textdomains=g_list_append(textdomains, g_strdup(package));
return ret;
+#else
+ return NULL;
#endif
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-11 20:25:07
|
Revision: 5566
http://sourceforge.net/p/navit/code/5566
Author: sleske
Date: 2013-08-11 20:25:01 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Fix:map_mg:Fix warnings by removing loads of dead code.|Part of #1154.
Modified Paths:
--------------
trunk/navit/navit/graphics.c
trunk/navit/navit/map/mg/street.c
Modified: trunk/navit/navit/graphics.c
===================================================================
--- trunk/navit/navit/graphics.c 2013-08-11 20:24:48 UTC (rev 5565)
+++ trunk/navit/navit/graphics.c 2013-08-11 20:25:01 UTC (rev 5566)
@@ -2863,20 +2863,19 @@
while (curr) {
struct item *sitem=curr->data;
if (item_is_equal(*item,*sitem)) {
+#if 0 /* FIXME */
if (dl) {
struct displayitem di;
- /* Unused Variable
- GHashTable *h; */
+ GHashTable *h;
di.item=*sitem;
di.label=NULL;
di.count=0;
di.item.type=type;
-#if 0 /* FIXME */
h=g_hash_table_lookup(dl->dl, GINT_TO_POINTER(di.item.type));
if (h)
g_hash_table_remove(h, &di);
+ }
#endif
- }
g_free(sitem);
gra->selection=g_list_remove(gra->selection, curr->data);
found=1;
Modified: trunk/navit/navit/map/mg/street.c
===================================================================
--- trunk/navit/navit/map/mg/street.c 2013-08-11 20:24:48 UTC (rev 5565)
+++ trunk/navit/navit/map/mg/street.c 2013-08-11 20:25:01 UTC (rev 5566)
@@ -401,168 +401,6 @@
(*p)+=street->type_count*sizeof(struct street_type);
}
-
-static void
-street_housenumber_coord_rewind(void *priv_data)
-{
- struct street_priv *street=priv_data;
- street->cidx=0;
-}
-
-static void
-street_housenumber_attr_rewind(void *priv_data)
-{
- /* struct street_priv *street=priv_data; */
-
-}
-
-static int
-street_housenumber_coord_get(void *priv_data, struct coord *c, int count)
-{
- struct street_priv *street=priv_data;
- if (street->cidx || !count || !street->name.len)
- return 0;
- *c=street->hnc[street->housenumber-2];
- street->cidx=1;
- return 1;
-}
-
-static int
-street_housenumber_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr)
-{
- struct street_priv *street=priv_data;
- struct housenumber *hn;
- attr->type=attr_type;
- switch (attr_type) {
- case attr_label:
- hn=&street->hn[street->housenumber-2];
- sprintf(street->debug,"%d%s",hn->number,hn->suffix);
- attr->u.str=street->debug;
- return 1;
- default:
- dbg(0,"unknown item\n");
- return 0;
- }
-}
-
-static struct item_methods street_housenumber_meth = {
- street_housenumber_coord_rewind,
- street_housenumber_coord_get,
- street_housenumber_attr_rewind,
- street_housenumber_attr_get,
-};
-
-static void
-project(struct coord *c, int count, int di, int dlr, struct coord *ch)
-{
- struct coord cr;
- int dx,dy;
- int l;
-
- if (di > 0) {
- dx=c[1].x-c[0].x;
- dy=c[1].y-c[0].y;
- cr=c[0];
- } else if (di < 0) {
- dx=c[count-1].x-c[count-2].x;
- dy=c[count-1].y-c[count-2].y;
- cr=c[count-1];
- } else {
- dx=c[1].x-c[0].x;
- dy=c[1].y-c[0].y;
- di=0;
- if (count % 2) {
- cr=c[count/2];
- } else {
- cr.x=(c[count/2-1].x+c[count/2].x)/2;
- cr.y=(c[count/2-1].y+c[count/2].y)/2;
- }
- }
- l=sqrtf(dx*dx+dy*dy);
- if (!l) {
- *ch=cr;
- return;
- }
- ch->x=cr.x+(di*dx+dlr*dy)/l;
- ch->y=cr.y+(di*dy-dlr*dx)/l;
-}
-
-static int
-street_lookup_housenumber(struct street_priv *street)
-{
- int i,count,scount,maxcount=16384;
- struct coord c[maxcount];
- struct street_name_numbers nns;
- unsigned char *p=street->name.aux_data;
- unsigned char *end=p+street->name.aux_len;
- unsigned char *pn,*pn_end;
-
- street->hn_count=0;
- street_coord_rewind(street);
- scount=street_coord_get(street, c, maxcount/2);
- if (scount >= maxcount/2) {
- dbg(0,"overflow");
- }
- for (i = 0 ; i < scount-1 ; i++) {
- c[scount+i].x=(c[i].x+c[i+1].x)/2;
- c[scount+i].y=(c[i].y+c[i+1].y)/2;
- }
- count=scount*2-1;
- while (p < end) {
- struct street_name_number nn;
- street_name_numbers_get(&nns, &p);
- pn=nns.aux_data;
- pn_end=nns.aux_data+nns.aux_len;
- while (pn < pn_end) {
- street_name_number_get(&nn, &pn);
- for (i = 0 ; i < count ; i++) {
- int dx=nn.c->x-c[i].x;
- int dy=nn.c->y-c[i].y;
- int dlr,dir;
- if (dx < 3 && dx > -3 && dy < 3 && dy > -3) {
- dir=15;
- dlr=15;
- switch (nn.tag & 0xf) {
- case 0xa:
- break;
- case 0xb:
- dlr=-dlr;
- dir=-dir;
- break;
- case 0xe:
- dlr=-dlr;
- break;
- case 0xf:
- dir=-dir;
- break;
- default:
- dbg(0,"unknown tag 0x%x\n",nn.tag);
-#if 0
- continue;
-#endif
- }
- if (street_str_get_type(street->str) & 0x40) {
- dir=-dir;
- dlr=-dlr;
- }
- if (nn.first.number == nn.last.number && !strcmp(nn.first.suffix, nn.last.suffix))
- dir=0;
- project(c, scount, dir, dlr, &street->hnc[street->hn_count]);
- street->hn[street->hn_count]=nn.first;
- street->hn_count++;
- dbg_assert(street->hn_count < 100);
- project(c, scount, -dir, dlr, &street->hnc[street->hn_count]);
- street->hn[street->hn_count]=nn.last;
- street->hn_count++;
- dbg_assert(street->hn_count < 100);
- dbg(1,"found %d%s %d%s\n",nn.first.number,nn.first.suffix,nn.last.number,nn.last.suffix);
- }
- }
- }
- }
- return 1;
-}
-
/*0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 */
static unsigned char limit[]={0,0,1,1,1,2,2,4,6,6,12,13,14,20,20,20,20,20,20};
@@ -867,37 +705,6 @@
}
static void
-street_name_numbers_coord_rewind(void *priv_data)
-{
- /* struct street_priv *street=priv_data; */
-
-}
-
-static void
-street_name_numbers_attr_rewind(void *priv_data)
-{
- /* struct street_priv *street=priv_data; */
-
-}
-
-static int
-street_name_numbers_coord_get(void *priv_data, struct coord *c, int count)
-{
- return 0;
-}
-
-static int
-street_name_numbers_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr)
-{
- attr->type=attr_type;
- switch (attr_type) {
- default:
- dbg(0,"unknown item\n");
- return 0;
- }
-}
-
-static void
street_name_coord_rewind(void *priv_data)
{
/* struct street_priv *street=priv_data; */
@@ -1089,53 +896,6 @@
}
}
-static void
-district_debug(struct map_rect_priv *mr, int country, int dist)
-{
- struct map_rect_priv *mrt;
- struct item *item;
- struct attr attrn;
-
- mrt=map_rect_new_mg(mr->m, NULL);
- item=map_rect_get_item_byid_mg(mrt, country | (file_town_twn << 16), dist);
- dbg(0,"item=%p\n",item);
- if (item_attr_get(item, attr_town_postal, &attrn))
- dbg(0,"postal=%s\n",attrn.u.str);
- if (item_attr_get(item, attr_town_name, &attrn))
- dbg(0,"town_name=%s\n",attrn.u.str);
- if (item_attr_get(item, attr_district_name, &attrn))
- dbg(0,"district_name=%s\n",attrn.u.str);
- map_rect_destroy_mg(mrt);
-}
-
-static int
-street_name_numbers_get_next(struct map_rect_priv *mr, struct street_name *name, char *start, unsigned char **p, int mode, int *id, struct street_name_numbers *ret)
-{
- struct street_name_numbers tmp;
- unsigned char *ps,*pt;
- int found;
- while (*p < name->aux_data+name->aux_len) {
- ps=*p;
- street_name_numbers_get(ret, p);
- (*id)++;
- found=0;
- pt=name->aux_data;
- while (pt < ps) {
- street_name_numbers_get(&tmp, &pt);
- if (tmp.country == ret->country && tmp.dist == ret->dist) {
- found=1;
- break;
- }
- }
- if (!found) {
- dbg(0,"district 0x%x\n",ret->dist);
- district_debug(mr, ret->country, ret->dist);
- return 1;
- }
- }
- return 0;
-}
-
struct item *
street_search_get_item(struct map_rect_priv *mr)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-11 20:24:53
|
Revision: 5565
http://sourceforge.net/p/navit/code/5565
Author: sleske
Date: 2013-08-11 20:24:48 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Fix:core:Fix warnings for unused functions by removing them.|Part of #1154.
Modified Paths:
--------------
trunk/navit/navit/map/binfile/binfile.c
trunk/navit/navit/map/mg/street.c
Modified: trunk/navit/navit/map/binfile/binfile.c
===================================================================
--- trunk/navit/navit/map/binfile/binfile.c 2013-08-11 20:24:38 UTC (rev 5564)
+++ trunk/navit/navit/map/binfile/binfile.c 2013-08-11 20:24:48 UTC (rev 5565)
@@ -181,7 +181,6 @@
static void map_binfile_close(struct map_priv *m);
static int map_binfile_open(struct map_priv *m);
static void map_binfile_destroy(struct map_priv *m);
-static int case_cmp(char *name, char *match, int partial);
static void lfh_to_cpu(struct zip_lfh *lfh) {
dbg_assert(lfh != NULL);
Modified: trunk/navit/navit/map/mg/street.c
===================================================================
--- trunk/navit/navit/map/mg/street.c 2013-08-11 20:24:38 UTC (rev 5564)
+++ trunk/navit/navit/map/mg/street.c 2013-08-11 20:24:48 UTC (rev 5565)
@@ -128,21 +128,6 @@
return (name_numbers->tmp_data >= name_numbers->aux_data+name_numbers->aux_len);
}
-
-static int
-street_name_numbers_get_byid(struct street_name_numbers *name_numbers, struct street_name *name, int id)
-{
- unsigned char *p=name->aux_data;
- unsigned char *end=p+name->aux_len;
- while (id >= 0) {
- if (p >= end)
- return 0;
- street_name_numbers_get(name_numbers, &p);
- id--;
- }
- return 1;
-}
-
static void
street_name_number_get(struct street_name_number *name_number, unsigned char **p)
{
@@ -158,20 +143,6 @@
*p=start+name_number->len;
}
-static int
-street_name_number_get_byid(struct street_name_number *name_number, struct street_name_numbers *name_numbers, int id)
-{
- unsigned char *p=name_numbers->tmp_data;
- unsigned char *end=p+name_numbers->tmp_len;
- while (id >= 0) {
- if (p >= end)
- return 0;
- street_name_number_get(name_number, &p);
- id--;
- }
- return 1;
-}
-
static void
street_name_get_by_id(struct street_name *name, struct file *file, unsigned long id)
{
@@ -592,29 +563,6 @@
return 1;
}
-static int
-street_get_housenumber(struct map_rect_priv *mr, struct street_priv *street, struct item *item)
-{
- int nameid;
- nameid=street_str_get_nameid(street->str);
- if (! nameid)
- return 0;
- if (! street->name.len)
- street_name_get_by_id(&street->name,street->name_file,nameid);
- if (! street->name.aux_len)
- return 0;
- if (!street->hn_count)
- street_lookup_housenumber(street);
- if (street->housenumber > street->hn_count)
- return 0;
- item->type=type_town_label;
- item->id_hi = (item->id_hi & 0xffffff) | (street->housenumber*0x10000000+0x1000000);
- item->meth=&street_housenumber_meth;
- street->cidx=0;
- street->housenumber++;
- return 1;
-}
-
/*0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 */
static unsigned char limit[]={0,0,1,1,1,2,2,4,6,6,12,13,14,20,20,20,20,20,20};
@@ -949,18 +897,6 @@
}
}
-
-
-
-
-static struct item_methods street_name_numbers_meth = {
- street_name_numbers_coord_rewind,
- street_name_numbers_coord_get,
- street_name_numbers_attr_rewind,
- street_name_numbers_attr_get,
-};
-
-
static void
street_name_coord_rewind(void *priv_data)
{
@@ -1200,17 +1136,6 @@
return 0;
}
-
-static struct item *
-street_search_get_item_street_name_district(struct map_rect_priv *mr, int flag)
-{
- if (street_name_eod(&mr->street.name))
- return NULL;
- if (!street_name_numbers_get_next(mr, &mr->street.name, NULL, &mr->street.name.tmp_data, 1, &mr->item.id_hi, &mr->street.name_numbers))
- return NULL;
- return &mr->item;
-}
-
struct item *
street_search_get_item(struct map_rect_priv *mr)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-11 20:24:41
|
Revision: 5564
http://sourceforge.net/p/navit/code/5564
Author: sleske
Date: 2013-08-11 20:24:38 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Fix:core:Fix warnings from unused variables.|Part of #1154.
Modified Paths:
--------------
trunk/navit/navit/cache.c
trunk/navit/navit/command.c
trunk/navit/navit/geom.c
trunk/navit/navit/graphics/opengl/graphics_opengl.c
trunk/navit/navit/graphics/sdl/raster.c
trunk/navit/navit/graphics.c
trunk/navit/navit/gui/gtk/destination.c
trunk/navit/navit/map/csv/csv.c
trunk/navit/navit/map/shapefile/shapefile.c
trunk/navit/navit/maptool/buffer.c
trunk/navit/navit/maptool/osm.c
trunk/navit/navit/maptool/osm_protobuf.c
trunk/navit/navit/maptool/osm_xml.c
trunk/navit/navit/navigation.c
trunk/navit/navit/navit_nls.c
trunk/navit/navit/osd/core/osd_core.c
trunk/navit/navit/popup.c
trunk/navit/navit/sunriset.c
Modified: trunk/navit/navit/cache.c
===================================================================
--- trunk/navit/navit/cache.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/cache.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -391,8 +391,6 @@
void
cache_dump(struct cache *cache)
{
- struct cache_entry *first;
- first=cache->t1.first;
cache_stats(cache);
cache_list_dump("T1", cache, &cache->t1);
cache_list_dump("B1", cache, &cache->b1);
Modified: trunk/navit/navit/command.c
===================================================================
--- trunk/navit/navit/command.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/command.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -1195,7 +1195,7 @@
command_evaluate_single(struct context *ctx)
{
struct result res={{0,},},tmp={{0,},};
- const char *op,*a1,*a2,*a3,*f,*end;
+ const char *op,*a,*f,*end;
enum attr_type attr_type;
void *obj;
struct object_func *obj_func;
@@ -1220,7 +1220,7 @@
return 0;
}
ctx->skip=1;
- a1=ctx->expr;
+ a=ctx->expr;
eval_conditional(ctx, &res);
resolve_object(ctx, &res);
ctx->skip=skip;
@@ -1228,7 +1228,6 @@
ctx->error=missing_semicolon;
return 0;
}
- a2=ctx->expr;
eval_comma(ctx,&res);
attr_type=command_attr_type(&res);
obj=res.attr.u.data;
@@ -1263,7 +1262,7 @@
}
iter = obj_func->iter_new(NULL);
while (obj_func->get_attr(obj, attr_type, &attr, iter)) {
- ctx->expr=a1;
+ ctx->expr=a;
eval_conditional(ctx, &res);
resolve_object(ctx, &res);
tmp.attr=attr;
Modified: trunk/navit/navit/geom.c
===================================================================
--- trunk/navit/navit/geom.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/geom.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -361,13 +361,11 @@
geom_poly_segments_point_inside(GList *in, struct coord *c)
{
int open_matches=0,closed_matches=0;
- struct coord *cp;
#if 0
fprintf(stderr,"try 0x%x,0x%x:",c->x,c->y);
#endif
while (in) {
struct geom_poly_segment *seg=in->data;
- cp=seg->first;
if (geom_poly_point_inside(seg->first, seg->last-seg->first+1, c)) {
#if 0
fprintf(stderr," inside");
Modified: trunk/navit/navit/graphics/opengl/graphics_opengl.c
===================================================================
--- trunk/navit/navit/graphics/opengl/graphics_opengl.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/graphics/opengl/graphics_opengl.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -1155,7 +1155,6 @@
{
#ifdef USE_OPENGLES
#else
- time_t curr_time = time(0);
graphics_priv_root->dirty = 0;
glCallList(gr->DLid);
@@ -1462,27 +1461,12 @@
overlay_new(struct graphics_priv *gr, struct graphics_methods *meth,
struct point *p, int w, int h, int alpha, int wraparound)
{
- int w2, h2;
struct graphics_priv *this = graphics_opengl_new_helper(meth);
this->p = *p;
this->width = w;
this->height = h;
this->parent = gr;
- /* If either height or width is 0, we set it to 1 to avoid warnings, and
- * disable the overlay. */
- if (h == 0) {
- h2 = 1;
- } else {
- h2 = h;
- }
-
- if (w == 0) {
- w2 = 1;
- } else {
- w2 = w;
- }
-
if ((w == 0) || (h == 0)) {
this->overlay_autodisabled = 1;
} else {
Modified: trunk/navit/navit/graphics/sdl/raster.c
===================================================================
--- trunk/navit/navit/graphics/sdl/raster.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/graphics/sdl/raster.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -950,9 +950,8 @@
static void raster_aalineColorInt(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color, int draw_endpoint)
{
Sint32 xx0, yy0, xx1, yy1;
- int result;
Uint32 intshift, erracc, erradj;
- Uint32 erracctmp, wgt, wgtcompmask;
+ Uint32 erracctmp, wgt;
int dx, dy, tmp, xdir, y0p1, x0pxdir;
/*
@@ -1029,11 +1028,6 @@
}
/*
- * Line is not horizontal, vertical or diagonal
- */
- result = 0;
-
- /*
* Zero accumulator
*/
erracc = 0;
@@ -1042,10 +1036,6 @@
* # of bits by which to shift erracc to get intensity level
*/
intshift = 32 - AAbits;
- /*
- * Mask used to flip all bits in an intensity weighting
- */
- wgtcompmask = AAlevels - 1;
/* Lock surface */
if (SDL_MUSTLOCK(dst)) {
@@ -1169,7 +1159,6 @@
{
/* sdl-gfx */
Sint16 left, right, top, bottom;
- int result;
Sint16 x1, y1, x2, y2;
Sint16 cx = 0;
Sint16 cy = r;
@@ -1230,7 +1219,6 @@
/*
* Draw
*/
- result = 0;
do {
xpcx = x + cx;
xmcx = x - cx;
@@ -1825,7 +1813,6 @@
the output is not perfect yet but usually looks better than aliasing
*/
- int result;
int i;
int y, xa, xb;
int miny, maxy;
@@ -1868,7 +1855,6 @@
/*
* Draw
*/
- result = 0;
for (i = 1; i < n; i++) {
raster_aalineColorInt(dst, *px1, *py1, *px2, *py2, color, 0);
px1 = px2;
@@ -1945,7 +1931,6 @@
/*
* Draw, scanning y
*/
- result = 0;
for (y = miny; (y <= maxy); y++) {
ints = 0;
for (i = 0; (i < n); i++) {
Modified: trunk/navit/navit/graphics.c
===================================================================
--- trunk/navit/navit/graphics.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/graphics.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -1606,7 +1606,6 @@
for (i = 1 ; i < count -1 ; i++) {
draw_shape(&ctx, pnt+i, *width++);
if (ctx.npos < max_circle_points || ctx.ppos >= maxpoints-max_circle_points || !draw_middle(&ctx,&pnt[i])) {
- struct draw_polyline_shape shape=ctx.shape;
draw_end(&ctx,&pnt[i]);
ctx.res[ctx.npos]=ctx.res[ctx.ppos-1];
draw(gra_priv, gc_priv, ctx.res+ctx.npos, ctx.ppos-ctx.npos);
Modified: trunk/navit/navit/gui/gtk/destination.c
===================================================================
--- trunk/navit/navit/gui/gtk/destination.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/gui/gtk/destination.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -453,7 +453,6 @@
GtkWidget *label_country;
GtkWidget *label_postal, *label_city, *label_district;
GtkWidget *label_street, *label_number;
- GtkWidget *hseparator1,*hseparator2;
GtkWidget *button1,*button2,*button3;
int i;
struct search_param *search=&search_param;
@@ -485,7 +484,6 @@
search->entry_district = gtk_entry_new();
gtk_widget_set_sensitive(GTK_WIDGET(search->entry_district), FALSE);
label_district = gtk_label_new(_("District/Township"));
- hseparator1 = gtk_vseparator_new();
search->entry_street = gtk_entry_new();
gtk_widget_set_sensitive(GTK_WIDGET(search->entry_street), FALSE);
label_street = gtk_label_new(_("Street"));
@@ -513,7 +511,6 @@
- hseparator2 = gtk_vseparator_new();
button1 = gtk_button_new_with_label(_("Map"));
button2 = gtk_button_new_with_label(_("Bookmark"));
button3 = gtk_button_new_with_label(_("Destination"));
Modified: trunk/navit/navit/map/csv/csv.c
===================================================================
--- trunk/navit/navit/map/csv/csv.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/map/csv/csv.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -672,7 +672,6 @@
map_new_csv(struct map_methods *meth, struct attr **attrs, struct callback_list *cbl)
{
struct map_priv *m = NULL;
- struct attr *item_type;
struct attr *attr_types;
struct attr *item_type_attr;
struct attr *data;
@@ -688,7 +687,6 @@
m->qitem_hash = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, quadtree_item_free_do);
m->tree_root = tree_root;
- item_type = attr_search(attrs, NULL, attr_item_type);
attr_types = attr_search(attrs, NULL, attr_attr_types);
if(attr_types) {
enum attr_type* at = attr_types->u.attr_types;
Modified: trunk/navit/navit/map/shapefile/shapefile.c
===================================================================
--- trunk/navit/navit/map/shapefile/shapefile.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/map/shapefile/shapefile.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -367,30 +367,25 @@
process_fields(struct map_priv *m, int id)
{
int i;
- char szTitle[12],*pszTypeName,*str;
+ char szTitle[12],*str;
int nWidth, nDecimals;
for (i = 0 ; i < m->nFields ; i++) {
switch (DBFGetFieldInfo(m->hDBF, i, szTitle, &nWidth, &nDecimals )) {
case FTString:
- pszTypeName = "String";
str=g_strdup(DBFReadStringAttribute( m->hDBF, id, i ));
break;
case FTInteger:
- pszTypeName = "Integer";
str=g_strdup_printf("%d",DBFReadIntegerAttribute( m->hDBF, id, i ));
break;
case FTDouble:
- pszTypeName = "Double";
str=g_strdup_printf("%lf",DBFReadDoubleAttribute( m->hDBF, id, i ));
break;
case FTInvalid:
- pszTypeName = "Invalid";
str=NULL;
break;
default:
- pszTypeName = "Unknown";
str=NULL;
}
longest_match_add_key_value(m->lm, szTitle, str);
Modified: trunk/navit/navit/maptool/buffer.c
===================================================================
--- trunk/navit/navit/maptool/buffer.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/maptool/buffer.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -39,7 +39,6 @@
{
FILE *f;
long long len;
- int ret;
if (b->base)
free(b->base);
b->malloced=0;
@@ -48,7 +47,6 @@
len=ftell(f);
if (offset+size > len) {
size=len-offset;
- ret=1;
}
b->size=b->malloced=size;
#if 0
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/maptool/osm.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -1830,7 +1830,6 @@
{
struct country_table *result=NULL, *lookup;
char *tok,*dup=g_strdup(is_in),*buf=dup;
- int conflict;
int find_town_name = 0;
@@ -1850,7 +1849,6 @@
if (result && result->countryid != lookup->countryid) {
char *label=item_bin_get_attr(ib, attr_town_name, NULL);
osm_warning("node",item_bin_get_nodeid(ib),0,"conflict for %s is_in=%s country %d vs %d\n", label, is_in, lookup->countryid, result->countryid);
- conflict=1;
}
result=lookup;
}
Modified: trunk/navit/navit/maptool/osm_protobuf.c
===================================================================
--- trunk/navit/navit/maptool/osm_protobuf.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/maptool/osm_protobuf.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -203,7 +203,7 @@
{
int i,j=0,has_tags;
long long id=0,lat=0,lon=0,changeset=0,timestamp=0;
- int version,user_sid=0,uid=0;
+ int user_sid=0,uid=0;
if (!dense)
return;
@@ -212,7 +212,6 @@
id+=dense->id[i];
lat+=dense->lat[i];
lon+=dense->lon[i];
- version=dense->denseinfo->version[i];
changeset+=dense->denseinfo->changeset[i];
user_sid+=dense->denseinfo->user_sid[i];
uid+=dense->denseinfo->uid[i];
@@ -220,7 +219,7 @@
has_tags=dense->keys_vals && dense->keys_vals[j];
osm_add_node(id, lat/latlon_scale,lon/latlon_scale);
#if 0
- printf("\t<node id=\"%Ld\" lat=\"%.7f\" lon=\"%.7f\" version=\"%d\" changeset=\"%Ld\"",id,lat/latlon_scale,lon/latlon_scale,version,changeset);
+ printf("\t<node id=\"%Ld\" lat=\"%.7f\" lon=\"%.7f\" version=\"%d\" changeset=\"%Ld\"",id,lat/latlon_scale,lon/latlon_scale,dense->denseinfo->version[i],changeset);
process_user(primitive_block, user_sid, uid, 0);
process_timestamp(timestamp);
#endif
Modified: trunk/navit/navit/maptool/osm_xml.c
===================================================================
--- trunk/navit/navit/maptool/osm_xml.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/maptool/osm_xml.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -75,16 +75,14 @@
osm_xml_decode_entities(char *buffer)
{
char *pos=buffer;
- int i,len,found;
+ int i,len;
while ((pos=strchr(pos, '&'))) {
- found=0;
for (i = 0 ; i < sizeof(entities)/sizeof(struct entity); i++) {
len=strlen(entities[i].entity);
if (!strncmp(pos, entities[i].entity, len)) {
*pos=entities[i].c;
memmove(pos+1, pos+len, strlen(pos+len)+1);
- found=1;
break;
}
}
Modified: trunk/navit/navit/navigation.c
===================================================================
--- trunk/navit/navit/navigation.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/navigation.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -1730,7 +1730,7 @@
{
struct navigation_command *cur,*prev;
int distance=itm->dest_length-cmd->itm->dest_length;
- int level, dist, i, time;
+ int level, i, time;
int speech_time,time2nav;
char *ret,*old,*buf,*next;
@@ -1772,7 +1772,6 @@
speech_time = 30; // assume 3 seconds
}
- dist = prev->itm->dest_length - cur->itm->dest_length;
time = navigation_time(prev->itm,cur->itm->prev);
if (time >= (speech_time + 30)) { // 3 seconds for understanding what has been said
Modified: trunk/navit/navit/navit_nls.c
===================================================================
--- trunk/navit/navit/navit_nls.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/navit_nls.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -7,7 +7,9 @@
#else
#include <libintl.h>
#endif
+#ifdef USE_NATIVE_LANGUAGE_SUPPORT
static GList *textdomains;
+#endif
char *
navit_nls_add_textdomain(const char *package, const char *dir)
Modified: trunk/navit/navit/osd/core/osd_core.c
===================================================================
--- trunk/navit/navit/osd/core/osd_core.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/osd/core/osd_core.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -1484,7 +1484,6 @@
char *
osd_button_icon_path(struct osd_button *this_, char *src)
{
- char *s,*ret;
if (!this_->src_dir)
return graphics_icon_path(src);
return g_strdup_printf("%s%s%s",this_->src_dir, G_DIR_SEPARATOR_S, src);
Modified: trunk/navit/navit/popup.c
===================================================================
--- trunk/navit/navit/popup.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/popup.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -320,7 +320,7 @@
popup_show_item(struct navit *nav, void *popup, struct displayitem *di)
{
struct map_rect *mr;
- void *menu, *menu_map, *menu_item, *menu_dist;
+ void *menu, *menu_item, *menu_dist;
char *label;
struct item *item,*diitem;
int count;
@@ -368,7 +368,6 @@
}
}
map_rect_destroy(mr);
- menu_map=popup_printf(menu, menu_type_submenu, "Map");
} else {
popup_printf(menu, menu_type_menu, "(No map)");
}
Modified: trunk/navit/navit/sunriset.c
===================================================================
--- trunk/navit/navit/sunriset.c 2013-08-11 20:24:19 UTC (rev 5563)
+++ trunk/navit/navit/sunriset.c 2013-08-11 20:24:38 UTC (rev 5564)
@@ -209,7 +209,7 @@
void sun_RA_dec( double d, double *RA, double *dec, double *r )
{
double lon, obl_ecl;
- double xs, ys, zs;
+ double xs, ys;
double xe, ye, ze;
/* Compute Sun's ecliptical coordinates */
@@ -218,7 +218,7 @@
/* Compute ecliptic rectangular coordinates */
xs = *r * cosd(lon);
ys = *r * sind(lon);
- zs = 0; /* because the Sun is always in the ecliptic plane! */
+ /* No zs, because the Sun is always in the ecliptic plane! */
/* Compute obliquity of ecliptic (inclination of Earth's axis) */
obl_ecl = 23.4393 - 3.563E-7 * d;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-11 20:24:24
|
Revision: 5563
http://sourceforge.net/p/navit/code/5563
Author: sleske
Date: 2013-08-11 20:24:19 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Fix:core:Fix warnings from dbg statements.|Part of #1154.
Modified Paths:
--------------
trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
trunk/navit/navit/graphics/sdl/graphics_sdl.c
trunk/navit/navit/map/binfile/binfile.c
trunk/navit/navit/map/csv/csv.c
trunk/navit/navit/map/mg/street.c
trunk/navit/navit/navigation.c
trunk/navit/navit/navit.c
trunk/navit/navit/osd/core/osd_core.c
trunk/navit/navit/popup.c
trunk/navit/navit/route.c
trunk/navit/navit/track.c
trunk/navit/navit/vehicleprofile.c
Modified: trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
===================================================================
--- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2013-08-11 16:00:27 UTC (rev 5562)
+++ trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2013-08-11 20:24:19 UTC (rev 5563)
@@ -735,7 +735,7 @@
gra->background_ready = 0;
}
#ifndef _WIN32
- dbg(1,"window=%d\n", GDK_WINDOW_XID(widget->window));
+ dbg(1,"window=%lu\n", GDK_WINDOW_XID(widget->window));
#endif
gra->width=widget->allocation.width;
gra->height=widget->allocation.height;
Modified: trunk/navit/navit/graphics/sdl/graphics_sdl.c
===================================================================
--- trunk/navit/navit/graphics/sdl/graphics_sdl.c 2013-08-11 16:00:27 UTC (rev 5562)
+++ trunk/navit/navit/graphics/sdl/graphics_sdl.c 2013-08-11 20:24:19 UTC (rev 5563)
@@ -958,7 +958,7 @@
if (new_size > ft_buffer_size) {
g_free (ft_buffer);
ft_buffer = g_malloc (new_size);
- dbg(1, "old_size(%i) new_size(%i) ft_buffer(%i)\n", ft_buffer_size, new_size, ft_buffer);
+ dbg(1, "old_size(%u) new_size(%u) ft_buffer(%p)\n", ft_buffer_size, new_size, ft_buffer);
ft_buffer_size = new_size;
}
}
@@ -1947,7 +1947,6 @@
dbg(2,"key mod: 0x%x\n", key_mod);
if (keybuf[0]) {
- dbg(2,"key: %s 0x%x\n", keybuf, keybuf);
callback_list_call_attr_1(gr->cbl, attr_keypress, (void *)keybuf);
}
break;
Modified: trunk/navit/navit/map/binfile/binfile.c
===================================================================
--- trunk/navit/navit/map/binfile/binfile.c 2013-08-11 16:00:27 UTC (rev 5562)
+++ trunk/navit/navit/map/binfile/binfile.c 2013-08-11 20:24:19 UTC (rev 5563)
@@ -1761,7 +1761,7 @@
return 0;
if (!binfile_attr_get(mr->item.priv_data, attr_zipfile_ref, &at))
return 0;
- dbg(1,"pushing zipfile %d from %d\n", at.u.num, mr->t->zipfile_num);
+ dbg(1,"pushing zipfile %ld from %d\n", at.u.num, mr->t->zipfile_num);
return push_zipfile_tile(mr, at.u.num, 0, 0, async);
}
Modified: trunk/navit/navit/map/csv/csv.c
===================================================================
--- trunk/navit/navit/map/csv/csv.c 2013-08-11 16:00:27 UTC (rev 5562)
+++ trunk/navit/navit/map/csv/csv.c 2013-08-11 20:24:19 UTC (rev 5563)
@@ -848,7 +848,7 @@
fclose(fp);
}
else {
- dbg(0,"Error opening csv map file %d, starting with empty map\n", m->filename);
+ dbg(0,"Error opening csv map file %s, starting with empty map\n", m->filename);
}
} else {
dbg(1,"No data attribute, starting with in-memory map\n");
Modified: trunk/navit/navit/map/mg/street.c
===================================================================
--- trunk/navit/navit/map/mg/street.c 2013-08-11 16:00:27 UTC (rev 5562)
+++ trunk/navit/navit/map/mg/street.c 2013-08-11 20:24:19 UTC (rev 5563)
@@ -1058,7 +1058,6 @@
return 0;
return item_attr_get(mr->search_item_tmp, attr_type, attr);
default:
- dbg(0,"%p\n",mr->street.name_numbers.dist);
dbg(0,"unknown attr %s\n",attr_to_name(attr_type));
return 0;
}
Modified: trunk/navit/navit/navigation.c
===================================================================
--- trunk/navit/navit/navigation.c 2013-08-11 16:00:27 UTC (rev 5562)
+++ trunk/navit/navit/navigation.c 2013-08-11 20:24:19 UTC (rev 5563)
@@ -759,7 +759,7 @@
return;
}
- dbg(1,"length=%d time=%d speed=%d\n", length.u.num, time.u.num, speed.u.num);
+ dbg(1,"length=%ld time=%ld speed=%ld\n", length.u.num, time.u.num, speed.u.num);
itm->length=length.u.num;
itm->time=time.u.num;
itm->speed=speed.u.num;
@@ -1447,7 +1447,7 @@
if (!vocabulary2)
n2=NULL;
if(!n1 && !n2 && itm->way.item.type == type_ramp && vocabulary2) {
- dbg(1,">> Next is ramp %lx current is %lx \n", itm->way.item.type, next->way.item.type);
+ dbg(1,">> Next is ramp %x current is %x \n", itm->way.item.type, next->way.item.type);
if(next->way.item.type == type_ramp)
return NULL;
Modified: trunk/navit/navit/navit.c
===================================================================
--- trunk/navit/navit/navit.c 2013-08-11 16:00:27 UTC (rev 5562)
+++ trunk/navit/navit/navit.c 2013-08-11 20:24:19 UTC (rev 5563)
@@ -1822,7 +1822,7 @@
if(this_->speech) {
if (!speech_get_attr(this_->speech, attr_active, &attr, NULL))
attr.u.num = 1;
- dbg(1, "this_.speech->active %i\n", attr.u.num);
+ dbg(1, "this_.speech->active %ld\n", attr.u.num);
if(attr.u.num)
speech_say(this_->speech, text);
}
@@ -1869,7 +1869,7 @@
if (!speech_get_attr(this_->speech, attr_active, &attr, NULL))
attr.u.num = 1;
- dbg(1, "this_.speech->active %i\n", attr.u.num);
+ dbg(1, "this_.speech->active %ld\n", attr.u.num);
if(!attr.u.num)
return;
@@ -1923,7 +1923,7 @@
param[0].name=_("Command");
item_attr_get(item, attr_length, &attr);
- dbg(2, "Length=%d\n", attr.u.num);
+ dbg(2, "Length=%ld\n", attr.u.num);
param[1].name=_("Length");
if ( attr.u.num >= 2000 )
@@ -1936,7 +1936,7 @@
}
item_attr_get(item, attr_time, &attr);
- dbg(2, "Time=%d\n", attr.u.num);
+ dbg(2, "Time=%ld\n", attr.u.num);
secs=attr.u.num/10;
param[2].name=_("Time");
if ( secs >= 3600 )
@@ -1949,7 +1949,7 @@
}
item_attr_get(item, attr_destination_length, &attr);
- dbg(2, "Destlength=%d\n", attr.u.num);
+ dbg(2, "Destlength=%ld\n", attr.u.num);
param[3].name=_("Destination Length");
if ( attr.u.num >= 2000 )
{
@@ -1961,7 +1961,7 @@
}
item_attr_get(item, attr_destination_time, &attr);
- dbg(2, "Desttime=%d\n", attr.u.num);
+ dbg(2, "Desttime=%ld\n", attr.u.num);
secs=attr.u.num/10;
param[4].name=_("Destination Time");
if ( secs >= 3600 )
@@ -2479,7 +2479,7 @@
}
break;
case attr_osd_configuration:
- dbg(0,"setting osd_configuration to %d (was %d)\n", attr->u.num, this_->osd_configuration);
+ dbg(0,"setting osd_configuration to %ld (was %d)\n", attr->u.num, this_->osd_configuration);
attr_updated=(this_->osd_configuration != attr->u.num);
this_->osd_configuration=attr->u.num;
break;
Modified: trunk/navit/navit/osd/core/osd_core.c
===================================================================
--- trunk/navit/navit/osd/core/osd_core.c 2013-08-11 16:00:27 UTC (rev 5562)
+++ trunk/navit/navit/osd/core/osd_core.c 2013-08-11 20:24:19 UTC (rev 5563)
@@ -3153,7 +3153,7 @@
case 2:
strength=2;
if (vehicle_get_attr(vehicle_attr.u.vehicle, attr_position_sats_used, &attr, NULL)) {
- dbg(1,"num=%d\n", attr.u.num);
+ dbg(1,"num=%ld\n", attr.u.num);
if (attr.u.num >= 3)
strength=attr.u.num-1;
if (strength > 5)
Modified: trunk/navit/navit/popup.c
===================================================================
--- trunk/navit/navit/popup.c 2013-08-11 16:00:27 UTC (rev 5562)
+++ trunk/navit/navit/popup.c 2013-08-11 20:24:19 UTC (rev 5563)
@@ -87,7 +87,7 @@
}
else
{
- dbg(0,"could not open file for distortions !!", item);
+ dbg(0,"could not open file for distortions !!");
} /* else - if (map) */
g_free(dist_filename); /* free the file name */
Modified: trunk/navit/navit/route.c
===================================================================
--- trunk/navit/navit/route.c 2013-08-11 16:00:27 UTC (rev 5562)
+++ trunk/navit/navit/route.c 2013-08-11 20:24:19 UTC (rev 5563)
@@ -3572,8 +3572,6 @@
struct route *route=mr->mpriv->route;
void *id=0;
- dbg(1,"enter\n", mr->pos);
-
switch (mr->item.type) {
case type_none:
if (route->pos && route->pos->street_direction && route->pos->street_direction != route->pos->dir)
@@ -3887,7 +3885,7 @@
attr->u.num+=path->path_time;
path=path->next;
}
- dbg(1,"path_time %d\n",attr->u.num);
+ dbg(1,"path_time %ld\n",attr->u.num);
} else
ret=0;
break;
Modified: trunk/navit/navit/track.c
===================================================================
--- trunk/navit/navit/track.c 2013-08-11 16:00:27 UTC (rev 5562)
+++ trunk/navit/navit/track.c 2013-08-11 20:24:19 UTC (rev 5563)
@@ -687,7 +687,7 @@
static_distance.u.num=10;
dbg(1,"Using defaults for static position detection\n");
}
- dbg(2,"Static speed: %u, static distance: %u\n",static_speed.u.num, static_distance.u.num);
+ dbg(2,"Static speed: %ld, static distance: %ld\n",static_speed.u.num, static_distance.u.num);
time=iso8601_to_secs(time_attr.u.str);
speed=*speed_attr.u.numd;
direction=*direction_attr.u.numd;
@@ -720,7 +720,7 @@
espeed=speed;
edirection=direction;
}
- dbg(1,"lag %d speed %f direction %d\n",lag.u.num,espeed,edirection);
+ dbg(1,"lag %ld speed %f direction %d\n",lag.u.num,espeed,edirection);
dbg(1,"old 0x%x,0x%x\n",tr->curr_in.x, tr->curr_in.y);
transform_project(pro, &tr->curr_in, espeed*lag.u.num/36, edirection, &tr->curr_in);
dbg(1,"new 0x%x,0x%x\n",tr->curr_in.x, tr->curr_in.y);
Modified: trunk/navit/navit/vehicleprofile.c
===================================================================
--- trunk/navit/navit/vehicleprofile.c 2013-08-11 16:00:27 UTC (rev 5562)
+++ trunk/navit/navit/vehicleprofile.c 2013-08-11 20:24:19 UTC (rev 5563)
@@ -30,7 +30,7 @@
static void
vehicleprofile_set_attr_do(struct vehicleprofile *this_, struct attr *attr)
{
- dbg(1,"%s:%d\n", attr_to_name(attr->type), attr->u.num);
+ dbg(1,"%s:%ld\n", attr_to_name(attr->type), attr->u.num);
switch (attr->type) {
case attr_flags:
this_->flags=attr->u.num;
@@ -200,7 +200,7 @@
if (!profile_option.u.navit_object->func->get_attr(profile_option.u.navit_object, attr_active, &active, NULL))
active.u.num=0;
if (profile_option.u.navit_object->func->get_attr(profile_option.u.navit_object, attr_name, &name, NULL))
- dbg(0,"%p %s %d\n",profile_option.u.navit_object,name.u.str,active.u.num);
+ dbg(0,"%p %s %ld\n",profile_option.u.navit_object,name.u.str,active.u.num);
if (active.u.num)
vehicleprofile_apply_attrs(this_, profile_option.u.navit_object, 1);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2013-08-11 16:00:32
|
Revision: 5562
http://sourceforge.net/p/navit/code/5562
Author: mdankov
Date: 2013-08-11 16:00:27 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Add:port_android:Backup / Restore Function for Android Devices, see #1148|thank you, kamikaaze!
Modified Paths:
--------------
trunk/navit/navit/android/res/values/strings.xml
trunk/navit/navit/android/res/values-de/strings.xml
trunk/navit/navit/android/src/org/navitproject/navit/Navit.java
trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java
Added Paths:
-----------
trunk/navit/navit/android/src/org/navitproject/navit/NavitBackupTask.java
trunk/navit/navit/android/src/org/navitproject/navit/NavitRestoreTask.java
Modified: trunk/navit/navit/android/res/values/strings.xml
===================================================================
--- trunk/navit/navit/android/res/values/strings.xml 2013-08-09 09:33:25 UTC (rev 5561)
+++ trunk/navit/navit/android/res/values/strings.xml 2013-08-11 16:00:27 UTC (rev 5562)
@@ -28,14 +28,15 @@
<string name="optionsmenu_toggle_poi">Toggle POIs</string>
<string name="optionsmenu_address_search">@string/address_search_title</string>
<string name="optionsmenu_exit_navit">Exit Navit</string>
-
+ <string name="optionsmenu_backup_restore">Backup / Restore</string>
+
<!-- POSITION POP-UP -->
<string name="position_popup_title">Position</string>
<string name="position_popup_drive_here">Route to here</string>
<!-- MAP DOWNLOAD -->
<string name="map_delete">Delete this map?</string>
- <string name="map_download_title">Map Download</string>
+ <string name="map_download_title">Map download</string>
<string name="map_download_downloading">Downloading:</string>
<string name="map_download_eta">ETA</string>
<string name="map_download_ready">ready</string>
@@ -59,6 +60,26 @@
<string name="address_search_set_destination">Setting destination to:</string>
<string name="address_search_towns">Towns</string>
<string name="address_search_streets">Streets</string>
-
+
+ <!-- Backup Restore -->
+ <string name="choose_an_action">Choose an action</string>
+ <string name="please_insert_an_sd_card">Please insert an SD Card</string>
+ <string name="backing_up">Backing up...</string>
+ <string name="restoring">Restoring...</string>
+ <string name="failed_to_create_backup_directory">Failed to create backup directory</string>
+ <string name="backup_failed">Backup failed</string>
+ <string name="no_backup_found">No backup found</string>
+ <string name="failed_to_restore">Failed to restore</string>
+ <string name="backup_successful">Backup successful</string>
+ <string name="restore_successful_please_restart_navit">Restore Successful\nPlease restart Navit</string>
+ <string name="backup_not_found">Backup not found</string>
+ <string name="restore_failed">Restore failed</string>
+ <string name="select_backup">Select backup</string>
+ <string name="backup">Backup</string>
+ <string name="restore">Restore</string>
+ <string-array name="dialog_backup_restore_items">
+ <item >@string/backup</item>
+ <item >@string/restore</item>
+ </string-array>
</resources>
Modified: trunk/navit/navit/android/res/values-de/strings.xml
===================================================================
--- trunk/navit/navit/android/res/values-de/strings.xml 2013-08-09 09:33:25 UTC (rev 5561)
+++ trunk/navit/navit/android/res/values-de/strings.xml 2013-08-11 16:00:27 UTC (rev 5562)
@@ -24,6 +24,7 @@
<string name="optionsmenu_toggle_poi">POI ein/aus</string>
<string name="optionsmenu_address_search">@string/address_search_title</string>
<string name="optionsmenu_exit_navit">Navit beenden</string>
+ <string name="optionsmenu_backup_restore">Sichern / Wiederherstellen</string>
<!-- POSITION POP-UP -->
<string name="position_popup_title">Position</string>
@@ -55,5 +56,21 @@
<string name="address_search_set_destination">Neues Fahrziel:</string>
<string name="address_search_towns">Städte</string>
<string name="address_search_streets">Straßen</string>
+
+ <!-- Backup Restore -->
+ <string name="choose_an_action">Bitte auswählen</string>
+ <string name="please_insert_an_sd_card">Bitte eine SD Karte einlegen</string>
+ <string name="backing_up">Sichern...</string>
+ <string name="failed_to_create_backup_directory">Sicherungsverzeichnis konnte nicht erstellt werden</string>
+ <string name="backup_failed">Sicherung Fehlgeschlagen</string>
+ <string name="no_backup_found">Keine Sicherung gefunden</string>
+ <string name="failed_to_restore">Fehler beim Wiederherstellen</string>
+ <string name="backup_successful">Sicherung erfolgreich</string>
+ <string name="restore_successful_please_restart_navit">Sicherung Erfolgreich\nNavit bitte neustarten</string>
+ <string name="backup_not_found">Backup nicht gefunden</string>
+ <string name="restore_failed">Wiederherstellen fehlgeschlagen</string>
+ <string name="select_backup">Backup auswählen</string>
+ <string name="backup">Sichern</string>
+ <string name="restore">Wiederherstellen</string>
</resources>
Modified: trunk/navit/navit/android/src/org/navitproject/navit/Navit.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/Navit.java 2013-08-09 09:33:25 UTC (rev 5561)
+++ trunk/navit/navit/android/src/org/navitproject/navit/Navit.java 2013-08-11 16:00:27 UTC (rev 5562)
@@ -22,6 +22,9 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -92,6 +95,46 @@
static final String FIRST_STARTUP_FILE = NAVIT_DATA_SHARE_DIR + "/has_run_once.txt";
public static final String NAVIT_PREFS = "NavitPrefs";
+ public void removeFileIfExists(String source) {
+ File file = new File(source);
+
+ if (!file.exists())
+ return;
+
+ file.delete();
+ }
+
+ public void copyFileIfExists(String source, String destination) throws IOException {
+ File file = new File(source);
+
+ if (!file.exists())
+ return;
+
+ FileInputStream is = null;
+ FileOutputStream os = null;
+
+ try {
+ is = new FileInputStream(source);
+ os = new FileOutputStream(destination);
+
+ int len;
+ byte buffer[] = new byte[1024];
+
+ while ((len = is.read(buffer)) != -1) {
+ os.write(buffer, 0, len);
+ }
+ } finally {
+ /* Close the FileStreams to prevent Resource leaks */
+ if (is != null)
+ is.close();
+
+ if (os != null)
+ os.close();
+ }
+ return;
+ }
+
+
public static String get_text(String in)
{
return NavitTextTranslations.get_text(in);
@@ -418,6 +461,11 @@
menu.add(1, 6, 500, getString(R.string.optionsmenu_address_search)); //TRANS
menu.add(1, 99, 900, getString(R.string.optionsmenu_exit_navit)); //TRANS
+
+ /* Only show the Backup to SD-Card Option if we really have one */
+ if(Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED))
+ menu.add(1, 7, 700, getString(R.string.optionsmenu_backup_restore)); //TRANS
+
return true;
}
@@ -500,6 +548,10 @@
Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);
this.startActivityForResult(search_intent, NavitAddressSearch_id);
break;
+ case 7 :
+ /* Backup / Restore */
+ showDialog(NavitDialogs.DIALOG_BACKUP_RESTORE);
+ break;
case 99 :
// exit
this.onStop();
@@ -550,7 +602,13 @@
}
}
- protected Dialog onCreateDialog(int id)
+ @Override
+ protected void onPrepareDialog(int id, Dialog dialog) {
+ dialogs.prepareDialog(id, dialog);
+ super.onPrepareDialog(id, dialog);
+ }
+
+ protected Dialog onCreateDialog(int id)
{
return dialogs.createDialog(id);
}
Added: trunk/navit/navit/android/src/org/navitproject/navit/NavitBackupTask.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitBackupTask.java (rev 0)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitBackupTask.java 2013-08-11 16:00:27 UTC (rev 5562)
@@ -0,0 +1,126 @@
+
+package org.navitproject.navit;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Environment;
+import android.text.format.Time;
+import android.widget.Toast;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+
+public class NavitBackupTask extends AsyncTask<Void, Void, String> {
+
+ private Navit mActivity;
+
+ private ProgressDialog mDialog;
+
+ public NavitBackupTask(Navit context) {
+ mActivity = context;
+ }
+
+ @Override
+ protected void onPreExecute() {
+ super.onPreExecute();
+
+ /* Create a Wait Progress Dialog to inform the User that we are working */
+ mDialog = new ProgressDialog(mActivity);
+ mDialog.setIndeterminate(true);
+ mDialog.setMessage(mActivity.getString(R.string.backing_up));
+ mDialog.show();
+ }
+
+ @Override
+ protected String doInBackground(Void... v) {
+ Time now = new Time();
+ now.setToNow();
+
+ /* This is the Directory where all Subdirectories are stored by date */
+ File mainBackupDir = new File(Environment.getExternalStorageDirectory().getPath() + "/navit/backup/");
+
+ /* Create the Main Backup Directory if it doesn't exist */
+ if (!mainBackupDir.isDirectory()) {
+ if (!mainBackupDir.mkdirs())
+ return mActivity.getString(R.string.failed_to_create_backup_directory);
+ }
+
+ /* Create a Timestamp in the format YYYY-MM-DD-Index */
+ String timestamp = now.year + "-" + String.format("%02d", now.month+1) + "-" + String.format("%02d", now.monthDay);
+ /* Get the next free index */
+ int index = 1;
+ for (String s : mainBackupDir.list()) {
+ if (s.contains(timestamp)) {
+ int newIndex = Integer.parseInt(s.substring(11));
+ if (newIndex >= index)
+ index = newIndex + 1;
+ }
+ }
+ timestamp += "-" + index;
+
+ /* This is the Directory in which the Files are copied into */
+ File backupDir = new File(Environment.getExternalStorageDirectory().getPath() + "/navit/backup/" + timestamp);
+
+ /* Create the Backup Directory if it doesn't exist */
+ if (!backupDir.isDirectory()) {
+ if (!backupDir.mkdirs())
+ return mActivity.getString(R.string.failed_to_create_backup_directory);
+ }
+
+ ObjectOutputStream preferencesOOs = null;
+ try {
+ /* Backup Files in home */
+ mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/bookmark.txt", backupDir.getPath() + "/bookmark.txt");
+ mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/destination.txt", backupDir.getPath() + "/destination.txt");
+ mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/gui_internal.txt", backupDir.getPath() + "/gui_internal.txt");
+
+ /* Backup Shared Preferences */
+ preferencesOOs = new ObjectOutputStream(new FileOutputStream(backupDir.getPath() + "/preferences.bak"));
+ preferencesOOs.writeObject(mActivity.getSharedPreferences(Navit.NAVIT_PREFS, Context.MODE_PRIVATE).getAll());
+ }
+ catch (IOException e) {
+ e.printStackTrace();
+ return mActivity.getString(R.string.backup_failed);
+ }
+ finally {
+ /* Close Stream to prevent Resource Leaks */
+ try {
+ if (preferencesOOs != null)
+ preferencesOOs.close();
+ }
+ catch (IOException e) {
+ e.printStackTrace();
+ return mActivity.getString(R.string.backup_failed);
+ }
+ }
+
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(String result) {
+ super.onPostExecute(result);
+
+ /* Dismiss the Wait Progress Dialog */
+ mDialog.dismiss();
+
+ /* If result is non null an Error occured */
+ if (result != null) {
+ Toast.makeText(mActivity, result, Toast.LENGTH_LONG).show();
+ return;
+ }
+
+ Toast.makeText(mActivity, mActivity.getString(R.string.backup_successful), Toast.LENGTH_LONG).show();
+ }
+
+ @Override
+ protected void onCancelled() {
+ super.onCancelled();
+ Toast.makeText(mActivity, mActivity.getString(R.string.backup_failed), Toast.LENGTH_LONG).show();
+ mDialog.dismiss();
+ }
+}
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java 2013-08-09 09:33:25 UTC (rev 5561)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java 2013-08-11 16:00:27 UTC (rev 5562)
@@ -1,19 +1,26 @@
package org.navitproject.navit;
+import java.io.File;
+import android.app.AlertDialog;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.util.Log;
+import android.widget.ArrayAdapter;
import android.widget.Toast;
+import android.os.Environment;
public class NavitDialogs extends Handler{
// Dialogs
public static final int DIALOG_MAPDOWNLOAD = 1;
-
+ public static final int DIALOG_BACKUP_RESTORE = 2;
+ public static final int DIALOG_SELECT_BACKUP = 3;
+
// dialog messages
static final int MSG_MAP_DOWNLOAD_FINISHED = 0;
static final int MSG_PROGRESS_BAR = 1;
@@ -107,6 +114,8 @@
Dialog createDialog(int id)
{
+ AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
+
switch (id)
{
case DIALOG_MAPDOWNLOAD :
@@ -131,8 +140,68 @@
Navit.get_text("Map data (c) OpenStreetMap contributors, CC-BY-SA"),
Toast.LENGTH_LONG).show(); //TRANS
return mapdownloader_dialog;
+
+ case DIALOG_BACKUP_RESTORE :
+ /* Create a Dialog that Displays Options wether to Backup or Restore */
+ builder.setTitle(mActivity.getString(R.string.choose_an_action)).
+ setCancelable(true).
+ setItems(R.array.dialog_backup_restore_items,
+ new DialogInterface.OnClickListener() {
+
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ /* Notify User if no SD Card present */
+ if(!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED))
+ Toast.makeText(mActivity,mActivity.getString(R.string.please_insert_an_sd_card), Toast.LENGTH_LONG).show();
+
+ switch (which) {
+ case 0:
+ /* Backup */
+ new NavitBackupTask(mActivity).execute();
+ break;
+ case 1:
+ /* Restore */
+ mActivity.showDialog(DIALOG_SELECT_BACKUP);
+ break;
+ }
+ }});
+ return builder.create();
+
+ case DIALOG_SELECT_BACKUP :
+ /* Create a Dialog with a list from which the user selects the Backup to be restored */
+ File mainBackupDir = new File(Environment.getExternalStorageDirectory().getPath() + "/navit/backup/");
+
+ String[] backups = null;
+ if(mainBackupDir.isDirectory())
+ backups = mainBackupDir.list();
+
+ if(backups == null || backups.length == 0) {
+ /* No Backups were found */
+ builder.setTitle(mActivity.getText(R.string.no_backup_found));
+ builder.setNegativeButton(mActivity.getText(android.R.string.cancel), null);
+ return builder.create();
+ }
+
+ builder.setTitle(mActivity.getString(R.string.select_backup));
+ final ArrayAdapter<String> adapter = new ArrayAdapter<String>(mActivity, android.R.layout.simple_spinner_item, backups);
+ builder.setAdapter(adapter, new OnClickListener(){
+
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ new NavitRestoreTask(mActivity, adapter.getItem(which)).execute();
+ }});
+ builder.setNegativeButton(mActivity.getString(android.R.string.cancel), null);
+
+ return builder.create();
}
// should never get here!!
return null;
}
+
+ public void prepareDialog(int id, Dialog dialog) {
+
+ /* Remove the Dialog to force Android to rerun onCreateDialog */
+ if(id == DIALOG_SELECT_BACKUP)
+ mActivity.removeDialog(id);
+ }
}
Added: trunk/navit/navit/android/src/org/navitproject/navit/NavitRestoreTask.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitRestoreTask.java (rev 0)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitRestoreTask.java 2013-08-11 16:00:27 UTC (rev 5562)
@@ -0,0 +1,144 @@
+
+package org.navitproject.navit;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.SharedPreferences.Editor;
+import android.os.AsyncTask;
+import android.os.Environment;
+import android.widget.Toast;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public class NavitRestoreTask extends AsyncTask<Void, Void, String> {
+
+ private Navit mActivity;
+
+ private ProgressDialog mDialog;
+
+ private String mTimestamp;
+
+ public NavitRestoreTask(Navit context, String timestamp) {
+ mActivity = context;
+ mTimestamp = timestamp;
+ }
+
+ @Override
+ protected void onPreExecute() {
+ super.onPreExecute();
+
+ /* Create a Wait Progress Dialog to inform the User that we are working */
+ mDialog = new ProgressDialog(mActivity);
+ mDialog.setIndeterminate(true);
+ mDialog.setMessage(mActivity.getString(R.string.restoring));
+ mDialog.show();
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected String doInBackground(Void... v) {
+
+ /* This is the Directory where all Subdirectories are stored by date */
+ File backupDir = new File(Environment.getExternalStorageDirectory().getPath() + "/navit/backup/" + mTimestamp);
+
+ /* Check if there is a Backup Directory */
+ if (!backupDir.isDirectory())
+ return mActivity.getString(R.string.backup_not_found);
+
+ ObjectInputStream preferenceOIS = null;
+ try {
+ /* Delete all old Files in Home */
+ mActivity.removeFileIfExists(Navit.NAVIT_DATA_DIR + "/home/bookmark.txt");
+ mActivity.removeFileIfExists(Navit.NAVIT_DATA_DIR + "/home/destination.txt");
+ mActivity.removeFileIfExists(Navit.NAVIT_DATA_DIR + "/home/gui_internal.txt");
+
+
+ /* Restore Files in home */
+ mActivity.copyFileIfExists(backupDir.getPath() + "/bookmark.txt", Navit.NAVIT_DATA_DIR + "/home/bookmark.txt");
+ mActivity.copyFileIfExists(backupDir.getPath() + "/destination.txt", Navit.NAVIT_DATA_DIR + "/home/destination.txt");
+ mActivity.copyFileIfExists(backupDir.getPath() + "/gui_internal.txt", Navit.NAVIT_DATA_DIR + "/home/gui_internal.txt");
+
+ /* Restore Shared Preferences */
+ preferenceOIS = new ObjectInputStream(new FileInputStream(backupDir.getPath() + "/preferences.bak"));
+ Map<String, ?> entries = (Map<String, ?>) preferenceOIS.readObject();
+
+ Editor prefEditor = mActivity.getSharedPreferences(Navit.NAVIT_PREFS, Context.MODE_PRIVATE).edit();
+
+ /* Remove all old Preferences */
+ prefEditor.clear();
+
+ /* Iterate through all Entries and add them to our Preferences */
+ for (Entry<String, ?> entry : entries.entrySet()) {
+ Object value = entry.getValue();
+ String key = entry.getKey();
+
+ if (value instanceof Boolean)
+ prefEditor.putBoolean(key, ((Boolean) value).booleanValue());
+ else if (value instanceof Float)
+ prefEditor.putFloat(key, ((Float) value).floatValue());
+ else if (value instanceof Integer)
+ prefEditor.putInt(key, ((Integer) value).intValue());
+ else if (value instanceof Long)
+ prefEditor.putLong(key, ((Long) value).longValue());
+ else if (value instanceof String)
+ prefEditor.putString(key, (String) value);
+ }
+
+ if (!prefEditor.commit())
+ return mActivity.getString(R.string.failed_to_restore);
+
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ return mActivity.getString(R.string.failed_to_restore);
+ }
+ finally {
+ try {
+ /* Close Stream to prevent Resource leak */
+ if (preferenceOIS != null)
+ preferenceOIS.close();
+ }
+ catch (IOException e) {
+
+ }
+ }
+
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(String result) {
+ super.onPostExecute(result);
+
+ /* Dismiss the Wait Progress Dialog */
+ mDialog.dismiss();
+
+ /* If result is non null an Error occured */
+ if (result != null) {
+ Toast.makeText(mActivity, result, Toast.LENGTH_LONG).show();
+ return;
+ }
+
+ /* Navit needs to be restarted. Currently the User has to restart it by himself */
+ Toast.makeText(mActivity, mActivity.getString(R.string.restore_successful_please_restart_navit), Toast.LENGTH_LONG).show();
+ NotificationManager nm = (NotificationManager) mActivity.getSystemService(Context.NOTIFICATION_SERVICE);
+ nm.cancel(R.string.app_name);
+ NavitVehicle.removeListener();
+ mActivity.finish();
+ }
+
+ @Override
+ protected void onCancelled() {
+ super.onCancelled();
+ Toast.makeText(mActivity, mActivity.getString(R.string.restore_failed), Toast.LENGTH_LONG).show();
+ mDialog.dismiss();
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2013-08-09 09:33:27
|
Revision: 5561
http://sourceforge.net/p/navit/code/5561
Author: martin-s
Date: 2013-08-09 09:33:25 +0000 (Fri, 09 Aug 2013)
Log Message:
-----------
Add:Core:Possibility to query timeout attribute
Modified Paths:
--------------
trunk/navit/navit/navit.c
Modified: trunk/navit/navit/navit.c
===================================================================
--- trunk/navit/navit/navit.c 2013-08-04 15:44:59 UTC (rev 5560)
+++ trunk/navit/navit/navit.c 2013-08-09 09:33:25 UTC (rev 5561)
@@ -2740,6 +2740,9 @@
case attr_speech:
attr->u.speech=this_->speech;
break;
+ case attr_timeout:
+ attr->u.num=this_->center_timeout;
+ break;
case attr_tracking:
attr->u.num=this_->tracking_flag;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2013-08-04 15:45:02
|
Revision: 5560
http://sourceforge.net/p/navit/code/5560
Author: martin-s
Date: 2013-08-04 15:44:59 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Add:Core:Improved line to polygon conversion for more quality and speed
Modified Paths:
--------------
trunk/navit/navit/graphics.c
Modified: trunk/navit/navit/graphics.c
===================================================================
--- trunk/navit/navit/graphics.c 2013-08-03 23:43:43 UTC (rev 5559)
+++ trunk/navit/navit/graphics.c 2013-08-04 15:44:59 UTC (rev 5560)
@@ -1186,9 +1186,11 @@
struct point * res)
{
int n, a, b;
+ dbg(1,"%d,%d - %d,%d x %d,%d-%d,%d\n",a1->x,a1->y,a1->x+adx,a1->y+ady,b1->x,b1->y,b1->x+bdx,b1->y+bdy);
n = bdy * adx - bdx * ady;
a = bdx * (a1->y - b1->y) - bdy * (a1->x - b1->x);
b = adx * (a1->y - b1->y) - ady * (a1->x - b1->x);
+ dbg(1,"a %d b %d n %d\n",a,b,n);
if (n < 0) {
n = -n;
a = -a;
@@ -1204,6 +1206,7 @@
return 0;
res->x = a1->x + a * adx / n;
res->y = a1->y + a * ady / n;
+ dbg(1,"%d,%d\n",res->x,res->y);
return 1;
}
@@ -1404,141 +1407,217 @@
return p;
}
-struct offset {
- int px,py,nx,ny;
+#if 0
+static void
+debug_line(struct graphics *gra, struct graphics_gc *gc, struct point *pnt, int dx, int dy)
+{
+ struct point p[2];
+ p[0]=p[1]=*pnt;
+ p[1].x+=dx;
+ p[1].y+=dy;
+ gra->meth.draw_lines(gra->priv, gc->priv, p, 2);
+}
+
+static void
+debug_point(struct graphics *gra, struct graphics_gc *gc, struct point *pnt, int s)
+{
+ struct point p[4];
+ p[0]=p[1]=p[2]=*pnt;
+ p[0].x-=s;
+ p[0].y+=s;
+ p[1].x+=s;
+ p[1].y+=s;
+ p[2].y-=s;
+ p[3]=p[0];
+ gra->meth.draw_lines(gra->priv, gc->priv, p, 4);
+}
+#endif
+
+struct draw_polyline_shape {
+ int wi;
+ int step;
+ int fow;
+ int dx,dy;
+ int dxw,dyw;
+ int l,lscale;
};
+struct draw_polyline_context {
+ int prec;
+ int ppos,npos;
+ struct point *res;
+ struct draw_polyline_shape shape;
+ struct draw_polyline_shape prev_shape;
+};
static void
-calc_offsets(int wi, int l, int dx, int dy, struct offset *res)
+draw_shape_update(struct draw_polyline_shape *shape)
{
- int x,y;
+ shape->dxw = -(shape->dx * shape->wi * shape->lscale) / shape->l;
+ shape->dyw = (shape->dy * shape->wi * shape->lscale) / shape->l;
+}
- x = (dx * wi) / l;
- y = (dy * wi) / l;
- if (x < 0) {
- res->nx = -x/2;
- res->px = (x-1)/2;
+static void
+draw_shape(struct draw_polyline_context *ctx, struct point *pnt, int wi)
+{
+ int dxs,dys,lscales;
+ int lscale=16;
+ int l;
+ struct draw_polyline_shape *shape=&ctx->shape;
+ struct draw_polyline_shape *prev=&ctx->prev_shape;
+
+ *prev=*shape;
+ if (prev->wi != wi && prev->l) {
+ prev->wi=wi;
+ draw_shape_update(prev);
+ }
+ shape->wi=wi;
+ shape->dx = (pnt[1].x - pnt[0].x);
+ shape->dy = (pnt[1].y - pnt[0].y);
+ if (wi > 16)
+ shape->step=4;
+ else if (wi > 8)
+ shape->step=8;
+ else
+ shape->step=16;
+#if 0
+ l = int_sqrt(dx * dx * lscale * lscale + dy * dy * lscale * lscale);
+#else
+ dxs=shape->dx*shape->dx;
+ dys=shape->dy*shape->dy;
+ lscales=lscale*lscale;
+ if (dxs + dys > lscales)
+ l = int_sqrt(dxs+dys)*lscale;
+ else
+ l = int_sqrt((dxs+dys)*lscales);
+#endif
+ shape->fow=fowler(-shape->dy, shape->dx);
+ dbg(1,"fow=%d\n",shape->fow);
+ if (! l)
+ l=1;
+ if (wi*lscale > 10000)
+ lscale=10000/wi;
+ dbg_assert(wi*lscale <= 10000);
+ shape->l=l;
+ shape->lscale=lscale;
+ shape->wi=wi;
+ draw_shape_update(shape);
+}
+
+static void
+draw_point(struct draw_polyline_shape *shape, struct point *src, struct point *dst, int pos)
+{
+ if (pos) {
+ dst->x=(src->x*2-shape->dyw)/2;
+ dst->y=(src->y*2-shape->dxw)/2;
} else {
- res->nx = -(x+1)/2;
- res->px = x/2;
+ dst->x=(src->x*2+shape->dyw)/2;
+ dst->y=(src->y*2+shape->dxw)/2;
}
- if (y < 0) {
- res->ny = -y/2;
- res->py = (y-1)/2;
+}
+
+static void
+draw_begin(struct draw_polyline_context *ctx, struct point *p)
+{
+ struct draw_polyline_shape *shape=&ctx->shape;
+ int i;
+ for (i = 0 ; i <= 32 ; i+=shape->step) {
+ ctx->res[ctx->ppos].x=(p->x*256+(shape->dyw*circle64[i].y)+(shape->dxw*circle64[i].x))/256;
+ ctx->res[ctx->ppos].y=(p->y*256+(shape->dxw*circle64[i].y)-(shape->dyw*circle64[i].x))/256;
+ ctx->ppos++;
+ }
+}
+
+static int
+draw_middle(struct draw_polyline_context *ctx, struct point *p)
+{
+ int delta=ctx->prev_shape.fow-ctx->shape.fow;
+ if (delta > 512)
+ delta-=1024;
+ if (delta < -512)
+ delta+=1024;
+ if (delta < 16 && delta > -16) {
+ draw_point(&ctx->shape, p, &ctx->res[ctx->npos--], 0);
+ draw_point(&ctx->shape, p, &ctx->res[ctx->ppos++], 1);
+ return 1;
+ }
+ dbg(1,"delta %d\n",delta);
+ if (delta > 0) {
+ struct point pos,poso;
+ draw_point(&ctx->shape, p, &pos, 1);
+ draw_point(&ctx->prev_shape, p, &poso, 1);
+ if (delta >= 256)
+ return 0;
+ if (intersection(&pos, ctx->shape.dx, ctx->shape.dy, &poso, ctx->prev_shape.dx, ctx->prev_shape.dy, &ctx->res[ctx->ppos])) {
+ ctx->ppos++;
+ draw_point(&ctx->prev_shape, p, &ctx->res[ctx->npos--], 0);
+ draw_point(&ctx->shape, p, &ctx->res[ctx->npos--], 0);
+ return 1;
+ }
} else {
- res->ny = -(y+1)/2;
- res->py = y/2;
+ struct point neg,nego;
+ draw_point(&ctx->shape, p, &neg, 0);
+ draw_point(&ctx->prev_shape, p, &nego, 0);
+ if (delta <= -256)
+ return 0;
+ if (intersection(&neg, ctx->shape.dx, ctx->shape.dy, &nego, ctx->prev_shape.dx, ctx->prev_shape.dy, &ctx->res[ctx->npos])) {
+ ctx->npos--;
+ draw_point(&ctx->prev_shape, p, &ctx->res[ctx->ppos++], 1);
+ draw_point(&ctx->shape, p, &ctx->res[ctx->ppos++], 1);
+ return 1;
+ }
}
+ return 0;
}
static void
-graphics_draw_polyline_as_polygon(struct graphics *gra, struct graphics_gc *gc, struct point *pnt, int count, int *width)
+draw_end(struct draw_polyline_context *ctx, struct point *p)
{
+ int i;
+ struct draw_polyline_shape *shape=&ctx->prev_shape;
+ for (i = 0 ; i <= 32 ; i+=shape->step) {
+ ctx->res[ctx->npos].x=(p->x*256+(shape->dyw*circle64[i].y)-(shape->dxw*circle64[i].x))/256;
+ ctx->res[ctx->npos].y=(p->y*256+(shape->dxw*circle64[i].y)+(shape->dyw*circle64[i].x))/256;
+ ctx->npos--;
+ }
+}
+
+static void
+draw_init_ctx(struct draw_polyline_context *ctx, int maxpoints)
+{
+ ctx->prec=1;
+ ctx->ppos=maxpoints/2;
+ ctx->npos=maxpoints/2-1;
+}
+
+
+static void
+graphics_draw_polyline_as_polygon(struct graphics_priv *gra_priv, struct graphics_gc_priv *gc_priv, struct point *pnt, int count, int *width, void (*draw)(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count))
+{
int maxpoints=200;
- struct point *res=g_alloca(sizeof(struct point)*maxpoints);
- struct point pos, poso, neg, nego;
- int i, dx=0, dy=0, l=0, dxo=0, dyo=0;
- struct offset o,oo={0,0,0,0};
- int fow=0, fowo=0, delta;
- int wi, ppos = maxpoints/2, npos = maxpoints/2;
- int state,prec=5;
+ struct draw_polyline_context ctx;
+ int i=0;
int max_circle_points=20;
- int lscale=16;
+ ctx.shape.l=0;
+ ctx.res=g_alloca(sizeof(struct point)*maxpoints);
i=0;
- for (;;) {
- wi=*width;
- width++;
- if (i < count - 1) {
- int dxs,dys,lscales;
-
- dx = (pnt[i + 1].x - pnt[i].x);
- dy = (pnt[i + 1].y - pnt[i].y);
-#if 0
- l = int_sqrt(dx * dx * lscale * lscale + dy * dy * lscale * lscale);
-#else
- dxs=dx*dx;
- dys=dy*dy;
- lscales=lscale*lscale;
- if (dxs + dys > lscales)
- l = int_sqrt(dxs+dys)*lscale;
- else
- l = int_sqrt((dxs+dys)*lscales);
-#endif
- fow=fowler(-dy, dx);
+ draw_init_ctx(&ctx, maxpoints);
+ draw_shape(&ctx, pnt, *width++);
+ draw_begin(&ctx,&pnt[0]);
+ for (i = 1 ; i < count -1 ; i++) {
+ draw_shape(&ctx, pnt+i, *width++);
+ if (ctx.npos < max_circle_points || ctx.ppos >= maxpoints-max_circle_points || !draw_middle(&ctx,&pnt[i])) {
+ struct draw_polyline_shape shape=ctx.shape;
+ draw_end(&ctx,&pnt[i]);
+ ctx.res[ctx.npos]=ctx.res[ctx.ppos-1];
+ draw(gra_priv, gc_priv, ctx.res+ctx.npos, ctx.ppos-ctx.npos);
+ draw_init_ctx(&ctx, maxpoints);
+ draw_begin(&ctx,&pnt[i]);
}
- if (! l)
- l=1;
- if (wi*lscale > 10000)
- lscale=10000/wi;
- dbg_assert(wi*lscale <= 10000);
- calc_offsets(wi*lscale, l, dx, dy, &o);
- pos.x = pnt[i].x + o.ny;
- pos.y = pnt[i].y + o.px;
- neg.x = pnt[i].x + o.py;
- neg.y = pnt[i].y + o.nx;
- if (! i)
- state=0;
- else if (i == count-1)
- state=2;
- else if (npos < max_circle_points || ppos >= maxpoints-max_circle_points)
- state=3;
- else
- state=1;
- switch (state) {
- case 1:
- if (fowo != fow) {
- poso.x = pnt[i].x + oo.ny;
- poso.y = pnt[i].y + oo.px;
- nego.x = pnt[i].x + oo.py;
- nego.y = pnt[i].y + oo.nx;
- delta=fowo-fow;
- if (delta < 0)
- delta+=1024;
- if (delta < 512) {
- if (intersection(&pos, dx, dy, &poso, dxo, dyo, &res[ppos]))
- ppos++;
- res[--npos] = nego;
- --npos;
- draw_circle(&pnt[i], wi, prec, fowo-512, -delta, res, &npos, -1);
- res[npos] = neg;
- } else {
- res[ppos++] = poso;
- draw_circle(&pnt[i], wi, prec, fowo, 1024-delta, res, &ppos, 1);
- res[ppos++] = pos;
- if (intersection(&neg, dx, dy, &nego, dxo, dyo, &res[npos - 1]))
- npos--;
- }
- }
- break;
- case 2:
- case 3:
- res[--npos] = neg;
- --npos;
- draw_circle(&pnt[i], wi, prec, fow-512, -512, res, &npos, -1);
- res[npos] = pos;
- res[ppos++] = pos;
- dbg_assert(npos > 0);
- dbg_assert(ppos < maxpoints);
- gra->meth.draw_polygon(gra->priv, gc->priv, res+npos, ppos-npos);
- if (state == 2)
- break;
- npos=maxpoints/2;
- ppos=maxpoints/2;
- case 0:
- res[ppos++] = neg;
- draw_circle(&pnt[i], wi, prec, fow+512, 512, res, &ppos, 1);
- res[ppos++] = pos;
- break;
- }
- i++;
- if (i >= count)
- break;
- wi=*width;
- calc_offsets(wi*lscale, l, dx, dy, &oo);
- dxo = -dx;
- dyo = -dy;
- fowo=fow;
}
+ draw_shape(&ctx, pnt+count-1, *width++);
+ draw_end(&ctx,&pnt[count-1]);
+ ctx.res[ctx.npos]=ctx.res[ctx.ppos-1];
+ draw(gra_priv, gc_priv, ctx.res+ctx.npos, ctx.ppos-ctx.npos);
}
@@ -1682,7 +1761,10 @@
// ... then draw the resulting polyline
if (points_to_draw_cnt > 1) {
if (poly) {
- graphics_draw_polyline_as_polygon(gra, gc, points_to_draw, points_to_draw_cnt, w);
+ graphics_draw_polyline_as_polygon(gra->priv, gc->priv, points_to_draw, points_to_draw_cnt, w, gra->meth.draw_polygon);
+#if 0
+ gra->meth.draw_lines(gra->priv, gc->priv, points_to_draw, points_to_draw_cnt);
+#endif
} else
gra->meth.draw_lines(gra->priv, gc->priv, points_to_draw, points_to_draw_cnt);
points_to_draw_cnt=0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2013-08-03 23:43:45
|
Revision: 5559
http://sourceforge.net/p/navit/code/5559
Author: mdankov
Date: 2013-08-03 23:43:43 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Add:core:Update Russian translations.
Modified Paths:
--------------
trunk/navit/po/ru.po.in
Modified: trunk/navit/po/ru.po.in
===================================================================
--- trunk/navit/po/ru.po.in 2013-08-03 23:43:02 UTC (rev 5558)
+++ trunk/navit/po/ru.po.in 2013-08-03 23:43:43 UTC (rev 5559)
@@ -87,7 +87,7 @@
#, c-format
msgid "in %d feet"
-msgstr ""
+msgstr "через %d футов"
#, c-format
msgid "%d meters"
@@ -99,19 +99,19 @@
#, c-format
msgid "%d.%d miles"
-msgstr ""
+msgstr "%d,%d миль"
#, c-format
msgid "in %d.%d miles"
-msgstr ""
+msgstr "через %d,%d миль"
#, c-format
msgid "%d.%d kilometers"
-msgstr "%d,%d км."
+msgstr "%d,%d километров"
#, c-format
msgid "in %d.%d kilometers"
-msgstr "через %d,%d км."
+msgstr "через %d,%d километров"
#, c-format
msgid "one mile"
@@ -205,7 +205,7 @@
#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "Через %s круговое движение"
#, c-format
msgid "then leave the roundabout at the %s"
@@ -287,10 +287,10 @@
#, c-format
msgid "Waypoint %d"
-msgstr ""
+msgstr "Точка %d"
msgid "Visit before..."
-msgstr ""
+msgstr "Заехать перед..."
msgid "Set as position"
msgstr "Установить как пункт отправления"
@@ -431,7 +431,7 @@
#. 535
msgid "Bonaire, Sint Eustatius and Saba"
-msgstr ""
+msgstr "Бонэйр, Синт-Эстатиус и Саба"
#. 076
msgid "Brazil"
@@ -523,7 +523,7 @@
#. 531
msgid "Curacao"
-msgstr ""
+msgstr "Кюрасао"
#. 162
msgid "Christmas Island"
@@ -1143,7 +1143,7 @@
#. 728
msgid "South Sudan"
-msgstr ""
+msgstr "Южный Судан"
#. 678
msgid "Sao Tome and Principe"
@@ -1155,7 +1155,7 @@
#. 534
msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Синт-Мартен (Нидерланды)"
#. 760
msgid "Syrian Arab Republic"
@@ -1408,7 +1408,7 @@
msgstr "Маршрут"
msgid "_Former Destinations"
-msgstr "Прошлые пункты назначения"
+msgstr "Старые маршруты"
msgid "_Bookmarks"
msgstr "Закладки"
@@ -1542,10 +1542,10 @@
#, c-format
msgid "Waypoint %s"
-msgstr ""
+msgstr "Точка %s"
msgid "Select waypoint to insert the new one before"
-msgstr ""
+msgstr "Выберите точку, перед которой вставить новую"
msgid "View in Browser"
msgstr "Просмотреть в браузере"
@@ -1563,7 +1563,7 @@
msgstr "Просмотреть Атрибуты"
msgid "Set as position (and deactivate vehicle)"
-msgstr ""
+msgstr "Задать как текущую позицию и деактивировать ТС"
msgid "POIs"
msgstr "POIs"
@@ -1572,10 +1572,10 @@
msgstr "Показать на карте"
msgid "Remove search results from the map"
-msgstr ""
+msgstr "Удалить результаты поиска с карты"
msgid "Show results on the map"
-msgstr ""
+msgstr "Показать результаты поиска на карте"
msgid "Cut Bookmark"
msgstr "Вырезать закладку"
@@ -1593,22 +1593,22 @@
msgstr "Удалить закладку"
msgid "Delete waypoint"
-msgstr ""
+msgstr "Удалить маршрутную точку"
msgid "Bookmarks"
msgstr "Закладки"
msgid "Bookmarks as waypoints"
-msgstr ""
+msgstr "Маршрут по закладкам"
msgid "Save waypoints"
-msgstr ""
+msgstr "Сохранить маршрутные точки"
msgid "Replace with waypoints"
-msgstr ""
+msgstr "Заменить маршрутными точками"
msgid "Delete Folder"
-msgstr ""
+msgstr "Удалить папку"
#. Adds the Bookmark folders
msgid "Add Bookmark folder"
@@ -1624,19 +1624,19 @@
#, c-format
msgid "Download %s"
-msgstr ""
+msgstr "Загрузка %s"
msgid "Map Download"
-msgstr ""
+msgstr "Загрузка карты"
msgid "Active"
-msgstr ""
+msgstr "Активна"
msgid "Download Enabled"
-msgstr ""
+msgstr "Загрузка разрешена"
msgid "Download completely"
-msgstr ""
+msgstr "Загрузить полностью"
msgid "Show Satellite Status"
msgstr "Показать Состояние Спутников"
@@ -1697,10 +1697,10 @@
msgstr "и лица внесшие вклад"
msgid "Waypoints"
-msgstr ""
+msgstr "Маршрутные точки"
msgid "Enter Coordinates"
-msgstr ""
+msgstr "Введите координаты"
#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
@@ -1709,10 +1709,10 @@
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Longitude Latitude"
-msgstr ""
+msgstr "Долгота Широта"
msgid "Enter coordinates, for example:"
-msgstr ""
+msgstr "Введите координаты, например:"
msgid "Vehicle"
msgstr "Т/с"
@@ -1730,7 +1730,7 @@
msgstr "Карта следует за машиной"
msgid "Plan with Waypoints"
-msgstr ""
+msgstr "Множество точек назначения"
msgid "Maps"
msgstr "Карты"
@@ -1748,10 +1748,10 @@
msgstr "Проверить локализацию"
msgid "Former Destinations"
-msgstr "Прошлые пункты назначения"
+msgstr "Старые маршруты"
msgid "- No former destinations available -"
-msgstr ""
+msgstr "- Нет старых маршрутов -"
msgid "Message"
msgstr "Сообщение"
@@ -1775,15 +1775,15 @@
msgstr ""
msgid "Return to route!"
-msgstr ""
+msgstr "Возвращайтесь на маршрут!"
#. warning told
msgid "Look out! Camera!"
-msgstr ""
+msgstr "Внимание! Камера!"
#. warning told
msgid "Please decrease your speed"
-msgstr ""
+msgstr "Снизьте скорость, пожалуйста"
msgid "Vehicle Position"
msgstr "Местоположение автомобиля"
@@ -1817,6 +1817,8 @@
"Former\n"
"Destinations"
msgstr ""
+"Старые\n"
+"маршруты"
msgid "Quit"
msgstr "Выход"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2013-08-03 23:43:07
|
Revision: 5558
http://sourceforge.net/p/navit/code/5558
Author: mdankov
Date: 2013-08-03 23:43:02 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Fix:core:Let it be buildable for win* platforms with CMake.
Modified Paths:
--------------
trunk/navit/CMakeLists.txt
trunk/navit/navit/CMakeLists.txt
trunk/navit/navit/support/glib/glibconfig.h
Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt 2013-08-03 19:16:39 UTC (rev 5557)
+++ trunk/navit/CMakeLists.txt 2013-08-03 23:43:02 UTC (rev 5558)
@@ -175,7 +175,6 @@
if (NOT HAVE_LIBINTL)
add_plugin(intl_cmake "native libintl missing" TRUE)
set(USE_LIBGNUINTL TRUE)
- include_directories("${CMAKE_BINARY_DIR}/navit/intl_cmake")
else()
CHECK_LIBRARY_EXISTS(intl libintl_fprintf "" NEEDS_LIBINTL)
if (NEEDS_LIBINTL)
Modified: trunk/navit/navit/CMakeLists.txt
===================================================================
--- trunk/navit/navit/CMakeLists.txt 2013-08-03 19:16:39 UTC (rev 5557)
+++ trunk/navit/navit/CMakeLists.txt 2013-08-03 23:43:02 UTC (rev 5558)
@@ -156,7 +156,6 @@
ADD_DEPENDENCIES(${NAVIT_LIBNAME} version)
if (USE_LIBGNUINTL AND NOT HAVE_GLIB)
ADD_DEPENDENCIES(support_glib intl_cmake)
- set_property(SOURCE ${PROJECT_SOURCE_DIR}/navit/support/glib/glibconfig.h APPEND PROPERTY OBJECT_DEPENDS "${PROJECT_BINARY_DIR}/navit/intl_cmake/libintl.h")
endif()
Modified: trunk/navit/navit/support/glib/glibconfig.h
===================================================================
--- trunk/navit/navit/support/glib/glibconfig.h 2013-08-03 19:16:39 UTC (rev 5557)
+++ trunk/navit/navit/support/glib/glibconfig.h 2013-08-03 23:43:02 UTC (rev 5558)
@@ -14,7 +14,7 @@
#include "config.h"
#ifdef HAVE_API_WIN32_BASE
-#include <libintl.h>
+#include <libgnuintl.h>
#endif
G_BEGIN_DECLS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2013-08-03 19:16:45
|
Revision: 5557
http://sourceforge.net/p/navit/code/5557
Author: mdankov
Date: 2013-08-03 19:16:39 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Fix:core:Properly specify explicit dependency on intl_cmake/libintl.h.
Modified Paths:
--------------
trunk/navit/navit/CMakeLists.txt
Modified: trunk/navit/navit/CMakeLists.txt
===================================================================
--- trunk/navit/navit/CMakeLists.txt 2013-08-03 14:22:56 UTC (rev 5556)
+++ trunk/navit/navit/CMakeLists.txt 2013-08-03 19:16:39 UTC (rev 5557)
@@ -156,7 +156,7 @@
ADD_DEPENDENCIES(${NAVIT_LIBNAME} version)
if (USE_LIBGNUINTL AND NOT HAVE_GLIB)
ADD_DEPENDENCIES(support_glib intl_cmake)
- set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/support/glib/glibconfig.h APPEND PROPERTY OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/intl_cmake/libintl.h")
+ set_property(SOURCE ${PROJECT_SOURCE_DIR}/navit/support/glib/glibconfig.h APPEND PROPERTY OBJECT_DEPENDS "${PROJECT_BINARY_DIR}/navit/intl_cmake/libintl.h")
endif()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2013-08-03 14:22:59
|
Revision: 5556
http://sourceforge.net/p/navit/code/5556
Author: mdankov
Date: 2013-08-03 14:22:56 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Fix:maptool:Fixed few memleaks in relations, baoundary, coastline processing code.
Modified Paths:
--------------
trunk/navit/navit/maptool/boundaries.c
trunk/navit/navit/maptool/coastline.c
trunk/navit/navit/maptool/osm.c
trunk/navit/navit/maptool/osm_relations.c
Modified: trunk/navit/navit/maptool/boundaries.c
===================================================================
--- trunk/navit/navit/maptool/boundaries.c 2013-08-03 11:33:10 UTC (rev 5555)
+++ trunk/navit/navit/maptool/boundaries.c 2013-08-03 14:22:56 UTC (rev 5556)
@@ -348,8 +348,10 @@
g_list_free(boundary->segments);
g_list_free(boundary->sorted_segments);
g_free(boundary->ib);
+ g_free(boundary->iso2);
free_boundaries(boundary->children);
g_free(boundary);
l=g_list_next(l);
}
+ g_list_free(l);
}
Modified: trunk/navit/navit/maptool/coastline.c
===================================================================
--- trunk/navit/navit/maptool/coastline.c 2013-08-03 11:33:10 UTC (rev 5555)
+++ trunk/navit/navit/maptool/coastline.c 2013-08-03 14:22:56 UTC (rev 5556)
@@ -195,7 +195,11 @@
fprintf(stderr,"tile %s of size %d\n", tile, *tile_data);
#endif
tile_bbox(tile, &bbox, 0);
- sorted_segments=geom_poly_segments_sort(tile_data_to_segments(tile_data), geom_poly_segment_type_way_right_side);
+ curr=tile_data_to_segments(tile_data);
+ sorted_segments=geom_poly_segments_sort(curr, geom_poly_segment_type_way_right_side);
+ g_list_foreach(curr,(GFunc)geom_poly_segment_destroy,NULL);
+ g_list_free(curr);
+
#if 0
{
GList *sort_segments=sorted_segments;
@@ -303,6 +307,8 @@
if (search > 55)
break;
}
+ g_list_foreach(sorted_segments,(GFunc)geom_poly_segment_destroy,NULL);
+ g_list_free(sorted_segments);
#endif
#if 0
@@ -355,7 +361,7 @@
char *tile2=g_alloca(sizeof(char)*(len+1));
struct rect bbox;
struct item_bin *ib;
- struct coastline_tile *ct=g_new0(struct coastline_tile, 1);
+ struct coastline_tile *ct;
strcpy(tile2, tile);
tile2[len-1]=c;
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2013-08-03 11:33:10 UTC (rev 5555)
+++ trunk/navit/navit/maptool/osm.c 2013-08-03 14:22:56 UTC (rev 5556)
@@ -2457,10 +2457,8 @@
fseek(in, 0, SEEK_SET);
relations_func=relations_func_new(process_turn_restrictions_member, NULL);
while ((ib=read_item(in))) {
- struct turn_restriction *turn_restriction=g_new0(struct turn_restriction, 1);
+ struct turn_restriction *turn_restriction;
relid=item_bin_get_relationid(ib);
- turn_restriction->relid=relid;
- turn_restriction->type=ib->type;
min_count=0;
if (!search_relation_member(ib, "from",&fromm,&min_count)) {
osm_warning("relation",relid,0,"turn restriction: from member missing\n");
@@ -2503,6 +2501,9 @@
osm_warning(osm_types[viam.type],viam.id,1,"\n");
continue;
}
+ turn_restriction=g_new0(struct turn_restriction, 1);
+ turn_restriction->relid=relid;
+ turn_restriction->type=ib->type;
relations_add_func(relations, relations_func, turn_restriction, (gpointer) 0, fromm.type, fromm.id);
relations_add_func(relations, relations_func, turn_restriction, (gpointer) 1, viam.type, viam.id);
relations_add_func(relations, relations_func, turn_restriction, (gpointer) 2, tom.type, tom.id);
@@ -2520,6 +2521,7 @@
turn_restrictions=process_turn_restrictions_setup(in, relations);
relations_process(relations, coords, ways, NULL);
process_turn_restrictions_finish(turn_restrictions, out);
+ relations_destroy(relations);
}
void
Modified: trunk/navit/navit/maptool/osm_relations.c
===================================================================
--- trunk/navit/navit/maptool/osm_relations.c 2013-08-03 11:33:10 UTC (rev 5555)
+++ trunk/navit/navit/maptool/osm_relations.c 2013-08-03 14:22:56 UTC (rev 5556)
@@ -155,10 +155,12 @@
void
relations_destroy_func(void *key, GList *l, void *data)
{
- while (l) {
- g_free(l->data);
- l=g_list_next(l);
+ GList *ll=l;
+ while (ll) {
+ g_free(ll->data);
+ ll=g_list_next(ll);
}
+ g_list_free(l);
}
void
@@ -170,4 +172,5 @@
g_hash_table_foreach(relations->member_hash[i], (GHFunc)relations_destroy_func, NULL);
g_hash_table_destroy(relations->member_hash[i]);
}
+ g_free(relations);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
13 messages has been excluded from this view by a project administrator.
