Skip to content

Commit 85209cb

Browse files
derickrderickr
committed
General formatting changes and license headers.
1 parent 34f73a5 commit 85209cb

9 files changed

+65
-18
lines changed

‎geo_array.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
/*
2+
+----------------------------------------------------------------------+
3+
| PHP Version 5 |
4+
+----------------------------------------------------------------------+
5+
| Copyright (c) 1997-2013 The PHP Group |
6+
+----------------------------------------------------------------------+
7+
| This source file is subject to version 3.01 of the PHP license, |
8+
| that is bundled with this package in the file LICENSE, and is |
9+
| available through the world-wide-web at the following url: |
10+
| http://www.php.net/license/3_01.txt |
11+
| If you did not receive a copy of the PHP license and are unable to |
12+
| obtain it through the world-wide-web, please send a note to |
13+
| [email protected] so we can mail you a copy immediately. |
14+
+----------------------------------------------------------------------+
15+
| Authors: Derick Rethans <[email protected]> |
16+
| Michael Maclean <[email protected]> |
17+
| Nathaniel McHugh <[email protected]> |
18+
| Marcus Deglos <[email protected]> |
19+
+----------------------------------------------------------------------+
20+
*/
21+
122
#include <stdlib.h>
223

324
#include "geo_array.h"

‎geo_array.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
/*
2+
+----------------------------------------------------------------------+
3+
| PHP Version 5 |
4+
+----------------------------------------------------------------------+
5+
| Copyright (c) 1997-2013 The PHP Group |
6+
+----------------------------------------------------------------------+
7+
| This source file is subject to version 3.01 of the PHP license, |
8+
| that is bundled with this package in the file LICENSE, and is |
9+
| available through the world-wide-web at the following url: |
10+
| http://www.php.net/license/3_01.txt |
11+
| If you did not receive a copy of the PHP license and are unable to |
12+
| obtain it through the world-wide-web, please send a note to |
13+
| [email protected] so we can mail you a copy immediately. |
14+
+----------------------------------------------------------------------+
15+
| Authors: Derick Rethans <[email protected]> |
16+
| Michael Maclean <[email protected]> |
17+
| Nathaniel McHugh <[email protected]> |
18+
| Marcus Deglos <[email protected]> |
19+
+----------------------------------------------------------------------+
20+
*/
21+
122
typedef struct geo_array {
223
double *x;
324
double *y;

‎geospatial.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 1997-2012 The PHP Group |
5+
| Copyright (c) 1997-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |
@@ -12,13 +12,13 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Author: |
15+
| Authors: Derick Rethans <[email protected]> |
16+
| Michael Maclean <[email protected]> |
17+
| Nathaniel McHugh <[email protected]> |
18+
| Marcus Deglos <[email protected]> |
1619
+----------------------------------------------------------------------+
1720
*/
1821

19-
20-
/* $Id$ */
21-
2222
#ifdef HAVE_CONFIG_H
2323
#include "config.h"
2424
#endif

‎php_geospatial.h

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 1997-2012 The PHP Group |
5+
| Copyright (c) 1997-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |
@@ -12,24 +12,25 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Author: |
15+
| Authors: Derick Rethans <[email protected]> |
16+
| Michael Maclean <[email protected]> |
17+
| Nathaniel McHugh <[email protected]> |
18+
| Marcus Deglos <[email protected]> |
1619
+----------------------------------------------------------------------+
1720
*/
1821

19-
/* $Id$ */
20-
2122
#ifndef PHP_GEOSPATIAL_H
2223
#define PHP_GEOSPATIAL_H
2324

2425
extern zend_module_entry geospatial_module_entry;
2526
#define phpext_geospatial_ptr &geospatial_module_entry
2627

2728
#ifdef PHP_WIN32
28-
# define PHP_GEOSPATIAL_API __declspec(dllexport)
29+
# define PHP_GEOSPATIAL_API __declspec(dllexport)
2930
#elif defined(__GNUC__) && __GNUC__ >= 4
30-
# define PHP_GEOSPATIAL_API __attribute__ ((visibility("default")))
31+
# define PHP_GEOSPATIAL_API __attribute__ ((visibility("default")))
3132
#else
32-
# define PHP_GEOSPATIAL_API
33+
# define PHP_GEOSPATIAL_API
3334
#endif
3435

3536
#ifdef ZTS
@@ -71,6 +72,7 @@ typedef struct {
7172
* The WGS84 elipsoid semi major axes
7273
*/
7374
const geo_ellipsoid wgs84 = {6378137.000, 6356752.3142};
75+
7476
/**
7577
* The Airy 1830 elipsoid semi major axes
7678
*/
@@ -89,6 +91,7 @@ const geo_helmert_constants wgs84_osgb36 = {
8991
-0.2470,
9092
-0.8421
9193
};
94+
9295
/**
9396
* The values of the 7 variables for performing helmert transformation between
9497
* osgb36 and wgs84 -1 * the values for the reverse transformation
@@ -130,7 +133,7 @@ PHP_FUNCTION(dms_to_decimal);
130133
PHP_FUNCTION(decimal_to_dms);
131134
PHP_FUNCTION(rdp_simplify);
132135

133-
#endif /* PHP_GEOSPATIAL_H */
136+
#endif /* PHP_GEOSPATIAL_H */
134137

135138
/*
136139
* Local variables:

‎tests/JodrellBank.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $from = array('type' => 'Point', 'coordinates' => array( $long, $lat ) );
1111
$polar = transform_datum($from, GEO_WGS84, GEO_AIRY_1830);
1212

1313
var_dump($polar);
14+
?>
1415
--EXPECT--
1516
array(2) {
1617
["type"]=>

‎tests/WGS84_to_OSGB36.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ $polar = transform_datum($coordinate, GEO_WGS84, GEO_AIRY_1830);
1515

1616
echo round($polar['coordinates'][1], 8),PHP_EOL;
1717
echo round($polar['coordinates'][0], 8),PHP_EOL;
18+
?>
1819
--EXPECT--
1920
53.38334018
2021
-1.46541628

‎tests/decimal_to_dms.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var_dump($dms);
88

99
$dms = decimal_to_dms(-1.034291666667, 'latitude');
1010
var_dump($dms);
11-
11+
?>
1212
--EXPECT--
1313
array(4) {
1414
["degrees"]=>
@@ -29,4 +29,4 @@ array(4) {
2929
float(3.4500000011994)
3030
["direction"]=>
3131
string(1) "S"
32-
}
32+
}

‎tests/dms_to_decimal.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ var_dump($decimal);
1212
$decimal = dms_to_decimal(-2, 18.42833333333333333333, 0, 'W');
1313
var_dump($decimal);
1414

15-
15+
?>
1616
--EXPECT--
1717
float(-1.0342916666667)
1818
float(-2.3071388888889)
1919
float(-2.3071388888889)
20-
float(-2.3071388888889)
20+
float(-2.3071388888889)

‎tests/polar_to_cartesian.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ array(3) {
1515
float(97591.624686311)
1616
["z"]=>
1717
float(5095766.3939034)
18-
}
18+
}

0 commit comments

Comments
 (0)