1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
Description: fix int/long compiler warnings
Author: Roberto Lumbreras <rover@debian.org>
Index: geotranz-3.3/CCS/src/dtcc/CoordinateSystems/gars/GARS.cpp
===================================================================
--- geotranz-3.3.orig/CCS/src/dtcc/CoordinateSystems/gars/GARS.cpp 2018-07-27 18:00:02.741328185 +0200
+++ geotranz-3.3/CCS/src/dtcc/CoordinateSystems/gars/GARS.cpp 2018-07-27 18:00:02.705328004 +0200
@@ -279,11 +279,11 @@
/* Form the gars string */
if( ew_value < 10 )
- sprintf ( GARSString, "00%d%c%c", ew_value, ( char )( letter_index[0] + LETTER_A_OFFSET ), ( char )( letter_index[1] + LETTER_A_OFFSET ) );
+ sprintf ( GARSString, "00%ld%c%c", ew_value, ( char )( letter_index[0] + LETTER_A_OFFSET ), ( char )( letter_index[1] + LETTER_A_OFFSET ) );
else if( ew_value < 100 )
- sprintf ( GARSString, "0%d%c%c", ew_value, ( char )( letter_index[0] + LETTER_A_OFFSET ), ( char )( letter_index[1] + LETTER_A_OFFSET ) );
+ sprintf ( GARSString, "0%ld%c%c", ew_value, ( char )( letter_index[0] + LETTER_A_OFFSET ), ( char )( letter_index[1] + LETTER_A_OFFSET ) );
else
- sprintf ( GARSString, "%d%c%c", ew_value, ( char )( letter_index[0] + LETTER_A_OFFSET ), ( char )( letter_index[1] + LETTER_A_OFFSET ) );
+ sprintf ( GARSString, "%ld%c%c", ew_value, ( char )( letter_index[0] + LETTER_A_OFFSET ), ( char )( letter_index[1] + LETTER_A_OFFSET ) );
if( precision > 0 )
{
Index: geotranz-3.3/GEOTRANS3/java_gui/geotrans3/jni/fiomeths.cpp
===================================================================
--- geotranz-3.3.orig/GEOTRANS3/java_gui/geotrans3/jni/fiomeths.cpp 2018-07-27 18:00:02.741328185 +0200
+++ geotranz-3.3/GEOTRANS3/java_gui/geotrans3/jni/fiomeths.cpp 2018-07-27 18:00:02.705328004 +0200
@@ -3821,7 +3821,7 @@
if( dynamic_cast< UTMCoordinates* >( targetCoordinate ) )
{
UTMCoordinates coord = ( *dynamic_cast< UTMCoordinates* >( targetCoordinate ) );
- fprintf(outputFile, "%d", coord.zone());
+ fprintf(outputFile, "%ld", coord.zone());
fprintf(outputFile, ", ");
fprintf(outputFile, "%c", coord.hemisphere());
fprintf(outputFile, ", ");
@@ -4046,7 +4046,7 @@
UTMParameters params = *dynamic_cast< UTMParameters* >( coordinateConversionService->getCoordinateSystem( SourceOrTarget::target ) );
if (params.override())
- fprintf(outputFile, "%d", params.zone());
+ fprintf(outputFile, "%ld", params.zone());
else
fprintf(outputFile, "%d", 0);
fprintf(outputFile, ", ");
Index: geotranz-3.3/GEOTRANS3/java_gui/geotrans3/jni/strtoval.cpp
===================================================================
--- geotranz-3.3.orig/GEOTRANS3/java_gui/geotrans3/jni/strtoval.cpp 2018-07-27 18:00:02.741328185 +0200
+++ geotranz-3.3/GEOTRANS3/java_gui/geotrans3/jni/strtoval.cpp 2018-07-27 18:00:02.705328004 +0200
@@ -1269,7 +1269,7 @@
{
SVC_Status error_Code = SVC_Success;
- if (sprintf(str, "%2.0d", zone) <= 0)
+ if (sprintf(str, "%2.0ld", zone) <= 0)
{
error_Code = SVC_Zone_to_String;
}
|
