Skip to content

Commit

Permalink
clean up trailing whitespace/newlines
Browse files Browse the repository at this point in the history
This is preparation for adding some linting checks for new commits from
people.  Shouldn't be any functional changes here (tests still pass!).
  • Loading branch information
vapier committed Jun 22, 2018
1 parent aac7714 commit fd06f7f
Show file tree
Hide file tree
Showing 102 changed files with 355 additions and 422 deletions.
33 changes: 16 additions & 17 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,24 @@ endif(BUILD_TEST)
IF(CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_C_FLAGS_DEBUG "-g -Wall -Wextra -O0") # will be added to CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
ENDIF(CMAKE_COMPILER_IS_GNUCC)
SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY
${PROJECT_BINARY_DIR}/Bin
CACHE PATH
"Single Directory for all Libraries"
SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY
${PROJECT_BINARY_DIR}/Bin
CACHE PATH
"Single Directory for all Libraries"
)

# --------- Setup the Executable output Directory -------------
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY
${PROJECT_BINARY_DIR}/Bin
CACHE PATH
"Single Directory for all Executables."
# --------- Setup the Executable output Directory -------------
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY
${PROJECT_BINARY_DIR}/Bin
CACHE PATH
"Single Directory for all Executables."
)

# --------- Setup the Executable output Directory -------------
SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY
${PROJECT_BINARY_DIR}/Bin
CACHE PATH
"Single Directory for all static libraries."
# --------- Setup the Executable output Directory -------------
SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY
${PROJECT_BINARY_DIR}/Bin
CACHE PATH
"Single Directory for all static libraries."
)

if (USE_EXT_GD)
Expand Down Expand Up @@ -106,7 +106,7 @@ else (USE_EXT_GD)
if (ENABLE_PNG)
FIND_PACKAGE(PNG REQUIRED)
endif (ENABLE_PNG)

if (ENABLE_ICONV)
FIND_PACKAGE(ICONV REQUIRED)
endif (ENABLE_ICONV)
Expand Down Expand Up @@ -167,7 +167,7 @@ else (USE_EXT_GD)
INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
SET(HAVE_LIBPNG 1)
ENDIF(PNG_FOUND)

IF(ICONV_FOUND)
INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
SET(HAVE_ICONV 1)
Expand Down Expand Up @@ -302,4 +302,3 @@ set(CPACK_SOURCE_IGNORE_FILES
)
install(FILES ${top_level_DOCFILES} DESTINATION ${DOC_DIR})
INCLUDE(CPack)

