Skip to content

Commit bb189d4

Browse files
committed
Remove trailing space characters
1 parent ca56dbb commit bb189d4

File tree

114 files changed

+4185
-4233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+4185
-4233
lines changed

CMakeLists.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
1212
# For MSVC builds default to SSE enabled, and determine if it's a 64-bit (-A x64) vs. 32-bit (-A Win32) build.
1313
if (MSVC)
1414
option(SSE "SSE 4.1 support" TRUE)
15-
if ( CMAKE_GENERATOR_PLATFORM STREQUAL Win32 )
15+
if ( CMAKE_GENERATOR_PLATFORM STREQUAL Win32 )
1616
set(BUILD_X64 0)
1717
else()
1818
set(BUILD_X64 1)
@@ -69,25 +69,25 @@ endif()
6969
if (NOT MSVC)
7070
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
7171
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
72-
72+
7373
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
7474
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
7575

7676
if (SAN)
7777
message("Enabling SAN")
78-
78+
7979
set(SANITIZE_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize=alignment")
80-
80+
8181
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${SANITIZE_FLAGS}")
8282
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${SANITIZE_FLAGS}")
83-
83+
8484
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${SANITIZE_FLAGS}")
8585
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${SANITIZE_FLAGS}")
8686
endif()
8787

8888
set(CMAKE_CXX_FLAGS -std=c++17)
8989
set(GCC_COMPILE_FLAGS "-fvisibility=hidden -fPIC -fno-strict-aliasing -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -Wall -Wextra -Wno-unused-local-typedefs -Wno-unused-value -Wno-unused-parameter -Wno-unused-variable -Wno-reorder -Wno-misleading-indentation -Wno-class-memaccess -Wno-deprecated-copy -Wno-maybe-uninitialized -Wno-unused-function -Wno-stringop-overflow -Wno-unknown-warning-option")
90-
90+
9191
if (NOT BUILD_X64)
9292
set(GCC_COMPILE_FLAGS "${GCC_COMPILE_FLAGS} -m32")
9393
endif()
@@ -105,7 +105,7 @@ if (NOT MSVC)
105105
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_SSE=0")
106106
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_SSE=0")
107107
endif()
108-
108+
109109
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LINK_FLAGS} -static-libgcc -static-libstdc++ -static")
110110
else()
111111
if (SSE)
@@ -115,7 +115,7 @@ if (NOT MSVC)
115115
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_SSE=0")
116116
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_SSE=0")
117117
endif()
118-
118+
119119
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LINK_FLAGS} -Wl,-rpath .")
120120
endif()
121121

@@ -190,8 +190,8 @@ if (NOT MSVC)
190190
# For Non-Windows builds, let cmake try and find the system OpenCL headers/libs for us.
191191
if (OPENCL AND OPENCL_FOUND)
192192
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_OPENCL=1")
193-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_OPENCL=1")
194-
193+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_OPENCL=1")
194+
195195
target_include_directories(basisu PRIVATE ${OpenCL_INCLUDE_DIRS})
196196
target_include_directories(examples PRIVATE ${OpenCL_INCLUDE_DIRS})
197197
target_include_directories(basisu_encoder PRIVATE ${OpenCL_INCLUDE_DIRS})
@@ -201,8 +201,8 @@ else()
201201
# For Windows builds, we use our local copies of the OpenCL import lib and Khronos headers.
202202
if (OPENCL)
203203
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_OPENCL=1")
204-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_OPENCL=1")
205-
204+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_OPENCL=1")
205+
206206
target_include_directories(basisu PRIVATE "OpenCL")
207207
target_include_directories(examples PRIVATE "OpenCL")
208208
target_include_directories(basisu_encoder PRIVATE "OpenCL")
@@ -215,7 +215,7 @@ else()
215215
target_link_libraries(examples PRIVATE "${CMAKE_SOURCE_DIR}/OpenCL/lib/OpenCL.lib")
216216
endif()
217217
endif()
218-
endif()
218+
endif()
219219

220220
if (NOT MSVC)
221221
target_link_libraries(basisu PRIVATE m pthread ${BASISU_EXTRA_LIBS})
@@ -237,19 +237,19 @@ if (NOT EMSCRIPTEN)
237237
endif()
238238

239239
if (MSVC)
240-
set_target_properties(basisu PROPERTIES
240+
set_target_properties(basisu PROPERTIES
241241
RUNTIME_OUTPUT_NAME "basisu"
242242
RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
243243
RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
244244
RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
245245
RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
246-
)
247-
248-
set_target_properties(examples PROPERTIES
246+
)
247+
248+
set_target_properties(examples PROPERTIES
249249
RUNTIME_OUTPUT_NAME "examples"
250250
RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
251251
RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
252252
RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
253253
RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
254-
)
254+
)
255255
endif()

CppProperties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
"intelliSenseMode": "windows-msvc-x64"
1919
}
2020
]
21-
}
21+
}

LICENSES/Apache-2.0.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ AND DISTRIBUTION
77

88
1. Definitions.
99

10-
10+
1111

1212
"License" shall mean the terms and conditions for use, reproduction, and distribution
1313
as defined by Sections 1 through 9 of this document.
1414

15-
15+
1616

