Skip to content

Commit

Permalink
EOL conversion to LF
Browse files Browse the repository at this point in the history
  • Loading branch information
geographika committed Sep 22, 2020
1 parent b28fcfb commit 693e1ca
Show file tree
Hide file tree
Showing 10 changed files with 171 additions and 171 deletions.
12 changes: 6 additions & 6 deletions mapscript/python/tests/cases/layer_test.py
Expand Up @@ -70,15 +70,15 @@ def tearDown(self):

def testLayerGetItemType(self):
"""test getting layer item information for the first item"""


item_type = self.layer.getItemType(0)
assert item_type == "Integer"

def testLayerGetItemDefinition2(self):
"""test getting layer item information for the second item"""


item_type = self.layer.getItemType(1)
assert item_type == "Character"
assert item_type == "Character"

def testLayerGetMissingItemType(self):
"""test getting item information for a non-existent index"""
Expand All @@ -93,9 +93,9 @@ def testLayerGetItemTypeClosedLayer(self):

def testLayerGetNonDefinedItemType(self):
"""test getting layer item information for a layer with gml_types auto"""

layer = self.map.getLayerByName('POLYGON')
layer.open()

layer = self.map.getLayerByName('POLYGON')
layer.open()
item_type = layer.getItemType(0)
assert item_type == ""
layer.close()
Expand Down
8 changes: 4 additions & 4 deletions mapscript/python/tests/cases/point_test.py
Expand Up @@ -107,10 +107,10 @@ def testPointDraw(self):
cls = mapscript.classObj()
style = mapscript.styleObj()
style.outlinecolor.setHex('#00aa00ff')
style.size = 10
style.setSymbolByName(test_map, 'circle')

cls.insertStyle(style)
style.size = 10
style.setSymbolByName(test_map, 'circle')

cls.insertStyle(style)
class_idx = layer.insertClass(cls)
point = mapscript.pointObj(45, 45)

Expand Down
4 changes: 2 additions & 2 deletions mapscript/python/tests/cases/shape_test.py
Expand Up @@ -88,7 +88,7 @@ def testGetNumFeatures(self):

def testShapeGeoInterface(self):
"""return the shape using the __geo_interface__ protocol with no attribute names"""
layer = self.map.getLayerByName('POLYGON')
layer = self.map.getLayerByName('POLYGON')
layer.open()
layer.template = "FAKE"
layer.queryByIndex(self.map, -1, 0)
Expand All @@ -109,7 +109,7 @@ def testShapeGeoInterface(self):

def testShapeGeoInterfaceWithFields(self):
"""return the shape using the __geo_interface__ protocol with attribute names"""
layer = self.map.getLayerByName('POINT')
layer = self.map.getLayerByName('POINT')
layer.open()
layer.template = "FAKE"
layer.queryByIndex(self.map, -1, 0)
Expand Down
80 changes: 40 additions & 40 deletions mapscript/swiginc/labelcache.i
@@ -1,40 +1,40 @@
/* ===========================================================================
Project: MapServer
Purpose: SWIG interface file for mapscript labelCacheObj extensions
Author: Steve Lime
Sean Gillies, sgillies@frii.com
===========================================================================
Copyright (c) 1996-2001 Regents of the University of Minnesota.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
===========================================================================
*/

%extend labelCacheObj
{

/// Free the labelCache
void freeCache()
{
msFreeLabelCache(self);
}
}


/* ===========================================================================
Project: MapServer
Purpose: SWIG interface file for mapscript labelCacheObj extensions
Author: Steve Lime
Sean Gillies, sgillies@frii.com
===========================================================================
Copyright (c) 1996-2001 Regents of the University of Minnesota.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
===========================================================================
*/

%extend labelCacheObj
{

/// Free the labelCache
void freeCache()
{
msFreeLabelCache(self);
}
}


0 comments on commit 693e1ca

Please sign in to comment.