diff --git a/CMakeLists.txt b/CMakeLists.txt index cfc29c4352..0a0aec0083 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3710,7 +3710,7 @@ else() set(SDL_REVISION "" CACHE STRING "Custom SDL revision (only used when REVISION.txt does not exist)") endif() if(NOT SDL_REVISION) - # If SDL_REVISION is not overrided, use git to describe + # If SDL_REVISION is not overridden, use git to describe git_describe(SDL_REVISION_GIT) set(SDL_REVISION "SDL-${SDL3_VERSION}-${SDL_REVISION_GIT}") endif() @@ -4292,7 +4292,7 @@ if(SDL_INSTALL) if(ANDROID) if(TARGET SDL3-jar) - set(SDL_INSTALL_JAVADIR "${CMAKE_INSTALL_DATAROOTDIR}/java" CACHE PATH "Path where to install java clases + java sources") + set(SDL_INSTALL_JAVADIR "${CMAKE_INSTALL_DATAROOTDIR}/java" CACHE PATH "Path where to install java classes + java sources") set(PROGUARD_RULES_PATH "${CMAKE_CURRENT_SOURCE_DIR}/android-project/app/proguard-rules.pro") # install_jar or $ does not work on Windows: a SDL3.jar symlink is not generated install(FILES "${CMAKE_CURRENT_BINARY_DIR}/SDL3-${SDL3_VERSION}.jar" diff --git a/Xcode/XcodeDocSet/Doxyfile b/Xcode/XcodeDocSet/Doxyfile index 961ac98ef4..139f23e323 100644 --- a/Xcode/XcodeDocSet/Doxyfile +++ b/Xcode/XcodeDocSet/Doxyfile @@ -289,10 +289,10 @@ TYPEDEF_HIDES_STRUCT = YES # For small to medium size projects (<1000 input files) the default value is # probably good enough. For larger projects a too small cache size can cause # doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. +# causing a significant performance penalty. # If the system has enough physical memory increasing the cache will improve the # performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the +# a logarithmic scale so increasing the size by one will roughly double the # memory usage. The cache size is given by this formula: # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, # corresponding to a cache size of 2^16 = 65536 symbols diff --git a/build-scripts/pkg-support/android/aar/__main__.py.in b/build-scripts/pkg-support/android/aar/__main__.py.in index 917049f443..cce16cdad9 100755 --- a/build-scripts/pkg-support/android/aar/__main__.py.in +++ b/build-scripts/pkg-support/android/aar/__main__.py.in @@ -11,7 +11,7 @@ cmake -S my-project \ -DCMAKE_PREFIX_PATH=/usr/opt/android-sdks \ -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake \ -B build-arm64 -DANDROID_ABI=arm64-v8a \ - -DCMAKE_BUILD_TYPE=Releaase + -DCMAKE_BUILD_TYPE=Release cmake --build build-arm64 ``` """ diff --git a/build-scripts/wikiheaders.pl b/build-scripts/wikiheaders.pl index 2092912bc9..c796b0c245 100755 --- a/build-scripts/wikiheaders.pl +++ b/build-scripts/wikiheaders.pl @@ -1362,7 +1362,7 @@ while (my $d = readdir(DH)) { if (($p eq 'void') || ($p eq '')) { die("Void parameter in a function with multiple params?! ('$sym' in '$incpath/$dent')") if (scalar(@params) != 1); } elsif ($p eq '...') { - die("Mutiple '...' params?! ('$sym' in '$incpath/$dent')") if ($dotdotdot); + die("Multiple '...' params?! ('$sym' in '$incpath/$dent')") if ($dotdotdot); $dotdotdot = 1; push @paraminfo, '...'; push @paraminfo, '...'; @@ -1673,7 +1673,7 @@ while (my $d = readdir(DH)) { if ($has_doxygen) { print STDERR "WARNING: Symbol '$sym' appears to be documented in multiple locations. Only keeping the first one we saw!\n"; } - push @contents, join("\n", @decllines) if (scalar(@decllines) > 0); # just put the existing declation in as-is. + push @contents, join("\n", @decllines) if (scalar(@decllines) > 0); # just put the existing declaration in as-is. } } diff --git a/docs/INTRO-xcode.md b/docs/INTRO-xcode.md index 5f0a62aba8..1cc1de56a7 100644 --- a/docs/INTRO-xcode.md +++ b/docs/INTRO-xcode.md @@ -11,6 +11,6 @@ We'll start by creating a simple project to build and run [hello.c](hello.c) - On iOS projects, select the project, select the main target, select the Info tab, look for "Custom iOS Target Properties", and remove "Main storyboard base file name" and "Application Scene Manifest" - Right click the project and select "Add Files to [project]", navigate to the SDL docs directory and add the file hello.c - Right click the project and select "Add Files to [project]", navigate to the SDL Xcode/SDL directory and add SDL.xcodeproj -- Select the project, select the main target, select the General tab, look for "Frameworks, Libaries, and Embedded Content", and add SDL3.framework +- Select the project, select the main target, select the General tab, look for "Frameworks, Libraries, and Embedded Content", and add SDL3.framework - Build and run! diff --git a/docs/README-android.md b/docs/README-android.md index 66e5ea6eda..f8e14d4f44 100644 --- a/docs/README-android.md +++ b/docs/README-android.md @@ -76,7 +76,7 @@ For more complex projects, follow these instructions: The 'android-project' directory can basically be seen as a sort of starting point for the android-port of your project. It contains the glue code between the Android Java 'frontend' and the SDL code 'backend'. It also contains some standard behaviour, like how events should be handled, which you will be able to change. -2. If you are _not_ already building SDL as a part of your project (e.g. via CMake add_subdirectory() or FetchContent) move or [symlink](https://en.wikipedia.org/wiki/Symbolic_link) the SDL directory into the 'android-project/app/jni' directory. Alternatively you can [use the SDL3 Android Archive (.aar)](#using-the-sdl3-android-archive-aar), see bellow for more details. +2. If you are _not_ already building SDL as a part of your project (e.g. via CMake add_subdirectory() or FetchContent) move or [symlink](https://en.wikipedia.org/wiki/Symbolic_link) the SDL directory into the 'android-project/app/jni' directory. Alternatively you can [use the SDL3 Android Archive (.aar)](#using-the-sdl3-android-archive-aar), see below for more details. This is needed as SDL has to be compiled by the Android compiler. diff --git a/docs/README-emscripten.md b/docs/README-emscripten.md index b9667f1ed5..2663cdaebb 100644 --- a/docs/README-emscripten.md +++ b/docs/README-emscripten.md @@ -224,7 +224,7 @@ If you're using the SDL main callbacks, the mainloop defaults to using requestAnimationFrame (effectively vsync), because it calls emscripten_set_main_loop() with a zero fps. This is almost certainly what you want to do! Do this even if you aren't using the main callbacks! -SDL will attempt to accomodate the app if it messes with vsync settings, or +SDL will attempt to accommodate the app if it messes with vsync settings, or doesn't use requestAnimationFrame, but modern thinking is that this is the most efficient, consistent, and correct way to run a game in a web browser. diff --git a/docs/README-migration.md b/docs/README-migration.md index 1a8fbaa6d6..7aeb4842b0 100644 --- a/docs/README-migration.md +++ b/docs/README-migration.md @@ -173,7 +173,7 @@ If you used SDL_QueueAudio instead of a callback in SDL2, this is also straightf SDL_AudioInit() and SDL_AudioQuit() have been removed. Instead you can call SDL_InitSubSystem() and SDL_QuitSubSystem() with SDL_INIT_AUDIO, which will properly refcount the subsystems. You can choose a specific audio driver using SDL_AUDIO_DRIVER hint. -The `SDL_AUDIO_ALLOW_*` symbols have been removed; now one may request the format they desire from the audio device, but ultimately SDL_AudioStream will manage the difference. One can use SDL_GetAudioDeviceFormat() to see what the final format is, if any "allowed" changes should be accomodated by the app. +The `SDL_AUDIO_ALLOW_*` symbols have been removed; now one may request the format they desire from the audio device, but ultimately SDL_AudioStream will manage the difference. One can use SDL_GetAudioDeviceFormat() to see what the final format is, if any "allowed" changes should be accommodated by the app. SDL_AudioDeviceID now represents both an open audio device's handle (a "logical" device) and the instance ID that the hardware owns as long as it exists on the system (a "physical" device). The separation between device instances and device indexes is gone, and logical and physical devices are almost entirely interchangeable at the API level. @@ -273,7 +273,7 @@ If you need to convert U16 audio data to a still-supported format at runtime, th } ``` -All remaining `AUDIO_*` symbols have been renamed to `SDL_AUDIO_*` for API consistency, but othewise are identical in value and usage. +All remaining `AUDIO_*` symbols have been renamed to `SDL_AUDIO_*` for API consistency, but otherwise are identical in value and usage. In SDL2, SDL_AudioStream would convert/resample audio data during input (via SDL_AudioStreamPut). In SDL3, it does this work when requesting audio (via SDL_GetAudioStreamData, which would have been SDL_AudioStreamGet in SDL2). The way you use an AudioStream is roughly the same, just be aware that the workload moved to a different phase. diff --git a/docs/README-wayland.md b/docs/README-wayland.md index 720807032c..d9cd6046f9 100644 --- a/docs/README-wayland.md +++ b/docs/README-wayland.md @@ -68,7 +68,7 @@ encounter limitations or behavior that is different from other windowing systems ### The application progress bar can't be set via ```SDL_SetWindowProgressState()``` or ```SDL_SetWindowProgressValue()``` -- Only some Desktop Environemnts support the underlying API. Known compatible DEs: Unity, KDE +- Only some Desktop Environments support the underlying API. Known compatible DEs: Unity, KDE - The underlying API requires a desktop entry file, aka a `.desktop` file. Please see the [Desktop Entry Specification](https://specifications.freedesktop.org/desktop-entry-spec/latest/) for more information on the format of this file. Note that if your application manually sets the application ID via the diff --git a/docs/doxyfile b/docs/doxyfile index c8891d82b5..87190b169b 100644 --- a/docs/doxyfile +++ b/docs/doxyfile @@ -290,10 +290,10 @@ TYPEDEF_HIDES_STRUCT = YES # For small to medium size projects (<1000 input files) the default value is # probably good enough. For larger projects a too small cache size can cause # doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. +# causing a significant performance penalty. # If the system has enough physical memory increasing the cache will improve the # performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the +# a logarithmic scale so increasing the size by one will roughly double the # memory usage. The cache size is given by this formula: # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, # corresponding to a cache size of 2^16 = 65536 symbols diff --git a/examples/renderer/02-primitives/README.txt b/examples/renderer/02-primitives/README.txt index 82da8e52f5..a360a0fe93 100644 --- a/examples/renderer/02-primitives/README.txt +++ b/examples/renderer/02-primitives/README.txt @@ -1,7 +1,7 @@ This example creates an SDL window and renderer, and then draws some lines, rectangles and points to it every frame. -This is just a quick overview of simple drawing primitives; futher examples +This is just a quick overview of simple drawing primitives; further examples will explore them in more detail. diff --git a/include/SDL3/SDL_camera.h b/include/SDL3/SDL_camera.h index 220acd1bf3..9cb061330e 100644 --- a/include/SDL3/SDL_camera.h +++ b/include/SDL3/SDL_camera.h @@ -486,7 +486,7 @@ extern SDL_DECLSPEC SDL_Surface * SDLCALL SDL_AcquireCameraFrame(SDL_Camera *cam /** * Release a frame of video acquired from a camera. * - * Let the back-end re-use the internal buffer for camera. + * Let the back-end reuse the internal buffer for camera. * * This function _must_ be called only on surface objects returned by * SDL_AcquireCameraFrame(). This function should be called as quickly as diff --git a/include/SDL3/SDL_scancode.h b/include/SDL3/SDL_scancode.h index cd5a1376a8..aa12c062fc 100644 --- a/include/SDL3/SDL_scancode.h +++ b/include/SDL3/SDL_scancode.h @@ -125,7 +125,7 @@ typedef enum SDL_Scancode SDL_SCANCODE_NONUSHASH = 50, /**< ISO USB keyboards actually use this code * instead of 49 for the same key, but all * OSes I've seen treat the two codes - * identically. So, as an implementor, unless + * identically. So, as an implementer, unless * your keyboard generates both of those * codes and your OS treats them differently, * you should generate SDL_SCANCODE_BACKSLASH diff --git a/src/core/linux/SDL_ibus.c b/src/core/linux/SDL_ibus.c index b0d96eaa4c..1002679a6d 100644 --- a/src/core/linux/SDL_ibus.c +++ b/src/core/linux/SDL_ibus.c @@ -470,7 +470,7 @@ static bool IBus_SetupConnection(SDL_DBusContext *dbus, const char *addr) DBUS_TYPE_STRING, &client_name, DBUS_TYPE_INVALID, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID); } else { - // re-using dbus->session_conn + // reusing dbus->session_conn dbus->connection_ref(ibus_conn); } diff --git a/src/hidapi/hidapi/hidapi.h b/src/hidapi/hidapi/hidapi.h index 0e75f0de97..5446b2c82b 100644 --- a/src/hidapi/hidapi/hidapi.h +++ b/src/hidapi/hidapi/hidapi.h @@ -64,7 +64,7 @@ #define HID_API_AS_STR(x) HID_API_AS_STR_IMPL(x) #define HID_API_TO_VERSION_STR(v1, v2, v3) HID_API_AS_STR(v1.v2.v3) -/** @brief Coverts a version as Major/Minor/Patch into a number: +/** @brief Converts a version as Major/Minor/Patch into a number: <8 bit major><16 bit minor><8 bit patch>. This macro was added in version 0.12.0. diff --git a/src/hidapi/windows/hidapi_descriptor_reconstruct.c b/src/hidapi/windows/hidapi_descriptor_reconstruct.c index 6697d3c3c3..6e9f79eb0b 100644 --- a/src/hidapi/windows/hidapi_descriptor_reconstruct.c +++ b/src/hidapi/windows/hidapi_descriptor_reconstruct.c @@ -401,11 +401,11 @@ int hid_winapi_descriptor_reconstruct_pp_data(void *preparsed_data, unsigned cha collection_node_idx = coll_child_order[collection_node_idx][0]; // In a HID Report Descriptor, the first usage declared is the most preferred usage for the control. - // While the order in the WIN32 capabiliy strutures is the opposite: + // While the order in the WIN32 capabiliy structures is the opposite: // Here the preferred usage is the last aliased usage in the sequence. if (link_collection_nodes[collection_node_idx].IsAlias && (firstDelimiterNode == NULL)) { - // Alliased Collection (First node in link_collection_nodes -> Last entry in report descriptor output) + // Aliased Collection (First node in link_collection_nodes -> Last entry in report descriptor output) firstDelimiterNode = main_item_list; coll_begin_lookup[collection_node_idx] = rd_append_main_item_node(0, 0, rd_item_node_collection, 0, collection_node_idx, rd_delimiter_usage, 0, &main_item_list); coll_begin_lookup[collection_node_idx] = rd_append_main_item_node(0, 0, rd_item_node_collection, 0, collection_node_idx, rd_delimiter_close, 0, &main_item_list); @@ -431,7 +431,7 @@ int hid_winapi_descriptor_reconstruct_pp_data(void *preparsed_data, unsigned cha collection_node_idx = coll_child_order[collection_node_idx][nextChild]; if (link_collection_nodes[collection_node_idx].IsAlias && (firstDelimiterNode == NULL)) { - // Alliased Collection (First node in link_collection_nodes -> Last entry in report descriptor output) + // Aliased Collection (First node in link_collection_nodes -> Last entry in report descriptor output) firstDelimiterNode = main_item_list; coll_begin_lookup[collection_node_idx] = rd_append_main_item_node(0, 0, rd_item_node_collection, 0, collection_node_idx, rd_delimiter_usage, 0, &main_item_list); coll_begin_lookup[collection_node_idx] = rd_append_main_item_node(0, 0, rd_item_node_collection, 0, collection_node_idx, rd_delimiter_close, 0, &main_item_list); @@ -491,11 +491,11 @@ int hid_winapi_descriptor_reconstruct_pp_data(void *preparsed_data, unsigned cha list_node = rd_search_main_item_list_for_bit_position(first_bit, (rd_main_items) rt_idx, pp_data->caps[caps_idx].ReportID, &coll_begin); // In a HID Report Descriptor, the first usage declared is the most preferred usage for the control. - // While the order in the WIN32 capabiliy strutures is the opposite: + // While the order in the WIN32 capabiliy structures is the opposite: // Here the preferred usage is the last aliased usage in the sequence. if (pp_data->caps[caps_idx].IsAlias && (firstDelimiterNode == NULL)) { - // Alliased Usage (First node in pp_data->caps -> Last entry in report descriptor output) + // Aliased Usage (First node in pp_data->caps -> Last entry in report descriptor output) firstDelimiterNode = list_node; rd_insert_main_item_node(first_bit, last_bit, rd_item_node_cap, caps_idx, pp_data->caps[caps_idx].LinkCollection, rd_delimiter_usage, pp_data->caps[caps_idx].ReportID, &list_node); rd_insert_main_item_node(first_bit, last_bit, rd_item_node_cap, caps_idx, pp_data->caps[caps_idx].LinkCollection, rd_delimiter_close, pp_data->caps[caps_idx].ReportID, &list_node); @@ -504,7 +504,7 @@ int hid_winapi_descriptor_reconstruct_pp_data(void *preparsed_data, unsigned cha rd_insert_main_item_node(first_bit, last_bit, rd_item_node_cap, caps_idx, pp_data->caps[caps_idx].LinkCollection, rd_delimiter_usage, pp_data->caps[caps_idx].ReportID, &list_node); } else if (!pp_data->caps[caps_idx].IsAlias && (firstDelimiterNode != NULL)) { - // Alliased Collection (Last node in pp_data->caps -> First entry in report descriptor output) + // Aliased Collection (Last node in pp_data->caps -> First entry in report descriptor output) rd_insert_main_item_node(first_bit, last_bit, rd_item_node_cap, caps_idx, pp_data->caps[caps_idx].LinkCollection, rd_delimiter_usage, pp_data->caps[caps_idx].ReportID, &list_node); rd_insert_main_item_node(first_bit, last_bit, rd_item_node_cap, caps_idx, pp_data->caps[caps_idx].LinkCollection, rd_delimiter_open, pp_data->caps[caps_idx].ReportID, &list_node); firstDelimiterNode = NULL; diff --git a/src/hidapi/windows/pp_data_dump/pp_data_dump.c b/src/hidapi/windows/pp_data_dump/pp_data_dump.c index d5df68b50f..9a17527263 100644 --- a/src/hidapi/windows/pp_data_dump/pp_data_dump.c +++ b/src/hidapi/windows/pp_data_dump/pp_data_dump.c @@ -85,8 +85,8 @@ void dump_hidp_link_collection_node(FILE* file, phid_pp_link_collection_node pco fprintf(file, "pp_data->LinkCollectionArray[%u]->NumberOfChildren = %hu\n", coll_idx, pcoll->NumberOfChildren); fprintf(file, "pp_data->LinkCollectionArray[%u]->NextSibling = %hu\n", coll_idx, pcoll->NextSibling); fprintf(file, "pp_data->LinkCollectionArray[%u]->FirstChild = %hu\n", coll_idx, pcoll->FirstChild); - // The compilers are not consistent on ULONG-bit-fields: They lose the unsinged or define them as int. - // Thus just always cast them to unsinged int, which should be fine, as the biggest bit-field is 28 bit + // The compilers are not consistent on ULONG-bit-fields: They lose the unsigned or define them as int. + // Thus just always cast them to unsigned int, which should be fine, as the biggest bit-field is 28 bit fprintf(file, "pp_data->LinkCollectionArray[%u]->CollectionType = %u\n", coll_idx, (unsigned int)(pcoll->CollectionType)); fprintf(file, "pp_data->LinkCollectionArray[%u]->IsAlias = %u\n", coll_idx, (unsigned int)(pcoll->IsAlias)); fprintf(file, "pp_data->LinkCollectionArray[%u]->Reserved = 0x%08X\n", coll_idx, (unsigned int)(pcoll->Reserved)); diff --git a/src/libm/e_sqrt.c b/src/libm/e_sqrt.c index f0add57953..43ea26a438 100644 --- a/src/libm/e_sqrt.c +++ b/src/libm/e_sqrt.c @@ -38,7 +38,7 @@ * If (2) is false, then q = q ; otherwise q = q + 2 . * i+1 i i+1 i * - * With some algebric manipulation, it is not difficult to see + * With some algebraic manipulation, it is not difficult to see * that (2) is equivalent to * -(i+1) * s + 2 <= y (3) @@ -281,7 +281,7 @@ A. sqrt(x) by Newton Iteration This formula has one division fewer than the one above; however, it requires more multiplications and additions. Also x must be scaled in advance to avoid spurious overflow in evaluating the - expression 3y*y+x. Hence it is not recommended uless division + expression 3y*y+x. Hence it is not recommended unless division is slow. If division is very slow, then one should use the reciproot algorithm given in section B. diff --git a/src/libm/k_rem_pio2.c b/src/libm/k_rem_pio2.c index 29dd9f3753..c82f0c5b06 100644 --- a/src/libm/k_rem_pio2.c +++ b/src/libm/k_rem_pio2.c @@ -41,7 +41,7 @@ * z = (z-x[i])*2**24 * * - * y[] ouput result in an array of double precision numbers. + * y[] output result in an array of double precision numbers. * The dimension of y[] is: * 24-bit precision 1 * 53-bit precision 2 diff --git a/src/stdlib/SDL_malloc.c b/src/stdlib/SDL_malloc.c index 5fb7c1c9b0..4ee7ae8e65 100644 --- a/src/stdlib/SDL_malloc.c +++ b/src/stdlib/SDL_malloc.c @@ -1722,7 +1722,7 @@ SDL_FORCE_INLINE void* win32direct_mmap(size_t size) { return (ptr != 0)? ptr: MFAIL; } -/* This function supports releasing coalesed segments */ +/* This function supports releasing coalesced segments */ SDL_FORCE_INLINE int win32munmap(void* ptr, size_t size) { MEMORY_BASIC_INFORMATION minfo; char* cptr = (char*)ptr; @@ -1810,7 +1810,7 @@ SDL_FORCE_INLINE int win32munmap(void* ptr, size_t size) { #define CALL_MREMAP(addr, osz, nsz, mv) MFAIL #endif /* HAVE_MMAP && HAVE_MREMAP */ -/* mstate bit set if continguous morecore disabled or failed */ +/* mstate bit set if contiguous morecore disabled or failed */ #define USE_NONCONTIGUOUS_BIT (4U) /* segment bit set in create_mspace_with_base */ @@ -4725,7 +4725,7 @@ void* dlmalloc(size_t bytes) { void dlfree(void* mem) { /* - Consolidate freed chunks with preceeding or succeeding bordering + Consolidate freed chunks with preceding or succeeding bordering free chunks, if they exist, and then place in a bin. Intermixed with special cases for top, dv, mmapped chunks, and usage errors. */ @@ -6259,10 +6259,10 @@ History: Wolfram Gloger (Gloger@lrz.uni-muenchen.de). * Use last_remainder in more cases. * Pack bins using idea from colin@nyx10.cs.du.edu - * Use ordered bins instead of best-fit threshhold + * Use ordered bins instead of best-fit threshold * Eliminate block-local decls to simplify tracing and debugging. * Support another case of realloc via move into top - * Fix error occuring when initial sbrk_base not word-aligned. + * Fix error occurring when initial sbrk_base not word-aligned. * Rely on page size for units instead of SBRK_UNIT to avoid surprises about sbrk alignment conventions. * Add mallinfo, mallopt. Thanks to Raymond Nijssen diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index c8efbe3398..1c0e281c9e 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -725,7 +725,7 @@ bool SDL_VideoInit(const char *driver_name) but most things using SDL are games or media players; you wouldn't want a screensaver to trigger if you're playing exclusively with a joystick, or passively watching a movie. Things that use SDL but - function more like a normal desktop app should explicitly reenable the + function more like a normal desktop app should explicitly re-enable the screensaver. */ if (!SDL_GetHintBoolean(SDL_HINT_VIDEO_ALLOW_SCREENSAVER, false)) { SDL_DisableScreenSaver(); diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m index 1f7404d310..b63deb5ff9 100644 --- a/src/video/cocoa/SDL_cocoawindow.m +++ b/src/video/cocoa/SDL_cocoawindow.m @@ -1560,7 +1560,7 @@ static NSCursor *Cocoa_GetDesiredCursor(void) [self addPendingWindowOperation:PENDING_OPERATION_ENTER_FULLSCREEN]; [nswindow miniaturize:nil]; } else { - // Adjust the fullscreen toggle button and readd menu now that we're here. + // Adjust the fullscreen toggle button and re-add menu now that we're here. if (window->flags & SDL_WINDOW_RESIZABLE) { // resizable windows are Spaces-friendly: they get the "go fullscreen" toggle button on their titlebar. [nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; diff --git a/src/video/miniz.h b/src/video/miniz.h index c180c4d056..b5958527de 100644 --- a/src/video/miniz.h +++ b/src/video/miniz.h @@ -9,7 +9,7 @@ * Change History 10/13/13 v1.15 r4 - Interim bugfix release while I work on the next major release with Zip64 support (almost there!): - Critical fix for the MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY bug (thanks kahmyong.moon@hp.com) which could cause locate files to not find files. This bug - would only have occured in earlier versions if you explicitly used this flag, OR if you used mz_zip_extract_archive_file_to_heap() or mz_zip_add_mem_to_archive_file_in_place() + would only have occurred in earlier versions if you explicitly used this flag, OR if you used mz_zip_extract_archive_file_to_heap() or mz_zip_add_mem_to_archive_file_in_place() (which used this flag). If you can't switch to v1.15 but want to fix this bug, just remove the uses of this flag from both helper funcs (and of course don't use the flag). - Bugfix in mz_zip_reader_extract_to_mem_no_alloc() from kymoon when pUser_read_buf is not NULL and compressed size is > uncompressed size - Fixing mz_zip_reader_extract_*() funcs so they don't try to extract compressed data from directory entries, to account for weird zipfiles which contain zero-size compressed data on dir entries. diff --git a/src/video/stb_image.h b/src/video/stb_image.h index 87b9970e57..0283ce72e4 100644 --- a/src/video/stb_image.h +++ b/src/video/stb_image.h @@ -2318,7 +2318,7 @@ stbi_inline static int stbi__extend_receive(stbi__jpeg *j, int n) unsigned int k; int sgn; if (j->code_bits < n) stbi__grow_buffer_unsafe(j); - if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing + if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s instead of continuing sgn = j->code_buffer >> 31; // sign bit always in MSB; 0 if MSB clear (positive), 1 if MSB set (negative) k = stbi_lrot(j->code_buffer, n); @@ -2333,7 +2333,7 @@ stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n) { unsigned int k; if (j->code_bits < n) stbi__grow_buffer_unsafe(j); - if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing + if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s instead of continuing k = stbi_lrot(j->code_buffer, n); j->code_buffer = k & ~stbi__bmask[n]; k &= stbi__bmask[n]; @@ -2345,7 +2345,7 @@ stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j) { unsigned int k; if (j->code_bits < 1) stbi__grow_buffer_unsafe(j); - if (j->code_bits < 1) return 0; // ran out of bits from stream, return 0s intead of continuing + if (j->code_bits < 1) return 0; // ran out of bits from stream, return 0s instead of continuing k = j->code_buffer; j->code_buffer <<= 1; --j->code_bits; @@ -5193,7 +5193,7 @@ static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int p = (stbi_uc *) stbi__malloc_mad2(pixel_count, pal_img_n, 0); if (p == NULL) return stbi__err("outofmem", "Out of memory"); - // between here and free(out) below, exitting would leak + // between here and free(out) below, exiting would leak temp_out = p; if (pal_img_n == 3) { @@ -7107,7 +7107,7 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i // 0: not specified. } - // background is what out is after the undoing of the previou frame; + // background is what out is after the undoing of the previous frame; memcpy( g->background, g->out, 4 * g->w * g->h ); } @@ -8147,7 +8147,7 @@ STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *c, void *user 1.31 (2011-06-20) a few more leak fixes, bug in PNG handling (SpartanJ) 1.30 (2011-06-11) - added ability to load files via callbacks to accomidate custom input streams (Ben Wenger) + added ability to load files via callbacks to accommodate custom input streams (Ben Wenger) removed deprecated format-specific test/load functions removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha) diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h index 4628f361ae..3b471ac934 100644 --- a/src/video/wayland/SDL_waylandsym.h +++ b/src/video/wayland/SDL_waylandsym.h @@ -84,7 +84,7 @@ SDL_WAYLAND_SYM(const char * const *, wl_proxy_get_tag, (struct wl_proxy *)) * non-optional when we are compiling against Wayland 1.20. We don't * explicitly call them ourselves, though, so if we are only compiling * against Wayland 1.18, they're unnecessary. */ -SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...)) +SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, uint32_t flags, ...)) SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, uint32_t flags, union wl_argument *args)) #endif diff --git a/src/video/x11/edid.h b/src/video/x11/edid.h index 4581291896..5b94b4cc5d 100644 --- a/src/video/x11/edid.h +++ b/src/video/x11/edid.h @@ -146,7 +146,7 @@ struct MonitorInfo int width_mm; // -1 if not specified int height_mm; // -1 if not specified - double aspect_ratio; // -1.0 if not specififed + double aspect_ratio; // -1.0 if not specified double gamma; // -1.0 if not specified diff --git a/src/video/yuv2rgb/yuv_rgb.h b/src/video/yuv2rgb/yuv_rgb.h index c3593168f8..cca9435dde 100644 --- a/src/video/yuv2rgb/yuv_rgb.h +++ b/src/video/yuv2rgb/yuv_rgb.h @@ -17,7 +17,7 @@ // is suboptimal for image quality, but by far the fastest method. // For all methods, width and height should be even, if not, the last row/column of the result image won't be affected. -// For sse methods, if the width if not divisable by 32, the last (width%32) pixels of each line won't be affected. +// For sse methods, if the width if not divisible by 32, the last (width%32) pixels of each line won't be affected. /*#include */ diff --git a/src/video/yuv2rgb/yuv_rgb_sse.h b/src/video/yuv2rgb/yuv_rgb_sse.h index bfad8564ac..d30bafeb3e 100644 --- a/src/video/yuv2rgb/yuv_rgb_sse.h +++ b/src/video/yuv2rgb/yuv_rgb_sse.h @@ -3,7 +3,7 @@ #include "yuv_rgb_common.h" // yuv to rgb, sse implementation -// pointers must be 16 byte aligned, and strides must be divisable by 16 +// pointers must be 16 byte aligned, and strides must be divisible by 16 void yuv420_rgb565_sse( uint32_t width, uint32_t height, const uint8_t *y, const uint8_t *u, const uint8_t *v, uint32_t y_stride, uint32_t uv_stride, diff --git a/src/video/yuv2rgb/yuv_rgb_std.h b/src/video/yuv2rgb/yuv_rgb_std.h index c9f856ba98..945837844c 100644 --- a/src/video/yuv2rgb/yuv_rgb_std.h +++ b/src/video/yuv2rgb/yuv_rgb_std.h @@ -14,7 +14,7 @@ // is suboptimal for image quality, but by far the fastest method. // For all methods, width and height should be even, if not, the last row/column of the result image won't be affected. -// For sse methods, if the width if not divisable by 32, the last (width%32) pixels of each line won't be affected. +// For sse methods, if the width if not divisible by 32, the last (width%32) pixels of each line won't be affected. /*#include */ diff --git a/test/testautomation_surface.c b/test/testautomation_surface.c index 6061cf0c49..3c7dc92cea 100644 --- a/test/testautomation_surface.c +++ b/test/testautomation_surface.c @@ -1118,7 +1118,7 @@ static int SDLCALL surface_testCompleteSurfaceConversion(void *arg) */ static int SDLCALL surface_testLoadFailure(void *arg) { - SDL_Surface *face = SDL_LoadBMP("nonexistant.bmp"); + SDL_Surface *face = SDL_LoadBMP("nonexistent.bmp"); SDLTest_AssertCheck(face == NULL, "SDL_CreateLoadBmp"); return TEST_COMPLETED; diff --git a/test/testcolorspace.c b/test/testcolorspace.c index 63770da6f3..5c28e1e6db 100644 --- a/test/testcolorspace.c +++ b/test/testcolorspace.c @@ -192,7 +192,7 @@ static void RenderClearBackground(void) SDL_SetRenderDrawColor(renderer, 128, 128, 128, 255); SDL_RenderClear(renderer); - /* Check the renderered pixels */ + /* Check the rendered pixels */ SDL_Color c; if (!ReadPixel(0, 0, &c)) { return; @@ -220,7 +220,7 @@ static void RenderDrawBackground(void) SDL_SetRenderDrawColor(renderer, 128, 128, 128, 255); SDL_RenderFillRect(renderer, NULL); - /* Check the renderered pixels */ + /* Check the rendered pixels */ SDL_Color c; if (!ReadPixel(0, 0, &c)) { return; @@ -269,7 +269,7 @@ static void RenderTextureBackground(void) SDL_RenderTexture(renderer, texture, NULL, NULL); SDL_DestroyTexture(texture); - /* Check the renderered pixels */ + /* Check the rendered pixels */ SDL_Color c; if (!ReadPixel(0, 0, &c)) { return; @@ -307,7 +307,7 @@ static void RenderTargetBackground(void) SDL_RenderTexture(renderer, target, NULL, NULL); SDL_DestroyTexture(target); - /* Check the renderered pixels */ + /* Check the rendered pixels */ SDL_Color c; if (!ReadPixel(0, 0, &c)) { return; diff --git a/test/testhaptic.c b/test/testhaptic.c index 304ef677e4..394c6a54ca 100644 --- a/test/testhaptic.c +++ b/test/testhaptic.c @@ -142,7 +142,7 @@ int main(int argc, char **argv) efx[nefx].type = SDL_HAPTIC_SINE; efx[nefx].periodic.period = 1000; efx[nefx].periodic.magnitude = -0x2000; /* Negative magnitude and ... */ - efx[nefx].periodic.phase = 18000; /* ... 180 degrees phase shift => cancel eachother */ + efx[nefx].periodic.phase = 18000; /* ... 180 degrees phase shift => cancel each other */ efx[nefx].periodic.length = 5000; efx[nefx].periodic.attack_length = 1000; efx[nefx].periodic.fade_length = 1000; diff --git a/test/testmessage.c b/test/testmessage.c index 660fdb3eba..33194dcb70 100644 --- a/test/testmessage.c +++ b/test/testmessage.c @@ -228,7 +228,7 @@ int main(int argc, char *argv[]) } success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, - "Cyrillic (Ukranian)", + "Cyrillic (Ukrainian)", "Для запису людської мови використовуються системи письма.", NULL); if (!success) { diff --git a/wayland-protocols/wayland.xml b/wayland-protocols/wayland.xml index bee74a1008..15cb32e244 100644 --- a/wayland-protocols/wayland.xml +++ b/wayland-protocols/wayland.xml @@ -1511,7 +1511,7 @@ Destroying the wl_buffer after wl_buffer.release does not change the surface contents. Destroying the wl_buffer before wl_buffer.release - is allowed as long as the underlying buffer storage isn't re-used (this + is allowed as long as the underlying buffer storage isn't reused (this can happen e.g. on client process termination). However, if the client destroys the wl_buffer before receiving the wl_buffer.release event and mutates the underlying buffer storage, the surface contents become @@ -2003,8 +2003,8 @@ before announcing capabilities. This event only sent once per seat object, and the name does not change over the lifetime of the wl_seat global. - Compositors may re-use the same seat name if the wl_seat global is - destroyed and re-created later. + Compositors may reuse the same seat name if the wl_seat global is + destroyed and recreated later. @@ -2972,8 +2972,8 @@ only sent once per output object, and the name does not change over the lifetime of the wl_output global. - Compositors may re-use the same output name if the wl_output global is - destroyed and re-created later. Compositors should avoid re-using the + Compositors may reuse the same output name if the wl_output global is + destroyed and recreated later. Compositors should avoid reusing the same name if possible. The name event will be followed by a done event. @@ -3288,7 +3288,7 @@ The compositor will emit a wl_display.delete_id event with the object ID of the registry and will no longer emit any events on the registry. The - client should re-use the object ID once it receives the + client should reuse the object ID once it receives the wl_display.delete_id event.