1717
"Licensor" shall mean the copyright owner or entity authorized by the copyright
1818
owner that is granting the License.
1919

20-
20+
2121

2222
"Legal Entity" shall mean the union of the acting entity and all other entities
2323
that control, are controlled by, or are under common control with that entity.
@@ -26,31 +26,31 @@ or indirect, to cause the direction or management of such entity, whether
2626
by contract or otherwise, or (ii) ownership of fifty percent (50%) or more
2727
of the outstanding shares, or (iii) beneficial ownership of such entity.
2828

29-
29+
3030

3131
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions
3232
granted by this License.
3333

34-
34+
3535

3636
"Source" form shall mean the preferred form for making modifications, including
3737
but not limited to software source code, documentation source, and configuration
3838
files.
3939

40-
40+
4141

4242
"Object" form shall mean any form resulting from mechanical transformation
4343
or translation of a Source form, including but not limited to compiled object
4444
code, generated documentation, and conversions to other media types.
4545

46-
46+
4747

4848
"Work" shall mean the work of authorship, whether in Source or Object form,
4949
made available under the License, as indicated by a copyright notice that
5050
is included in or attached to the work (an example is provided in the Appendix
5151
below).
5252

53-
53+
5454

5555
"Derivative Works" shall mean any work, whether in Source or Object form,
5656
that is based on (or derived from) the Work and for which the editorial revisions,
@@ -59,7 +59,7 @@ original work of authorship. For the purposes of this License, Derivative
5959
Works shall not include works that remain separable from, or merely link (or
6060
bind by name) to the interfaces of, the Work and Derivative Works thereof.
6161

62-
62+
6363

6464
"Contribution" shall mean any work of authorship, including the original version
6565
of the Work and any modifications or additions to that Work or Derivative
@@ -74,7 +74,7 @@ for the purpose of discussing and improving the Work, but excluding communicatio
7474
that is conspicuously marked or otherwise designated in writing by the copyright
7575
owner as "Not a Contribution."
7676

77-
77+
7878

7979
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
8080
of whom a Contribution has been received by Licensor and subsequently incorporated

OpenCL/CL/cl_d3d10.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,3 @@ typedef cl_int (CL_API_CALL *clEnqueueReleaseD3D10ObjectsKHR_fn)(
125125
#endif
126126

127127
#endif /* __OPENCL_CL_D3D10_H */
128-

OpenCL/CL/cl_d3d11.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,3 @@ typedef cl_int (CL_API_CALL *clEnqueueReleaseD3D11ObjectsKHR_fn)(
125125
#endif
126126

127127
#endif /* __OPENCL_CL_D3D11_H */
128-

OpenCL/CL/cl_dx9_media_sharing.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ extern "C" {
3030

3131
typedef cl_uint cl_dx9_media_adapter_type_khr;
3232
typedef cl_uint cl_dx9_media_adapter_set_khr;
33-
33+
3434
#if defined(_WIN32)
3535
#include <d3d9.h>
3636
typedef struct _cl_dx9_surface_info_khr
@@ -91,7 +91,7 @@ typedef cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceKHR_fn)(
9191
cl_mem_flags flags,
9292
cl_dx9_media_adapter_type_khr adapter_type,
9393
void * surface_info,
94-
cl_uint plane,
94+
cl_uint plane,
9595
cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2;
9696

9797
typedef cl_int (CL_API_CALL *clEnqueueAcquireDX9MediaSurfacesKHR_fn)(
@@ -226,4 +226,3 @@ typedef cl_int (CL_API_CALL *clEnqueueReleaseDX9ObjectsINTEL_fn)(
226226
#endif
227227

228228
#endif /* __OPENCL_CL_DX9_MEDIA_SHARING_H */
229-

OpenCL/CL/cl_ext.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ clEnqueueGenerateMipmapIMG(cl_command_queue command_queue,
524524
cl_uint num_events_in_wait_list,
525525
const cl_event *event_wait_list,
526526
cl_event *event) CL_API_SUFFIX__VERSION_1_2;
527-
527+
528528
/******************************************
529529
* cl_img_mem_properties extension *
530530
******************************************/

OpenCL/CL/cl_gl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ typedef cl_int (CL_API_CALL *clGetGLContextInfoKHR_fn)(
152152
void * param_value,
153153
size_t * param_value_size_ret);
154154

155-
/*
155+
/*
156156
* cl_khr_gl_event extension
157157
*/
158158
#define CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR 0x200D

OpenCL/CL/cl_va_api_media_sharing_intel.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,3 @@ typedef cl_int (CL_API_CALL *clEnqueueReleaseVA_APIMediaSurfacesINTEL_fn)(
133133
#endif
134134

135135
#endif /* __OPENCL_CL_VA_API_MEDIA_SHARING_INTEL_H */
136-

OpenCL/license.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
These optional files (which are only needed when compiling with OpenCL support enabled in the encoder) are from the
1+
These optional files (which are only needed when compiling with OpenCL support enabled in the encoder) are from the
22
Khronos Group OpenCL headers github repo. They are Copyright (c) 2008-2020 The Khronos Group Inc.
33
https://github.com/KhronosGroup/OpenCL-Headers
4-

0 commit comments

Comments
 (0)