Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6145 from jmckenna/branch-crlf
change remaining source files to LF linefeeds from CRLF
- Loading branch information
Showing
12 changed files
with
4,392 additions
and
4,392 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # point to OSGeo sponsor page | ||
| github: [OSGeo] | ||
| # point to PayPal directly | ||
| # point to OSGeo sponsor page | ||
| github: [OSGeo] | ||
| # point to PayPal directly | ||
| custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KRJ2X44N3HA6U&source=url |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,40 @@ | ||
| # Find Proj | ||
| # | ||
| # If it's found it sets PROJ_FOUND to TRUE | ||
| # and following variables are set: | ||
| # PROJ_INCLUDE_DIR | ||
| # PROJ_LIBRARY | ||
|
|
||
|
|
||
| FIND_PATH(PROJ_INCLUDE_DIR proj_api.h) | ||
|
|
||
| FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i) | ||
|
|
||
| include(FindPackageHandleStandardArgs) | ||
| find_package_handle_standard_args(PROJ DEFAULT_MSG PROJ_LIBRARY PROJ_INCLUDE_DIR) | ||
| mark_as_advanced(PROJ_LIBRARY PROJ_INCLUDE_DIR) | ||
|
|
||
|
|
||
| IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY) | ||
| SET(PROJ_FOUND TRUE) | ||
| ENDIF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY) | ||
|
|
||
| IF (PROJ_FOUND) | ||
| IF (EXISTS ${PROJ_INCLUDE_DIR}/proj.h) | ||
| FILE(READ ${PROJ_INCLUDE_DIR}/proj.h proj_version) | ||
| STRING(REGEX REPLACE "^.*PROJ_VERSION_MAJOR +([0-9]+).*$" "\\1" PROJ_VERSION_MAJOR "${proj_version}") | ||
| STRING(REGEX REPLACE "^.*PROJ_VERSION_MINOR +([0-9]+).*$" "\\1" PROJ_VERSION_MINOR "${proj_version}") | ||
| STRING(REGEX REPLACE "^.*PROJ_VERSION_PATCH +([0-9]+).*$" "\\1" PROJ_VERSION_PATCH "${proj_version}") | ||
|
|
||
| MESSAGE(STATUS "Found Proj ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}") | ||
|
|
||
| IF ((PROJ_VERSION_MAJOR EQUAL 6) AND (PROJ_VERSION_MINOR EQUAL 3) AND (PROJ_VERSION_PATCH EQUAL 0)) | ||
| MESSAGE (FATAL_ERROR "MapServer known to crash with PROJ 6.3.0. Use 6.3.1 or higher.") | ||
| ENDIF ((PROJ_VERSION_MAJOR EQUAL 6) AND (PROJ_VERSION_MINOR EQUAL 3) AND (PROJ_VERSION_PATCH EQUAL 0)) | ||
|
|
||
| ADD_DEFINITIONS(-DPROJ_VERSION_MAJOR=${PROJ_VERSION_MAJOR}) | ||
| ELSE() | ||
| MESSAGE(STATUS "Found Proj 4.x") | ||
| ADD_DEFINITIONS(-DPROJ_VERSION_MAJOR=4) | ||
| ENDIF() | ||
| ENDIF (PROJ_FOUND) | ||
| # Find Proj | ||
| # | ||
| # If it's found it sets PROJ_FOUND to TRUE | ||
| # and following variables are set: | ||
| # PROJ_INCLUDE_DIR | ||
| # PROJ_LIBRARY | ||
|
|
||
|
|
||
| FIND_PATH(PROJ_INCLUDE_DIR proj_api.h) | ||
|
|
||
| FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i) | ||
|
|
||
| include(FindPackageHandleStandardArgs) | ||
| find_package_handle_standard_args(PROJ DEFAULT_MSG PROJ_LIBRARY PROJ_INCLUDE_DIR) | ||
| mark_as_advanced(PROJ_LIBRARY PROJ_INCLUDE_DIR) | ||
|
|
||
|
|
||
| IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY) | ||
| SET(PROJ_FOUND TRUE) | ||
| ENDIF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY) | ||
|
|
||
| IF (PROJ_FOUND) | ||
| IF (EXISTS ${PROJ_INCLUDE_DIR}/proj.h) | ||
| FILE(READ ${PROJ_INCLUDE_DIR}/proj.h proj_version) | ||
| STRING(REGEX REPLACE "^.*PROJ_VERSION_MAJOR +([0-9]+).*$" "\\1" PROJ_VERSION_MAJOR "${proj_version}") | ||
| STRING(REGEX REPLACE "^.*PROJ_VERSION_MINOR +([0-9]+).*$" "\\1" PROJ_VERSION_MINOR "${proj_version}") | ||
| STRING(REGEX REPLACE "^.*PROJ_VERSION_PATCH +([0-9]+).*$" "\\1" PROJ_VERSION_PATCH "${proj_version}") | ||
|
|
||
| MESSAGE(STATUS "Found Proj ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}") | ||
|
|
||
| IF ((PROJ_VERSION_MAJOR EQUAL 6) AND (PROJ_VERSION_MINOR EQUAL 3) AND (PROJ_VERSION_PATCH EQUAL 0)) | ||
| MESSAGE (FATAL_ERROR "MapServer known to crash with PROJ 6.3.0. Use 6.3.1 or higher.") | ||
| ENDIF ((PROJ_VERSION_MAJOR EQUAL 6) AND (PROJ_VERSION_MINOR EQUAL 3) AND (PROJ_VERSION_PATCH EQUAL 0)) | ||
|
|
||
| ADD_DEFINITIONS(-DPROJ_VERSION_MAJOR=${PROJ_VERSION_MAJOR}) | ||
| ELSE() | ||
| MESSAGE(STATUS "Found Proj 4.x") | ||
| ADD_DEFINITIONS(-DPROJ_VERSION_MAJOR=4) | ||
| ENDIF() | ||
| ENDIF (PROJ_FOUND) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,100 +1,100 @@ | ||
| /****************************************************************************** | ||
| * $Id$ | ||
| * | ||
| * Project: MapServer | ||
| * Purpose: A C# based mapscript example to draw the map directly onto a GDI | ||
| * device context. | ||
| * Author: Tamas Szekeres, szekerest@gmail.com | ||
| * | ||
| ****************************************************************************** | ||
| * Copyright (c) 1996-2008 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 of this Software or works derived from this 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. | ||
| *****************************************************************************/ | ||
|
|
||
| using System; | ||
| using System.Drawing; | ||
| using System.Drawing.Imaging; | ||
| using OSGeo.MapServer; | ||
|
|
||
| /// <summary> | ||
| /// A C# based mapscript example to draw the map directly onto a GDI device context. | ||
| /// </summary> | ||
| class DrawMap | ||
| { | ||
| public static void usage() | ||
| { | ||
| Console.WriteLine("usage: DrawMapDirect {mapfile} {outfile}"); | ||
| System.Environment.Exit(-1); | ||
| } | ||
|
|
||
| public static void Main(string[] args) | ||
| { | ||
| Console.WriteLine(""); | ||
| if (args.Length < 2) usage(); | ||
|
|
||
| mapObj map = new mapObj(args[0]); | ||
|
|
||
| Console.WriteLine("# Map layers " + map.numlayers + "; Map name = " + map.name); | ||
| for (int i = 0; i < map.numlayers; i++) | ||
| { | ||
| Console.WriteLine("Layer [" + i + "] name: " + map.getLayer(i).name); | ||
| } | ||
|
|
||
| try | ||
| { | ||
| // Create the output format | ||
| outputFormatObj of = new outputFormatObj("CAIRO/WINGDI", "cairowinGDI"); | ||
| map.appendOutputFormat(of); | ||
| map.selectOutputFormat("cairowinGDI"); | ||
|
|
||
| Bitmap mapImage = new Bitmap(map.width, map.height, PixelFormat.Format32bppRgb); | ||
|
|
||
| using (Graphics g = Graphics.FromImage(mapImage)) | ||
| { | ||
| IntPtr hdc = g.GetHdc(); | ||
| try | ||
| { | ||
| // Attach the device to the outputformat for drawing | ||
| of.attachDevice(hdc); | ||
| // Drawing directly to the GDI context | ||
| using (imageObj image = map.draw()) { }; | ||
| } | ||
| finally | ||
| { | ||
| of.attachDevice(IntPtr.Zero); | ||
| g.ReleaseHdc(hdc); | ||
| } | ||
| } | ||
|
|
||
| mapImage.Save(args[1]); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Console.WriteLine( "\nMessage ---\n{0}", ex.Message ); | ||
| Console.WriteLine( | ||
| "\nHelpLink ---\n{0}", ex.HelpLink ); | ||
| Console.WriteLine( "\nSource ---\n{0}", ex.Source ); | ||
| Console.WriteLine( | ||
| "\nStackTrace ---\n{0}", ex.StackTrace ); | ||
| Console.WriteLine( | ||
| "\nTargetSite ---\n{0}", ex.TargetSite ); } | ||
| } | ||
| } | ||
| /****************************************************************************** | ||
| * $Id$ | ||
| * | ||
| * Project: MapServer | ||
| * Purpose: A C# based mapscript example to draw the map directly onto a GDI | ||
| * device context. | ||
| * Author: Tamas Szekeres, szekerest@gmail.com | ||
| * | ||
| ****************************************************************************** | ||
| * Copyright (c) 1996-2008 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 of this Software or works derived from this 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. | ||
| *****************************************************************************/ | ||
|
|
||
| using System; | ||
| using System.Drawing; | ||
| using System.Drawing.Imaging; | ||
| using OSGeo.MapServer; | ||
|
|
||
| /// <summary> | ||
| /// A C# based mapscript example to draw the map directly onto a GDI device context. | ||
| /// </summary> | ||
| class DrawMap | ||
| { | ||
| public static void usage() | ||
| { | ||
| Console.WriteLine("usage: DrawMapDirect {mapfile} {outfile}"); | ||
| System.Environment.Exit(-1); | ||
| } | ||
|
|
||
| public static void Main(string[] args) | ||
| { | ||
| Console.WriteLine(""); | ||
| if (args.Length < 2) usage(); | ||
|
|
||
| mapObj map = new mapObj(args[0]); | ||
|
|
||
| Console.WriteLine("# Map layers " + map.numlayers + "; Map name = " + map.name); | ||
| for (int i = 0; i < map.numlayers; i++) | ||
| { | ||
| Console.WriteLine("Layer [" + i + "] name: " + map.getLayer(i).name); | ||
| } | ||
|
|
||
| try | ||
| { | ||
| // Create the output format | ||
| outputFormatObj of = new outputFormatObj("CAIRO/WINGDI", "cairowinGDI"); | ||
| map.appendOutputFormat(of); | ||
| map.selectOutputFormat("cairowinGDI"); | ||
|
|
||
| Bitmap mapImage = new Bitmap(map.width, map.height, PixelFormat.Format32bppRgb); | ||
|
|
||
| using (Graphics g = Graphics.FromImage(mapImage)) | ||
| { | ||
| IntPtr hdc = g.GetHdc(); | ||
| try | ||
| { | ||
| // Attach the device to the outputformat for drawing | ||
| of.attachDevice(hdc); | ||
| // Drawing directly to the GDI context | ||
| using (imageObj image = map.draw()) { }; | ||
| } | ||
| finally | ||
| { | ||
| of.attachDevice(IntPtr.Zero); | ||
| g.ReleaseHdc(hdc); | ||
| } | ||
| } | ||
|
|
||
| mapImage.Save(args[1]); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Console.WriteLine( "\nMessage ---\n{0}", ex.Message ); | ||
| Console.WriteLine( | ||
| "\nHelpLink ---\n{0}", ex.HelpLink ); | ||
| Console.WriteLine( "\nSource ---\n{0}", ex.Source ); | ||
| Console.WriteLine( | ||
| "\nStackTrace ---\n{0}", ex.StackTrace ); | ||
| Console.WriteLine( | ||
| "\nTargetSite ---\n{0}", ex.TargetSite ); } | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.