Codebase list readosm / upstream/1.1.0+dfsg
New upstream version 1.1.0+dfsg Bas Couwenberg 6 years ago
14 changed file(s) with 102 addition(s) and 37 deletion(s). Raw diff Collapse all Expand all
+1
-1
Makefile.am less more
33
44 EXTRA_DIST = makefile.vc nmake.opt mainpage.doxy
55
6 AUTOMAKE_OPTIONS = dist-zip
6 AUTOMAKE_OPTIONS = dist-zip foreign
77
88 pkgconfigdir = $(libdir)/pkgconfig
99 pkgconfig_DATA = readosm.pc
+9
-9
Makefile.in less more
359359 ACLOCAL_AMFLAGS = -I m4
360360 SUBDIRS = headers src tests examples
361361 EXTRA_DIST = makefile.vc nmake.opt mainpage.doxy
362 AUTOMAKE_OPTIONS = dist-zip
362 AUTOMAKE_OPTIONS = dist-zip foreign
363363 pkgconfigdir = $(libdir)/pkgconfig
364364 pkgconfig_DATA = readosm.pc
365365 MOSTLYCLEANFILES = readosm_cov.info
373373 @for dep in $?; do \
374374 case '$(am__configure_deps)' in \
375375 *$$dep*) \
376 echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
377 $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
376 echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
377 $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
378378 && exit 0; \
379379 exit 1;; \
380380 esac; \
381381 done; \
382 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
382 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
383383 $(am__cd) $(top_srcdir) && \
384 $(AUTOMAKE) --gnu Makefile
384 $(AUTOMAKE) --foreign Makefile
385385 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
386386 @case '$?' in \
387387 *config.status*) \
621621 ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
622622 || chmod -R a+r "$(distdir)"
623623 dist-gzip: distdir
624 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
624 tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
625625 $(am__post_remove_distdir)
626626
627627 dist-bzip2: distdir
647647 @echo WARNING: "Support for shar distribution archives is" \
648648 "deprecated." >&2
649649 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
650 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
650 shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
651651 $(am__post_remove_distdir)
652652 dist-zip: distdir
653653 -rm -f $(distdir).zip
664664 distcheck: dist
665665 case '$(DIST_ARCHIVES)' in \
666666 *.tar.gz*) \
667 GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
667 eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
668668 *.tar.bz2*) \
669669 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
670670 *.tar.lz*) \
674674 *.tar.Z*) \
675675 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
676676 *.shar.gz*) \
677 GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
677 eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
678678 *.zip*) \
679679 unzip $(distdir).zip ;;\
680680 esac
+10
-10
configure less more
00 #! /bin/sh
11 # Guess values for system-dependent variables and create Makefiles.
2 # Generated by GNU Autoconf 2.69 for readosm 1.0.0e.
2 # Generated by GNU Autoconf 2.69 for readosm 1.1.0.
33 #
44 # Report bugs to <a.furieri@lqt.it>.
55 #
589589 # Identity of this package.
590590 PACKAGE_NAME='readosm'
591591 PACKAGE_TARNAME='readosm'
592 PACKAGE_VERSION='1.0.0e'
593 PACKAGE_STRING='readosm 1.0.0e'
592 PACKAGE_VERSION='1.1.0'
593 PACKAGE_STRING='readosm 1.1.0'
594594 PACKAGE_BUGREPORT='a.furieri@lqt.it'
595595 PACKAGE_URL=''
596596
13251325 # Omit some internal or obsolete options to make the list less imposing.
13261326 # This message is too long to be a string in the A/UX 3.1 sh.
13271327 cat <<_ACEOF
1328 \`configure' configures readosm 1.0.0e to adapt to many kinds of systems.
1328 \`configure' configures readosm 1.1.0 to adapt to many kinds of systems.
13291329
13301330 Usage: $0 [OPTION]... [VAR=VALUE]...
13311331
13951395
13961396 if test -n "$ac_init_help"; then
13971397 case $ac_init_help in
1398 short | recursive ) echo "Configuration of readosm 1.0.0e:";;
1398 short | recursive ) echo "Configuration of readosm 1.1.0:";;
13991399 esac
14001400 cat <<\_ACEOF
14011401
15071507 test -n "$ac_init_help" && exit $ac_status
15081508 if $ac_init_version; then
15091509 cat <<\_ACEOF
1510 readosm configure 1.0.0e
1510 readosm configure 1.1.0
15111511 generated by GNU Autoconf 2.69
15121512
15131513 Copyright (C) 2012 Free Software Foundation, Inc.
20512051 This file contains any messages produced by compilers while
20522052 running configure, to aid debugging if configure makes a mistake.
20532053
2054 It was created by readosm $as_me 1.0.0e, which was
2054 It was created by readosm $as_me 1.1.0, which was
20552055 generated by GNU Autoconf 2.69. Invocation command line was
20562056
20572057 $ $0 $@
29222922
29232923 # Define the identity of the package.
29242924 PACKAGE='readosm'
2925 VERSION='1.0.0e'
2925 VERSION='1.1.0'
29262926
29272927
29282928 cat >>confdefs.h <<_ACEOF
1767517675 # report actual input values of CONFIG_FILES etc. instead of their
1767617676 # values after options handling.
1767717677 ac_log="
17678 This file was extended by readosm $as_me 1.0.0e, which was
17678 This file was extended by readosm $as_me 1.1.0, which was
1767917679 generated by GNU Autoconf 2.69. Invocation command line was
1768017680
1768117681 CONFIG_FILES = $CONFIG_FILES
1774117741 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1774217742 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1774317743 ac_cs_version="\\
17744 readosm config.status 1.0.0e
17744 readosm config.status 1.1.0
1774517745 configured by $0, generated by GNU Autoconf 2.69,
1774617746 with options \\"\$ac_cs_config\\"
1774717747
+1
-1
configure.ac less more
11 # Process this file with autoconf to produce a configure script.
22
33 AC_PREREQ(2.61)
4 AC_INIT(readosm, 1.0.0e, a.furieri@lqt.it)
4 AC_INIT(readosm, 1.1.0, a.furieri@lqt.it)
55 AC_LANG(C)
66 AC_CONFIG_AUX_DIR([.])
77 AC_CONFIG_MACRO_DIR([m4])
+10
-1
examples/test_osm1.c less more
2222 /
2323 / The Initial Developer of the Original Code is Alessandro Furieri
2424 /
25 / Portions created by the Initial Developer are Copyright (C) 2012
25 / Portions created by the Initial Developer are Copyright (C) 2012-2017
2626 / the Initial Developer. All Rights Reserved.
2727 /
2828 / Contributor(s):
6868 int i;
6969 const readosm_tag *tag;
7070
71 if (user_data != NULL)
72 user_data = NULL; /* silencing stupid compiler warnings */
73
7174 #if defined(_WIN32) || defined(__MINGW32__)
7275 /* CAVEAT - M$ runtime doesn't supports %lld for 64 bits */
7376 sprintf (buf, "%I64d", node->id);
154157 char buf[128];
155158 int i;
156159 const readosm_tag *tag;
160
161 if (user_data != NULL)
162 user_data = NULL; /* silencing stupid compiler warnings */
157163
158164 #if defined(_WIN32) || defined(__MINGW32__)
159165 /* CAVEAT - M$ runtime doesn't supports %lld for 64 bits */
249255 int i;
250256 const readosm_member *member;
251257 const readosm_tag *tag;
258
259 if (user_data != NULL)
260 user_data = NULL; /* silencing stupid compiler warnings */
252261
253262 #if defined(_WIN32) || defined(__MINGW32__)
254263 /* CAVEAT - M$ runtime doesn't supports %lld for 64 bits */
+1
-1
examples/test_osm2.c less more
2222 /
2323 / The Initial Developer of the Original Code is Alessandro Furieri
2424 /
25 / Portions created by the Initial Developer are Copyright (C) 2012
25 / Portions created by the Initial Developer are Copyright (C) 2012-2017
2626 / the Initial Developer. All Rights Reserved.
2727 /
2828 / Contributor(s):
+10
-1
examples/test_osm3.c less more
2222 /
2323 / The Initial Developer of the Original Code is Alessandro Furieri
2424 /
25 / Portions created by the Initial Developer are Copyright (C) 2012
25 / Portions created by the Initial Developer are Copyright (C) 2012-2017
2626 / the Initial Developer. All Rights Reserved.
2727 /
2828 / Contributor(s):
7070 /* casting the USER_DATA pointer to osm_helper */
7171 struct osm_helper *helper = (struct osm_helper *) user_data;
7272
73 if (node != NULL)
74 node = NULL; /* silencing stupid compiler warnings */
75
7376 helper->read_count++;
7477 if (eval_abort (helper))
7578 return READOSM_ABORT;
8588 /* casting the USER_DATA pointer to osm_helper */
8689 struct osm_helper *helper = (struct osm_helper *) user_data;
8790
91 if (way != NULL)
92 way = NULL; /* silencing stupid compiler warnings */
93
8894 helper->read_count++;
8995 if (eval_abort (helper))
9096 return READOSM_ABORT;
99105
100106 /* casting the USER_DATA pointer to osm_helper */
101107 struct osm_helper *helper = (struct osm_helper *) user_data;
108
109 if (relation != NULL)
110 relation = NULL; /* silencing stupid compiler warnings */
102111
103112 helper->read_count++;
104113 if (eval_abort (helper))
+24
-3
headers/readosm.h less more
22 /
33 / public declarations
44 /
5 / version 1.0, 2012 April 10
5 / version 1.1.0, 2017 September 25
66 /
77 / Author: Sandro Furieri a.furieri@lqt.it
88 /
2424 /
2525 / The Initial Developer of the Original Code is Alessandro Furieri
2626 /
27 / Portions created by the Initial Developer are Copyright (C) 2012
27 / Portions created by the Initial Developer are Copyright (C) 2012-2017
2828 / the Initial Developer. All Rights Reserved.
2929 /
3030 / Contributor(s):
282282 Close the .osm or .pbf file and release any allocated resource
283283
284284 \param osm_handle the handle previously returned by readosm_open()
285 \param user_data pointer to some user-supplied data struct
285 \param user_data pointer to some user-supplied data struct
286286 \param node_fnct pointer to callback function intended to consume NODE objects
287287 (may be NULL if processing NODEs is not an interesting option)
288288 \param way_fnct pointer to callback function intended to consume WAY objects
302302 readosm_way_callback way_fnct,
303303 readosm_relation_callback relation_fnct);
304304
305 /**
306 Return the current ReadOSM version
307
308 \return a text string corresponding the current ReadOSM version
309 */
310 READOSM_DECLARE const char * readosm_version (void);
311
312 /**
313 Return the current libexpat version used by ReadOSM
314
315 \return a text string corresponding the current Expat version
316 */
317 READOSM_DECLARE const char * readosm_expat_version (void);
318
319 /**
320 Return the current zlib version used by ReadOSM
321
322 \return a text string corresponding the current zlib version
323 */
324 READOSM_DECLARE const char * readosm_zlib_version (void);
325
305326 #ifdef __cplusplus
306327 }
307328 #endif
+2
-2
makefile.vc less more
2323 link /debug /dll /out:$(READOSM_DLL) \
2424 /implib:readosm_i.lib $(LIBOBJ) \
2525 C:\OSGeo4w\lib\libexpat.lib C:\OSGeo4w\lib\zlib.lib
26 if exist $(FREEXL_DLL).manifest mt -manifest \
27 $(FREEXL_DLL).manifest -outputresource:$(FREEXL_DLL);2
26 if exist $(READOSM_DLL).manifest mt -manifest \
27 $(READOSM_DLL).manifest -outputresource:$(READOSM_DLL);2
2828
2929 .c.obj:
3030 $(CC) $(CFLAGS) /c $*.c /Fo$@
+1
-1
src/Makefile.am less more
66 libreadosm_la_SOURCES = readosm.c osm_objects.c osmxml.c protobuf.c
77
88 libreadosm_la_CFLAGS = -fvisibility=hidden
9 libreadosm_la_LDFLAGS = -version-info 1:0:0 -no-undefined
9 libreadosm_la_LDFLAGS = -version-info 1:1:0 -no-undefined
1010
1111 MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
+1
-1
src/Makefile.in less more
328328 lib_LTLIBRARIES = libreadosm.la
329329 libreadosm_la_SOURCES = readosm.c osm_objects.c osmxml.c protobuf.c
330330 libreadosm_la_CFLAGS = -fvisibility=hidden
331 libreadosm_la_LDFLAGS = -version-info 1:0:0 -no-undefined
331 libreadosm_la_LDFLAGS = -version-info 1:1:0 -no-undefined
332332 MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
333333 all: all-am
334334
+13
-2
src/osmxml.c less more
22 /
33 / OSM-XML (.osm) implementation
44 /
5 / version 1.0, 2012 April 21
5 / version 1.1.0, 2017 September 25
66 /
77 / Author: Sandro Furieri a.furieri@lqt.it
88 /
2424 /
2525 / The Initial Developer of the Original Code is Alessandro Furieri
2626 /
27 / Portions created by the Initial Developer are Copyright (C) 2012
27 / Portions created by the Initial Developer are Copyright (C) 2012-2017
2828 / the Initial Developer. All Rights Reserved.
2929 /
3030 / Contributor(s):
522522
523523 return READOSM_OK;
524524 }
525
526 READOSM_DECLARE const char *
527 readosm_expat_version (void)
528 {
529 /* returning the current Expat version string */
530 XML_Expat_Version expat;
531 static char version[64];
532 expat = XML_ExpatVersionInfo ();
533 sprintf (version, "%d.%d.%d", expat.major, expat.minor, expat.micro);
534 return version;
535 }
+9
-2
src/protobuf.c less more
22 /
33 / Protocol Buffer (.pbf) implementation
44 /
5 / version 1.0, 2012 April 21
5 / version 1.1.0, 2017 September 25
66 /
77 / Author: Sandro Furieri a.furieri@lqt.it
88 /
2424 /
2525 / The Initial Developer of the Original Code is Alessandro Furieri
2626 /
27 / Portions created by the Initial Developer are Copyright (C) 2012
27 / Portions created by the Initial Developer are Copyright (C) 2012-2017
2828 / the Initial Developer. All Rights Reserved.
2929 /
3030 / Contributor(s):
24582458 }
24592459 return READOSM_OK;
24602460 }
2461
2462 READOSM_DECLARE const char *
2463 readosm_zlib_version (void)
2464 {
2465 /* returning the current zlib version string */
2466 return zlibVersion ();
2467 }
+10
-2
src/readosm.c less more
22 /
33 / ReadOSM main implementation (externally visible API)
44 /
5 / version 1.0, 2012 April 10
5 / version 1.1.0, 2017 September 25
66 /
77 / Author: Sandro Furieri a.furieri@lqt.it
88 /
2424 /
2525 / The Initial Developer of the Original Code is Alessandro Furieri
2626 /
27 / Portions created by the Initial Developer are Copyright (C) 2012
27 / Portions created by the Initial Developer are Copyright (C) 2012-2017
2828 / the Initial Developer. All Rights Reserved.
2929 /
3030 / Contributor(s):
4949
5050 #if defined(_WIN32) && !defined(__MINGW32__)
5151 /* MSVC: avoiding to include at all config.h */
52 #define VERSION 1.1.0
5253 #else
5354 #include "config.h"
5455 #endif
183184
184185 return ret;
185186 }
187
188 READOSM_DECLARE const char *
189 readosm_version (void)
190 {
191 /* returning the current ReadOSM version string */
192 return VERSION;
193 }