4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* [Git Commit Messages](#git-commit-messages)
* [Coding standard](#coding-standard)
* [Documentation Styleguide](#documentation-styleguide)

## What should I know before I get started?

### Code of Conduct
Expand Down Expand Up @@ -49,7 +49,7 @@ Before creating bug reports, please check [this list](#before-submitting-a-bug-r

#### How Do I Submit A (Good) Bug Report?

For security related bugs, github does not support private issues, that's why we have to handle security issues outside the issues tracker for now. Please drop a mail to [[email protected]](mailto:[email protected]).
For security related bugs, github does not support private issues, that's why we have to handle security issues outside the issues tracker for now. Please drop a mail to [[email protected]](mailto:[email protected]).

Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). After you've determined [which repository](#repositories) your bug is related to, create an issue on that repository and provide the following information.

Expand Down
1 change: 0 additions & 1 deletion COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,3 @@ documentation.
Although their code does not appear in the current release, the
authors wish to thank David Koblas, David Rowley, and Hutchison
Avenue Software Corporation for their prior contributions.

12 changes: 6 additions & 6 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GD 2.0.36 (2007-11-xx)
(Pierre, Mark Fisher)
88, Fixed support of PNG grayscale image with alpha channel (Pierre)
95, Added Netware builds script (Guenter)
97, ease the creation of regexp to match symbols/functions in the sources
97, ease the creation of regexp to match symbols/functions in the sources
(Guenter)
100, spurious horizontal line drawn by gdImageFilledPolygon (Takeshi Abe)
101, _gdCreateFromFile() can crash if gdImageCreate fails (Mattias Bengtsson)
Expand All @@ -37,17 +37,17 @@ GD 2.0.36 (2007-11-xx)
198, Fixed useFontConfig() to work as documented (Mojca Miklavec, Ethan Merritt)

GD 2.0.35 (2007-06-21)
41, Fix valgrind error in gdImageFillTiled (Nuno Lopes)
41, Fix valgrind error in gdImageFillTiled (Nuno Lopes)
45, Add missing custom cmake macros (required for the tests suite)
51, Avoid signature buffer copy in gd_gif_c (Nuno Lopes)
48, Race condition in gdImageStringFTEx (Antony Dogval, Pierre
48, Race condition in gdImageStringFTEx (Antony Dogval, Pierre
Scott MacVicar)
52, Reading GIF images is not thread safe (static usage in private
functions) (Roman Nemecek, Nuno Lopes, Pierre)
60, GIF Local palette is read twice
66, GIF, Use local frame dimension when possible instead of the
66, GIF, Use local frame dimension when possible instead of the
logical screen size (Pierre)
68, OpenVMS build support, see VMS/README.VMS for the details
68, OpenVMS build support, see VMS/README.VMS for the details
(Alexey Chupahin)
70, GIF, do not try to use the global colmap if it does not exist
(Nuno Lopes, Pierre)
Expand All @@ -58,7 +58,7 @@ GD 2.0.35 (2007-06-21)
(Pierre)
86, Possible infinite loop in libgd/gd_png.c, flaw found by Xavier Roche
(Pierre)
87, Fixed segfault when an invalid color index is present in a GIF
87, Fixed segfault when an invalid color index is present in a GIF
image data, reported by Elliot <wccode at gmail dot com> (Pierre)
89, Possible integer overflow in gdImageCreateTrueColor (Pierre)
94, gdImageCreateXbm can crash if gdImageCreate fails (Pierre)
Expand Down
38 changes: 19 additions & 19 deletions VMS/CONFIGURE.COM
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$! (c) Alexey Chupahin 18-APR-2006, 15-DEC-2007
$! OpenVMS 8.2 Alpha DEC 2000 model 300
$! OpenVMS 8.3 Itanium rx1620
$! OpenVMS 8.3 Itanium rx1620
$! GNU
$!
$!
Expand All @@ -26,9 +26,9 @@ $ SHARED=32
$ENDIF
$DECC = F$SEARCH("SYS$SYSTEM:DECC$COMPILER.EXE") .NES. ""
$IF (DECC) THEN $WRITE SYS$OUTPUT "Compiler ... DEC C"
$IF (.NOT. DECC) THEN $WRITE SYS$OUTPUT "BAD compiler" GOTO EXIT
$IF (.NOT. DECC) THEN $WRITE SYS$OUTPUT "BAD compiler" GOTO EXIT
$MMS = F$SEARCH("SYS$SYSTEM:MMS.EXE") .NES. ""
$MMK = F$TYPE(MMK)
$MMK = F$TYPE(MMK)
$IF (MMS .OR. MMK.NES."") THEN GOTO TEST_LIBRARIES
$WRITE SYS$OUTPUT "Please install MMS from DECSET or MMK"
$! I cant find any make tool
Expand Down Expand Up @@ -150,7 +150,7 @@ $ CC/OBJECT=TEST.OBJ/INCLUDE=(FREETYPE2) SYS$INPUT
int main(int argc, char *argv[])
{

#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR <= 1
#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR <= 1
printf("This version is too old. Please get newest\n");
printf("From fafner.dyndns.org/~alexey/libsdl/required.html\n");
exit(2);
Expand Down Expand Up @@ -220,8 +220,8 @@ $ CC/OBJECT=TEST.OBJ/INCLUDE=(PNG,ZLIB) SYS$INPUT
n=png_access_version_number();
n3=n%100; n=n/100;
n2=n%100; n=n/100;
n1=n%100;
if ( (n1<=1)&&(n2<2) )
n1=n%100;
if ( (n1<=1)&&(n2<2) )
{ printf("checking version libPNG: %d.%d.%d\n",n1,n2,n3);
printf("This version is too old. Please get newest\n");
printf("From fafner.dyndns.org/~alexey/libsdl/public.html\n");
Expand Down Expand Up @@ -252,7 +252,7 @@ $ LIBPNG_STATIC=0
$ HAVE_LIBPNG=0
$ GOTO NEXT2
$ ELSE
$ HAVE_LIBPNG=1
$ HAVE_LIBPNG=1
$ LIBPNG_STATIC=1
$ ENDIF
$ ELSE
Expand Down Expand Up @@ -287,7 +287,7 @@ $ CC/OBJECT=TEST.OBJ/INCLUDE=(JPEG) SYS$INPUT
#include <stdlib.h>
#include <stdio.h>
#include <jpeglib.h>
#include <jversion.h>
#include <jversion.h>
int main()
{
printf("checking version jpeg: %s\n",JVERSION);
Expand Down Expand Up @@ -805,7 +805,7 @@ $ THEN
$ IF (ZLIB_STATIC.EQ.0)
$ THEN
$ APP SYS$INPUT [.SRC]LIBGD.OPT
SYS$SHARE:LIBZSHR/SHARE
SYS$SHARE:LIBZSHR/SHARE
$ ELSE
$ APP SYS$INPUT [.SRC]LIBGD.OPT
ZLIB:LIBZ/LIB
Expand Down Expand Up @@ -954,29 +954,29 @@ $ APP SYS$INPUT [.SRC]CONFIG.H
/* Define if <iconv.h> defines iconv_t. */
#define HAVE_ICONV_T_DEF 1
$ENDIF
$IF HAVE_TIFF.EQ.1
$ THEN
$IF HAVE_TIFF.EQ.1
$ THEN
$ APP SYS$INPUT [.SRC]CONFIG.H
#define HAVE_LIBTIFF 1
$ENDIF
$IF HAVE_LIBPNG.EQ.1
$ THEN
$IF HAVE_LIBPNG.EQ.1
$ THEN
$ APP SYS$INPUT [.SRC]CONFIG.H
#define HAVE_LIBPNG 1
$ENDIF
$IF HAVE_FREETYPE.EQ.1
$ THEN
$ THEN
$ APP SYS$INPUT [.SRC]CONFIG.H
#define HAVE_LIBFREETYPE 1
#define HAVE_FT2BUILD_H 1
$ENDIF
$IF HAVE_JPEG.EQ.1
$ THEN
$IF HAVE_JPEG.EQ.1
$ THEN
$ APP SYS$INPUT [.SRC]CONFIG.H
#define HAVE_LIBJPEG 1
$ENDIF
$IF HAVE_ZLIB.EQ.1
$ THEN
$IF HAVE_ZLIB.EQ.1
$ THEN
$ APP SYS$INPUT [.SRC]CONFIG.H
#define HAVE_LIBZ 1
$ENDIF
Expand All @@ -994,7 +994,7 @@ $COP SYS$INPUT [.SRC]DESCRIP.MMS
# Alexey Chupahin [email protected]
# OpenVMS 7.3-1,8.2 DEC 2000 mod.300
# OpenVMS 8.3 HP rx1620


.FIRST
DEF LIBGD []
Expand Down
14 changes: 7 additions & 7 deletions VMS/README.VMS
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Dear OpenVMS user,

Installation process is identical to one in *nix* world and consist to
Installation process is identical to one in *nix* world and consist to
four simple steps:
1. Installing required libraries
2. Configuration
Expand All @@ -18,7 +18,7 @@ four simple steps:
All may be found at OpenVMS libSDL porting project site
http://fafner.dyndns.org/~alexey/libsdl/required.html

Also, system should have MMS make utility from DEC or
Also, system should have MMS make utility from DEC or
free analogue MMK. And C compiler with runtime, of course. ;)


Expand All @@ -27,14 +27,14 @@ free analogue MMK. And C compiler with runtime, of course. ;)
$@[.VMS]CONFIGURE

The script detects hardware,system and required libraries have been installed.
Compilation stage will be prepeared to create shared and static libraries.
Alpha,IA64 or VAX platform are supported. Optional argument "static"
Compilation stage will be prepeared to create shared and static libraries.
Alpha,IA64 or VAX platform are supported. Optional argument "static"
tells to configurator to make static libraries only:

$@[.VMS]CONFIGURE STATIC

CONFIGURE script checks your ZLIB, FREETYPE, JPEG, PNG libraries.
If it detects any troubles, you may get and install good and tested ones
CONFIGURE script checks your ZLIB, FREETYPE, JPEG, PNG libraries.
If it detects any troubles, you may get and install good and tested ones
from OpenVMS libSDL porting project site:
http://fafner.dyndns.org/~alexey/libsdl/required.html

Expand All @@ -54,7 +54,7 @@ $@LIBGD$STARTUP

LIBGD and its utilites are ready to using.

Optionally you may insert this startup file into your LOGIN.COM
Optionally you may insert this startup file into your LOGIN.COM
to set libGD environment every time you login automatically.

To learn libGD please refer libGD official documentation.
Expand Down
6 changes: 3 additions & 3 deletions cmake/modules/CMakeParseArguments.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@
#
# * Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
#
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
#
# * The names of Kitware, Inc., the Insight Consortium, or the names of
# any consortium members, or of any contributors, may not be used to
# endorse or promote products derived from this software without
# specific prior written permission.
#
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Expand Down
16 changes: 8 additions & 8 deletions cmake/modules/CheckDIRSymbolExists.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
#
# * Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
#
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
#
# * The names of Kitware, Inc., the Insight Consortium, or the names of
# any consortium members, or of any contributors, may not be used to
# endorse or promote products derived from this software without
# specific prior written permission.
#
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Expand All @@ -39,7 +39,7 @@
# the AC_HEADER_DIRENT test programme rather than the CheckSymbolExists.cmake
# test programme which always fails since DIR tends to be typedef'd
# rather than #define'd.
#
#
# The following variables may be set before calling this macro to
# modify the way the check is run:
#
Expand All @@ -53,7 +53,7 @@ MACRO(CHECK_DIRSYMBOL_EXISTS FILES VARIABLE)
SET(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
SET(MACRO_CHECK_DIRSYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
IF(CMAKE_REQUIRED_LIBRARIES)
SET(CHECK_DIRSYMBOL_EXISTS_LIBS
SET(CHECK_DIRSYMBOL_EXISTS_LIBS
"-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
ELSE(CMAKE_REQUIRED_LIBRARIES)
SET(CHECK_DIRSYMBOL_EXISTS_LIBS)
Expand All @@ -79,23 +79,23 @@ MACRO(CHECK_DIRSYMBOL_EXISTS FILES VARIABLE)
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckDIRSymbolExists.c
COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
CMAKE_FLAGS
CMAKE_FLAGS
-DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_DIRSYMBOL_EXISTS_FLAGS}
"${CHECK_DIRSYMBOL_EXISTS_LIBS}"
"${CMAKE_DIRSYMBOL_EXISTS_INCLUDES}"
OUTPUT_VARIABLE OUTPUT)
IF(${VARIABLE})
MESSAGE(STATUS "Looking for DIR in ${FILES} - found")
SET(${VARIABLE} 1 CACHE INTERNAL "Have symbol DIR")
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
"Determining if the DIR symbol is defined as in AC_HEADER_DIRENT "
"passed with the following output:\n"
"${OUTPUT}\nFile ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckDIRSymbolExists.c:\n"
"${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
ELSE(${VARIABLE})
MESSAGE(STATUS "Looking for DIR in ${FILES} - not found.")
SET(${VARIABLE} "" CACHE INTERNAL "Have symbol DIR")
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
"Determining if the DIR symbol is defined as in AC_HEADER_DIRENT "
"failed with the following output:\n"
"${OUTPUT}\nFile ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckDIRSymbolExists.c:\n"
Expand Down
7 changes: 3 additions & 4 deletions cmake/modules/CheckPrototypeExists.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
#
# * Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
#
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
#
# * The names of Kitware, Inc., the Insight Consortium, or the names of
# any consortium members, or of any contributors, may not be used to
# endorse or promote products derived from this software without
# specific prior written permission.
#
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Expand Down Expand Up @@ -66,4 +66,3 @@ int main()
")
CHECK_CXX_SOURCE_COMPILES("${_CHECK_PROTO_EXISTS_SOURCE_CODE}" ${_RESULT})
ENDMACRO(CHECK_PROTOTYPE_EXISTS _SYMBOL _HEADER _RESULT)

Loading

0 comments on commit fd06f7f

Please sign in to comment.