diff --git a/.devcontainer/__lv_conf.h__ b/.devcontainer/__lv_conf.h__ index 1e1c192ed..8eedcfd16 100644 --- a/.devcontainer/__lv_conf.h__ +++ b/.devcontainer/__lv_conf.h__ @@ -355,7 +355,7 @@ #define LV_ATTRIBUTE_FAST_MEM /*Export integer constant to binding. This macro is used with constants in the form of LV_ that - *should also appear on LVGL binding API such as Micropython.*/ + *should also appear on LVGL binding API such as MicroPython.*/ #define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning /*The default value just prevents GCC warning*/ /*Prefix all global extern data with this*/ @@ -460,7 +460,7 @@ #endif /*Enable Arabic/Persian processing - *In these languages characters should be replaced with an other form based on their position in the text*/ + *In these languages characters should be replaced with another form based on their position in the text*/ #define LV_USE_ARABIC_PERSIAN_CHARS 0 /*================== @@ -796,7 +796,7 @@ #define LV_USE_IME_PINYIN 1 #if LV_USE_IME_PINYIN /*1: Use default thesaurus*/ - /*If you do not use the default thesaurus, be sure to use `lv_ime_pinyin` after setting the thesauruss*/ + /*If you do not use the default thesaurus, be sure to use `lv_ime_pinyin` after setting the thesaurus*/ #define LV_IME_PINYIN_USE_DEFAULT_DICT 1 /*Set the maximum number of candidate panels that can be displayed*/ /*This needs to be adjusted according to the size of the screen*/ @@ -838,7 +838,7 @@ #define LV_USE_X11 0 #if LV_USE_X11 #define LV_X11_DIRECT_EXIT 1 /*Exit the application when all X11 windows have been closed*/ - #define LV_X11_DOUBLE_BUFFER 1 /*Use double buffers for endering*/ + #define LV_X11_DOUBLE_BUFFER 1 /*Use double buffers for rendering*/ /*select only 1 of the following render modes (LV_X11_RENDER_MODE_PARTIAL preferred!)*/ #define LV_X11_RENDER_MODE_PARTIAL 1 /*Partial render mode (preferred)*/ #define LV_X11_RENDER_MODE_DIRECT 0 /*direct render mode*/ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index bf4fd5c30..e1edf57c4 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -12,7 +12,7 @@ "vscode": { // Add the IDs of extensions you want installed when the container is created. "extensions": [ - //"searking.preview-vscode" + //"searKing.preview-vscode" "analytic-signal.preview-html" ] } diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 48498d188..088fa54ef 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -7,7 +7,7 @@ body: attributes: value: > Be sure to read the - [FAQ](https://docs.lvgl.io/master/intro/index.html#faq), and the realted + [FAQ](https://docs.lvgl.io/master/intro/index.html#faq), and the related part of the [Documentation](https://docs.lvgl.io/) first. - type: input id: version diff --git a/.github/workflows/build_micropython.yml b/.github/workflows/build_micropython.yml index a3b184dca..52b284e79 100644 --- a/.github/workflows/build_micropython.yml +++ b/.github/workflows/build_micropython.yml @@ -1,4 +1,4 @@ -name: Micropython CI +name: MicroPython CI on: push: diff --git a/Kconfig b/Kconfig index 3fa162c96..a69c1672e 100644 --- a/Kconfig +++ b/Kconfig @@ -918,7 +918,7 @@ menu "LVGL configuration" bool "Enable Arabic/Persian processing" help In these languages characters should be replaced with - an other form based on their position in the text. + another form based on their position in the text. endmenu menu "Widget Usage" @@ -1207,7 +1207,7 @@ menu "LVGL configuration" bool "GIF decoder library" config LV_GIF_CACHE_DECODE_DATA - bool "Use extra 16KB RAM to cache decoded data to accerlate" + bool "Use extra 16KB RAM to cache decoded data to accelerate" depends on LV_USE_GIF config LV_BIN_DECODER_RAM_LOAD @@ -1401,7 +1401,7 @@ menu "LVGL configuration" depends on LV_USE_IME_PINYIN default y help - If you do not use the default thesaurus, be sure to use lv_ime_pinyin after setting the thesauruss + If you do not use the default thesaurus, be sure to use lv_ime_pinyin after setting the thesaurus config LV_IME_PINYIN_CAND_TEXT_NUM int "Maximum number of candidate panels" depends on LV_USE_IME_PINYIN diff --git a/README.md b/README.md index 2cf12e9c2..aa42b9145 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Our team is ready to help you with graphics design, UI implementation and consul - [Multiple display](https://docs.lvgl.io/master/overview/display.html#multiple-display-support) support. **Binding and Build Support** - - [Micropython Binding](https://blog.lvgl.io/2019-02-20/micropython-bindings) exposes LVGL API + - [MicroPython Binding](https://blog.lvgl.io/2019-02-20/micropython-bindings) exposes LVGL API - [PikaScript Binding](https://blog.lvgl.io/2022-08-24/pikascript-and-lvgl) python on MCU lighter and easier. - No custom build system is used. You can build LVGL as you build the other files of your project. - Support for Make and [CMake](https://docs.lvgl.io/master/integration/building/cmake.html) is included out of the box. diff --git a/demos/benchmark/lv_demo_benchmark.h b/demos/benchmark/lv_demo_benchmark.h index 550c6843d..d1c6e7c61 100644 --- a/demos/benchmark/lv_demo_benchmark.h +++ b/demos/benchmark/lv_demo_benchmark.h @@ -45,7 +45,7 @@ extern "C" { * but simply the time difference between the start and end of the rendering is measured * * - Flush time: It's the sum of - * - the time spent in the `fluch_cb` and + * - the time spent in the `flush_cb` and * - the time spent with waiting for flush ready. */ void lv_demo_benchmark(void); diff --git a/demos/music/README.md b/demos/music/README.md index 918ddc5f0..c95aef7ec 100644 --- a/demos/music/README.md +++ b/demos/music/README.md @@ -23,5 +23,5 @@ The music player demo shows what kind of modern, smartphone-like user interfaces ## Using spectrum.py - install `librosa` with `pip3 install librosa` -- run `python sectrum.py my_file.mp3` +- run `python spectrum.py my_file.mp3` - see the result in `spectrum.h` diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 61f0bf3f3..667e73382 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -95,7 +95,7 @@ Fixes - **fix(x11): fix assert on delete** `5799 `__ - **fix(demo_music): fix the previous button in the music demo is not clickable** `5808 `__ - **fix(draw): fix non antialiased rgb565a8 transformation** `5782 `__ -- **fix(freetpye): fix the problem of incomplete font drawing when setting with italic** `5807 `__ +- **fix(freetype): fix the problem of incomplete font drawing when setting with italic** `5807 `__ - **fix(fsdrv): add missing lv_fs_littlefs_init function declaration** `5778 `__ - **fix(vg_lite):fix bug for wrong rendering in vertical or horizontal dir** `5789 `__ - **fix(env): added *.cpp glob in ESP configuration** `5761 `__ @@ -120,7 +120,7 @@ Fixes - **fix(vg_lite): fix the loss of display accuracy of rounded rectangles** `5714 `__ - **fix(test): check compiler flag should not contain '_'** `5706 `__ - **fix(imagebutton): fix the example** `5719 `__ -- **fix(drm): eliminate use of non-existent lv_api_map.h and enable smoke tests** `5694 `__ +- **fix(drm): eliminate use of nonexistent lv_api_map.h and enable smoke tests** `5694 `__ - **fix(test): enable -Wpedantic** `5676 `__ - **fix(pxp): fix issues in pxp cache management callback** `5685 `__ - **fix(windows): improve graphic performance via using high resolution tick count and timer delay implementation** `5711 `__ @@ -198,7 +198,7 @@ Fixes - **fix(lvgl.mk): fix vg_lite_tvg.cpp not compiling** `5435 `__ - **fix(ci): use the dev branch of PlatformIO** `5432 `__ - **fix(vector) : add path bounding and matrix transform functions.** `5389 `__ -- **fix(warning): fix shadown variable warning** `47750f1 `__ +- **fix(warning): fix shadow variable warning** `47750f1 `__ - **fix(thorvg): link lvgl_thorvgl with lvgl** `9b09182 `__ - **fix(warning): error: no newline at end of file** `9a6a194 `__ - **fix(color): treat RGB565A8 bpp same as RGB565** `52426ec `__ diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst index c868a503d..092529f28 100644 --- a/docs/CONTRIBUTING.rst +++ b/docs/CONTRIBUTING.rst @@ -218,4 +218,4 @@ Use GPL licensed code ^^^^^^^^^^^^^^^^^^^^^ The GPL license is not compatible with the MIT license. Therefore, LVGL -can not accept GPL licensed code. +cannot accept GPL licensed code. diff --git a/docs/Doxyfile b/docs/Doxyfile index 7f4f4cdc8..f9db29cae 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -204,7 +204,7 @@ QT_AUTOBRIEF = NO # tag to YES if you prefer the old behavior instead. # # Note that setting this tag to YES also means that rational rose comments are -# not recognized any more. +# not recognized anymore. # The default value is: NO. MULTILINE_CPP_IS_BRIEF = NO @@ -278,7 +278,7 @@ OPTIMIZE_OUTPUT_VHDL = NO # parses. With this tag you can assign which parser to use for a given # extension. Doxygen has a built-in mapping, but you can override or extend it # using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# language is one of the parsers supported by doxygen: IDL, Java, JavaScript, # C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: # FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: # Fortran. In the later case the parser tries to guess whether the code is fixed @@ -520,7 +520,7 @@ INTERNAL_DOCS = YES # If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file # names in lower-case letters. If set to YES, upper-case letters are also # allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows +# in case and if your file system supports case-sensitive file names. Windows # and Mac users are advised to set this option to NO. # The default value is: system dependent. @@ -685,7 +685,7 @@ SHOW_NAMESPACES = YES # The FILE_VERSION_FILTER tag can be used to specify a program or script that # doxygen should invoke to get the current version for each file (typically from # the version control system). Doxygen will invoke the program by executing (via -# popen()) the command command input-file, where command is the value of the +# popen()) the command input-file, where command is the value of the # FILE_VERSION_FILTER tag, and input-file is the name of an input file provided # by doxygen. Whatever the program writes to standard output is used as the file # version. For an example see the documentation. @@ -1487,7 +1487,7 @@ FORMULA_FONTSIZE = 10 # FORMULA_TRANSPARENT = YES **OBSOLETE** # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# http://www.mathjax.org) which uses client side JavaScript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1557,7 +1557,7 @@ MATHJAX_CODEFILE = SEARCHENGINE = YES # When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a web server instead of a web client using Javascript. There +# implemented using a web server instead of a web client using JavaScript. There # are two flavors of web server based searching depending on the EXTERNAL_SEARCH # setting. When disabled, doxygen will generate a PHP script for searching and # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing diff --git a/docs/README_jp.rst b/docs/README_jp.rst index 558d66c59..4f5b601f9 100644 --- a/docs/README_jp.rst +++ b/docs/README_jp.rst @@ -60,7 +60,7 @@ LVGL のシステム要件は、RAM 32KB、Flash **UIエディタ**\ SquareLine Studio は、LVGL用のプロフェッショナル＆リーズナブルなドラッグ＆ドロップ型のUIエディターです。 -Windows、Linux、MacOS +Windows、Linux、macOS で動作し、ウェブサイトへの登録なしで試すことができます。 **サービス**\ LVGL LLC @@ -103,7 +103,7 @@ Guide `__ 対応。 -**Binding と Build をサポート** - `Micropython +**Binding と Build をサポート** - `MicroPython Binding `__ が LVGL API を公開。 - カスタムビルドシステムは使用せず、プロジェクトの他のファイルをビルドするときに、LVGLをビルド可能。 diff --git a/docs/README_zh.rst b/docs/README_zh.rst index 77932281e..4c7792796 100644 --- a/docs/README_zh.rst +++ b/docs/README_zh.rst @@ -94,7 +94,7 @@ RAM 和 128 KB Flash、C 编译器、帧缓冲区和至少 1/10 屏幕大小的 **绑定和构建支持** -- `Microython 绑定 `__ +- `MicroPython 绑定 `__ 公开 LVGL的API - `PikaScript 绑定 `__ 在 MCU 上的更轻更简单的 Python 版本 diff --git a/docs/ROADMAP.rst b/docs/ROADMAP.rst index 28a37afb8..c5bab1e95 100644 --- a/docs/ROADMAP.rst +++ b/docs/ROADMAP.rst @@ -133,7 +133,7 @@ Drawing and rendering - |uncheck| Multiple shadow/border - |uncheck| Perspective - |uncheck| Text shadow -- |uncheck| Innter shadow +- |uncheck| Inner shadow - |uncheck| ARGB image stroke/grow on the alpha map - |uncheck| Real time blur diff --git a/docs/build.py b/docs/build.py index 65955edf9..d99c88e7c 100755 --- a/docs/build.py +++ b/docs/build.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # **************************************************************************** -# IMPOTRANT: If you are getting a lexer error for an example you need to check +# IMPORTANT: If you are getting a lexer error for an example you need to check # for extra lines at the end of the file. Only a single empty line # is allowed!!! Ask me how long it took me to figure this out # **************************************************************************** @@ -18,7 +18,7 @@ import config_builder import add_translation # due to the modifications that take place to the documentation files -# when the documentaation builds it is better to copy the source files to a +# when the documentation builds it is better to copy the source files to a # temporary folder and modify the copies. Not setting it up this way makes it # a real headache when making alterations that need to be committed as the # alterations trigger the files as changed. diff --git a/docs/get-started/quick-overview.rst b/docs/get-started/quick-overview.rst index dd737814c..01dbf6c7c 100644 --- a/docs/get-started/quick-overview.rst +++ b/docs/get-started/quick-overview.rst @@ -345,7 +345,7 @@ Examples .. _quick-overview_micropython: -Micropython +MicroPython ----------- Learn more about :ref:`micropython`. diff --git a/docs/integration/bindings/micropython.rst b/docs/integration/bindings/micropython.rst index d36e52488..a0584bb03 100644 --- a/docs/integration/bindings/micropython.rst +++ b/docs/integration/bindings/micropython.rst @@ -1,18 +1,18 @@ .. _micropython: =========== -Micropython +MicroPython =========== -What is Micropython? +What is MicroPython? -------------------- -`Micropython `__ is Python for -microcontrollers. Using Micropython, you can write Python3 code and run +`MicroPython `__ is Python for +microcontrollers. Using MicroPython, you can write Python3 code and run it even on a bare metal architecture with limited resources. -Highlights of Micropython +Highlights of MicroPython ~~~~~~~~~~~~~~~~~~~~~~~~~ - **Compact**: Fits and runs within just 256k of code space and 16k of RAM. No OS is needed, although you @@ -34,25 +34,25 @@ Highlights of Micropython -------------- -Why Micropython + LVGL? +Why MicroPython + LVGL? ----------------------- -Micropython `does not have a good native high-level GUI library `__. +MicroPython `does not have a good native high-level GUI library `__. LVGL is an `Object-Oriented Component Based `__ high-level GUI library, which seems to be a natural candidate to map into a higher level language, such as Python. LVGL is implemented in C and its APIs are in C. -Here are some advantages of using LVGL in Micropython: +Here are some advantages of using LVGL in MicroPython: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Develop GUI in Python, a very popular high level language. Use paradigms such as Object-Oriented Programming. - Usually, GUI development requires multiple iterations to get things right. With C, each iteration consists of - **``Change code`` > ``Build`` > ``Flash`` > ``Run``**. In Micropython it's just + **``Change code`` > ``Build`` > ``Flash`` > ``Run``**. In MicroPython it's just **``Change code`` > ``Run``** ! You can even run commands interactively using the `REPL `__ (the interactive prompt) -Micropython + LVGL could be used for: +MicroPython + LVGL could be used for: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Fast prototyping GUI. @@ -100,20 +100,20 @@ How can I use it? Online Simulator ~~~~~~~~~~~~~~~~ -If you want to experiment with LVGL + Micropython without downloading +If you want to experiment with LVGL + MicroPython without downloading anything - you can use our online simulator! It's a fully functional -LVGL + Micropython that runs entirely in the browser and allows you to +LVGL + MicroPython that runs entirely in the browser and allows you to edit a python script and run it. `Click here to experiment on the online simulator `__ -Many `LVGL examples `__ are available also for Micropython. Just click the link! +Many `LVGL examples `__ are available also for MicroPython. Just click the link! PC Simulator ~~~~~~~~~~~~ -Micropython is ported to many platforms. One notable port is "unix", which allows you to build and run Micropython +MicroPython is ported to many platforms. One notable port is "unix", which allows you to build and run MicroPython (+LVGL) on a Linux machine. (On a Windows machine you might need Virtual Box or WSL or MinGW or Cygwin etc.) `Click here to know more information about building and running the unix port `__ @@ -122,13 +122,13 @@ Micropython is ported to many platforms. One notable port is "unix", which allow Embedded Platforms ~~~~~~~~~~~~~~~~~~ -In the end, the goal is to run it all on an embedded platform. Both Micropython and LVGL can be used on many embedded -architectures. `lv_micropython `__ is a fork of Micropython+LVGL and currently -supports Linux, ESP32, STM32 and RP2. It can be ported to any other platform supported by Micropython. +In the end, the goal is to run it all on an embedded platform. Both MicroPython and LVGL can be used on many embedded +architectures. `lv_micropython `__ is a fork of MicroPython+LVGL and currently +supports Linux, ESP32, STM32 and RP2. It can be ported to any other platform supported by MicroPython. - You would also need display and input drivers. You can either use one of the existing drivers provided with lv_micropython, or you can create your own input/display drivers for your specific hardware. -- Drivers can be implemented either in C as a Micropython module, or in pure Python! +- Drivers can be implemented either in C as a MicroPython module, or in pure Python! lv_micropython already contains these drivers: @@ -165,17 +165,17 @@ Where can I find more information? - ``lv_micropython`` `README `__ - ``lv_binding_micropython`` `README `__ - The `LVGL micropython forum `__ (Feel free to ask anything!) -- At Micropython: `docs `__ and `forum `__ +- At MicroPython: `docs `__ and `forum `__ - `Blog Post `__, a little outdated. -The Micropython Binding is auto generated! +The MicroPython Binding is auto generated! ------------------------------------------ - LVGL is a git submodule inside `lv_micropython `__ (LVGL is a git submodule of `lv_binding_micropython `__ which is itself a submodule of `lv_micropython `__). -- When building lv_micropython, the public LVGL C API is scanned and Micropython API is auto-generated. That means that +- When building lv_micropython, the public LVGL C API is scanned and MicroPython API is auto-generated. That means that lv_micropython provides LVGL API for **any** LVGL version, and generally does not require code changes as LVGL evolves. @@ -189,7 +189,7 @@ For a summary of coding conventions to follow see the :ref:`coding-style`. Memory Management ~~~~~~~~~~~~~~~~~ -| When LVGL runs in Micropython, all dynamic memory allocations (:cpp:func:`lv_malloc`) are handled by Micropython's memory +| When LVGL runs in MicroPython, all dynamic memory allocations (:cpp:func:`lv_malloc`) are handled by MicroPython's memory manager which is `garbage-collected `__ (GC). | To prevent GC from collecting memory prematurely, all dynamic allocated RAM must be reachable by GC. | GC is aware of most allocations, except from pointers on the `Data Segment `__: @@ -230,18 +230,18 @@ More Information Callbacks ~~~~~~~~~ -In C a callback is just a function pointer. But in Micropython we need to register a *Micropython callable object* for each -callback. Therefore in the Micropython binding we need to register both a function pointer and a Micropython object for every callback. +In C a callback is just a function pointer. But in MicroPython we need to register a *MicroPython callable object* for each +callback. Therefore in the MicroPython binding we need to register both a function pointer and a MicroPython object for every callback. Therefore we defined a **callback convention** for the LVGL C API that expects lvgl headers to be defined in a certain -way. Callbacks that are declared according to the convention would allow the binding to register a Micropython object +way. Callbacks that are declared according to the convention would allow the binding to register a MicroPython object next to the function pointer when registering a callback, and access that object when the callback is called. -- The basic idea is that we have ``void * user_data`` field that is used automatically by the Micropython Binding - to save the *Micropython callable object* for a callback. This field must be provided when registering the function +- The basic idea is that we have ``void * user_data`` field that is used automatically by the MicroPython Binding + to save the *MicroPython callable object* for a callback. This field must be provided when registering the function pointer, and provided to the callback function itself. -- Although called "user_data", the user is not expected to read/write that field. Instead, the Micropython glue code uses - ``user_data`` to automatically keep track of the Micropython callable object. The glue code updates it when the callback +- Although called "user_data", the user is not expected to read/write that field. Instead, the MicroPython glue code uses + ``user_data`` to automatically keep track of the MicroPython callable object. The glue code updates it when the callback is registered, and uses it when the callback is called in order to invoke a call to the original callable object. There are a few options for defining a callback in LVGL C API: diff --git a/docs/integration/bindings/pikascript.rst b/docs/integration/bindings/pikascript.rst index 09b0ce4e4..e009e2142 100644 --- a/docs/integration/bindings/pikascript.rst +++ b/docs/integration/bindings/pikascript.rst @@ -32,10 +32,10 @@ Why PikaScript + LVGL ? ----------------------- PikaScript now supports the main features of LVGL8, and these APIs are -fully compatible with Micropython! +fully compatible with MicroPython! This means that you can continue to use already written code from -Micropython, and then use less code space and RAM. +MicroPython, and then use less code space and RAM. Enjoy detailed code hints down to the parameter type for a better programming experience diff --git a/docs/integration/building/cmake.rst b/docs/integration/building/cmake.rst index f26497ed6..c340146b9 100644 --- a/docs/integration/building/cmake.rst +++ b/docs/integration/building/cmake.rst @@ -9,8 +9,8 @@ Overview This project uses CMakePresets to ensure an easy build. Find out more on Cmake Presets here: https://cmake.org/cmake/help/latest/manual/cmake-presets.7.html -Prerequsites ------------- +Prerequisites +------------- You need to install - CMake @@ -46,7 +46,7 @@ When hitting the generate button, CMake will create solution files (for VS) or N The following targets are available. - lvgl (the actual library, required) -- lvgl_thorvg (an vector grafics extension, optional) +- lvgl_thorvg (an vector graphics extension, optional) - lvgl_examples (example usages, optional) - lvgl_demos (some demos, optional) @@ -62,7 +62,7 @@ Build with Command line ----------------------- You can also build your project using the command line. -Run the follwoing commands +Run the following commands - cmake --preset windows-base - cmake --build --preset windows-base_dbg diff --git a/docs/integration/chip/nxp.rst b/docs/integration/chip/nxp.rst index 3ca4bae39..a6a1425cf 100644 --- a/docs/integration/chip/nxp.rst +++ b/docs/integration/chip/nxp.rst @@ -351,7 +351,7 @@ Supported draw tasks are available in "src/draw/nxp/pxp/lv_draw_vglite.c": break; } -All the below opration can be done in addition with optional opacity. +All the below operation can be done in addition with optional opacity. - Fill area with color (w/ radius or gradient). - Blit source image (any format from `_vglite_src_cf_supported()`) over destination (any format from `_vglite_dest_cf_supported()`). diff --git a/docs/integration/driver/display/gen_mipi.rst b/docs/integration/driver/display/gen_mipi.rst index 86523ae73..f350292e8 100644 --- a/docs/integration/driver/display/gen_mipi.rst +++ b/docs/integration/driver/display/gen_mipi.rst @@ -7,11 +7,11 @@ Overview From the `Wikipedia `__: - `MIPI Allience `__ is a global business alliance that develops technical specifications + `MIPI Alliance `__ is a global business alliance that develops technical specifications for the mobile ecosystem, particularly smart phones but including mobile-influenced industries. MIPI was founded in 2003 by Arm, Intel, Nokia, Samsung, STMicroelectronics and Texas Instruments. -MIPI Allience published a series of specifications related to display devices, including DBI (Display Bus Interface), DSI (Display Serial Interface) and DCS +MIPI Alliance published a series of specifications related to display devices, including DBI (Display Bus Interface), DSI (Display Serial Interface) and DCS (Display Command Set). Usually when one talks about a MIPI-compatible display, one thinks of a device with a DSI serial interface. However, the Display Bus Interface specification includes a number of other, legacy interfaces, like SPI serial, or i8080-compatible parallel interface, which are often used to interface LCD displays to lower-end microcontrollers. Furthermore, the DCS specification contains a standard command set, which is supported by a large number of legacy TFT LCD controllers, including the popular Sitronix diff --git a/docs/integration/driver/display/renesas_glcdc.rst b/docs/integration/driver/display/renesas_glcdc.rst index b3d4dbd65..e609656d8 100644 --- a/docs/integration/driver/display/renesas_glcdc.rst +++ b/docs/integration/driver/display/renesas_glcdc.rst @@ -50,7 +50,8 @@ The following code demonstrates using the diver in :cpp:enumerator:`LV_DISPLAY_R lv_display_set_default(disp); To use the driver in :cpp:enumerator:`LV_DISPLAY_RENDER_MODE_PARTIAL` mode, an extra buffer must be allocated, -desirably in the fastest available memory region. +preferably in the fastest available memory region. + Buffer swapping can be activated by passing a second buffer of same size instead of the :cpp:expr:`NULL` argument. .. code:: c diff --git a/docs/integration/framework/tasmota-berry.rst b/docs/integration/framework/tasmota-berry.rst index 1072b232c..f419a9c0d 100644 --- a/docs/integration/framework/tasmota-berry.rst +++ b/docs/integration/framework/tasmota-berry.rst @@ -52,7 +52,7 @@ also introduced the Berry scripting language, a small-footprint language similar to Python and fully integrated in Tasmota. A comprehensive mapping of LVGL in Berry language is now available, -similar to the mapping of Micropython. It allows to use +98% of all LVGL +similar to the mapping of MicroPython. It allows to use +98% of all LVGL features. It is also possible to write custom widgets in Berry. Versions supported: LVGL v8.0.2, LodePNG v20201017, Freetype 2.10.4 diff --git a/docs/integration/ide/pc-simulator.rst b/docs/integration/ide/pc-simulator.rst index eedafef0f..743aae875 100644 --- a/docs/integration/ide/pc-simulator.rst +++ b/docs/integration/ide/pc-simulator.rst @@ -43,7 +43,7 @@ Built-in drivers LVGL comes with several `built-in drivers `__. Even if a simulator project comes with e.g. SDL, you can easily replace it by enabling -an other driver in ``lv_conf.h`` and calling its ``create`` function. +another driver in ``lv_conf.h`` and calling its ``create`` function. For example to use the Linux frame buffer device instead of SDL just enable ``LV_USE_LINUX_FBDEV`` and call diff --git a/docs/layouts/grid.rst b/docs/layouts/grid.rst index c56fb9759..519d8bf4a 100644 --- a/docs/layouts/grid.rst +++ b/docs/layouts/grid.rst @@ -120,7 +120,7 @@ This way even if a wrapper item is used on the grid and can be made "transparent Limitations: -- The sub grid is resolved only in one level depth. That is a grid can have a sub grid children, but a sub grid can't have an other sub grid. +- The sub grid is resolved only in one level depth. That is a grid can have a sub grid children, but a sub grid can't have another sub grid. - ``LV_GRID_CONTENT`` tracks on the are not handled in the sub grid, only in the its own grid. The sub grid feature works the same as in CSS. For further reference see `this description `__. diff --git a/docs/libs/bmp.rst b/docs/libs/bmp.rst index 98964fd84..fe24ad7fd 100644 --- a/docs/libs/bmp.rst +++ b/docs/libs/bmp.rst @@ -38,7 +38,7 @@ Limitations Use GIMP to save the image in the required format. Both RGB888 and ARGB888 works with :c:macro:`LV_COLOR_DEPTH` ``32`` - Palette is not supported. -- Because not the whole image is read in can not be zoomed or rotated. +- Because not the whole image is read in cannot be zoomed or rotated. .. _bmp_example: diff --git a/docs/libs/rlottie.rst b/docs/libs/rlottie.rst index b39be1dc4..983298acf 100644 --- a/docs/libs/rlottie.rst +++ b/docs/libs/rlottie.rst @@ -124,7 +124,7 @@ these examples: The default animation mode is **play forward with loop**. If you don't enable looping, a :cpp:enumerator:`LV_EVENT_READY` is sent when the -animation can not make more progress without looping. +animation cannot make more progress without looping. To get the number of frames in an animation or the current frame index, you can cast the :c:struct:`lv_obj_t` instance to a :c:struct:`lv_rlottie_t` instance diff --git a/docs/overview/coord.rst b/docs/overview/coord.rst index 88398154b..1ac66ed31 100644 --- a/docs/overview/coord.rst +++ b/docs/overview/coord.rst @@ -223,7 +223,7 @@ horizontally: lv_obj_align_to(label, btn, LV_ALIGN_OUT_TOP_MID, 0, -10); -Note that, unlike with :cpp:func:`lv_obj_align`, :cpp:func:`lv_obj_align_to` can not +Note that, unlike with :cpp:func:`lv_obj_align`, :cpp:func:`lv_obj_align_to` cannot realign the object if its coordinates or the reference object's coordinates change. diff --git a/docs/overview/layer.rst b/docs/overview/layer.rst index 5c4099631..62cfcf6ca 100644 --- a/docs/overview/layer.rst +++ b/docs/overview/layer.rst @@ -125,7 +125,7 @@ The following style properties trigger the creation of a "Simple layer": In this case widget will be sliced into ``LV_DRAW_SW_LAYER_SIMPLE_BUF_SIZE`` sized chunks. -If there is no memory for a new chunk, LVGL will try allocating layer when an other chunk is rendered and freed. +If there is no memory for a new chunk, LVGL will try allocating layer when another chunk is rendered and freed. Transformed layer diff --git a/docs/overview/renderers/arm2d.rst b/docs/overview/renderers/arm2d.rst index 696dc5a6a..5459054d5 100644 --- a/docs/overview/renderers/arm2d.rst +++ b/docs/overview/renderers/arm2d.rst @@ -13,7 +13,7 @@ Arm-2D accelerates LVGL9 with two modes: **Synchronous Mode** and - When Arm-2D backed 2D-GPUs are available, for example, **DMAC-350 based 2D GPUs**, it is recommend to use **Asynchronous Mode** to accelerate LVGL. -Arm-2D is an open-source project on Github. For more, please refer to: +Arm-2D is an open-source project on GitHub. For more, please refer to: https://github.com/ARM-software/Arm-2D. How to Use @@ -47,7 +47,7 @@ LVGL (sometimes worse) for regular Cortex-M processors. - The target processors support `Helium `__. - The device vendor provides an arm-2d compliant driver for their - propriotory 2D accelerators and/or ACI(Arm Customized Instruction). + proprietary 2D accelerators and/or ACI(Arm Customized Instruction). - The target device contains `DMAC-350 `__ diff --git a/docs/overview/scroll.rst b/docs/overview/scroll.rst index 9141f12d6..3425a488c 100644 --- a/docs/overview/scroll.rst +++ b/docs/overview/scroll.rst @@ -148,7 +148,7 @@ The scroll momentum can be enabled/disabled with the Elastic scroll -------------- -Normally an object can't be scrolled past the extremeties of its +Normally an object can't be scrolled past the extremities of its content. That is the top side of the content can't be below the top side of the object. diff --git a/docs/overview/style-props.md b/docs/overview/style-props.md index 89d494be4..832f9e86e 100644 --- a/docs/overview/style-props.md +++ b/docs/overview/style-props.md @@ -931,7 +931,7 @@ Defines how to align the tracks of the flow ### flex_grow -Defines how mayn space to take proprtionally the free space of the object's trach +Defines how much space to take proportionally from the free space of the object's track
  • Default `LV_FLEX_ALIGN_ROW`
  • Inherited No
    • diff --git a/docs/overview/style-props.rst b/docs/overview/style-props.rst index 8cbbd8977..0bc50fbcf 100644 --- a/docs/overview/style-props.rst +++ b/docs/overview/style-props.rst @@ -1456,7 +1456,7 @@ Defines how to align the tracks of the flow flex_grow ~~~~~~~~~ -Defines how mayn space to take proprtionally the free space of the object's trach +Defines how much space to take proportionally from the free space of the object's track .. raw:: html diff --git a/docs/overview/style.rst b/docs/overview/style.rst index f15099eb5..f5ce54bd2 100644 --- a/docs/overview/style.rst +++ b/docs/overview/style.rst @@ -205,7 +205,7 @@ Property set functions looks like this: static lv_style_t style_btn_red; lv_style_init(&style_btn_red); - lv_style_set_bg_color(&style_btn_red, lv_plaette_main(LV_PALETTE_RED)); + lv_style_set_bg_color(&style_btn_red, lv_palette_main(LV_PALETTE_RED)); lv_style_set_bg_opa(&style_btn_red, LV_OPA_COVER); To remove a property use: @@ -249,7 +249,7 @@ Styles can be built as ``const`` too to save RAM: LV_STYLE_CONST_INIT(style1, style1_props); Later ``const`` style can be used like any other style but (obviously) -new properties can not be added. +new properties cannot be added. .. _styles_add_remove: @@ -457,7 +457,7 @@ configured by the following properties in ``lv_conf.h``: - :cpp:enumerator:`LV_LAYER_SIMPLE_BUF_SIZE`: [bytes] the optimal target buffer size. LVGL will try to allocate this size of memory. - :cpp:enumerator:`LV_LAYER_SIMPLE_FALLBACK_BUF_SIZE`: [bytes] used if :cpp:enumerator:`LV_LAYER_SIMPLE_BUF_SIZE` couldn't be allocated. -If transformation properties were also used the layer can not be +If transformation properties were also used the layer cannot be rendered in chunks, but one larger memory needs to be allocated. The required memory depends on the angle, zoom and pivot parameters, and the size of the area to redraw, but it's never larger than the size of the diff --git a/docs/porting/display.rst b/docs/porting/display.rst index 0a403ec1d..fc41cd9ef 100644 --- a/docs/porting/display.rst +++ b/docs/porting/display.rst @@ -234,7 +234,7 @@ If you have multiple displays call :cpp:expr:`lv_display_set_default(disp1)` to select the display to refresh before :cpp:expr:`_lv_display_refr_timer(NULL)`. -.. note:: that :cpp:func:`lv_timer_handler` and :cpp:func:`_lv_display_refr_timer` can not run at the same time. +.. note:: that :cpp:func:`lv_timer_handler` and :cpp:func:`_lv_display_refr_timer` cannot run at the same time. If the performance monitor is enabled, the value of :c:macro:`LV_DEF_REFR_PERIOD` needs to be set to be diff --git a/docs/porting/draw.rst b/docs/porting/draw.rst index 469e7f551..bf45c7a2e 100644 --- a/docs/porting/draw.rst +++ b/docs/porting/draw.rst @@ -44,7 +44,7 @@ Dispatching While collecting draw tasks LVGL frequently tries to dispatch the collected draw tasks to the draw units. This handles via the ``dispatch_cb`` of the draw units. -If a draw unit is busy with an other draw task, it just returns. However, it is available it can take a draw task. +If a draw unit is busy with another draw task, it just returns. However, it is available it can take a draw task. :cpp:expr:`lv_draw_get_next_available_task(layer, previous_task, draw_unit_id)` is a useful helper function which returns an available draw task. "Available draw task" means that, all the draw tasks which should be drawn under a draw task diff --git a/docs/porting/indev.rst b/docs/porting/indev.rst index d18ca4efb..beb038b82 100644 --- a/docs/porting/indev.rst +++ b/docs/porting/indev.rst @@ -75,7 +75,7 @@ To get the steps in an event callback use :cpp:func:`int32_t diff = lv_event_get The rotary sensitivity can be adjusted on 2 levels: -1. In the input device by the `indev->rotary_sensitvity` element (1/256 unit) +1. In the input device by the `indev->rotary_sensitivity` element (1/256 unit) 2. By the `rotary_sensitivity` style property in the widget (1/256 unit) The final diff is calculated like this: @@ -289,7 +289,7 @@ You can do this in the following way: /*Call this anywhere you want to read the input device*/ lv_indev_read(indev); -.. note:: that :cpp:func:`lv_indev_read`, :cpp:func:`lv_timer_handler` and :cpp:func:`_lv_display_refr_timer` can not run at the same time. +.. note:: that :cpp:func:`lv_indev_read`, :cpp:func:`lv_timer_handler` and :cpp:func:`_lv_display_refr_timer` cannot run at the same time. .. note:: For devices in event-driven mode, `data->continue_reading` is ignored. diff --git a/docs/porting/os.rst b/docs/porting/os.rst index 6c68d43ee..e713799fd 100644 --- a/docs/porting/os.rst +++ b/docs/porting/os.rst @@ -27,7 +27,7 @@ LVGL has a built-in mutex which can be used with: - :cpp:func:`lv_unlock()` These functions are called internally in :cpp:func:`lv_timer_handler` -and the users need to call them only from their own therads. +and the users need to call them only from their own threads. To enable ``lv_lock/lv_unlock`` ``LV_USE_OS`` needs to be set to other than ``LV_OS_NONE``. diff --git a/docs/porting/project.rst b/docs/porting/project.rst index 2ad070622..7109eb956 100644 --- a/docs/porting/project.rst +++ b/docs/porting/project.rst @@ -44,7 +44,7 @@ For integration with CMake take a look this section of the Other platforms and tools ~~~~~~~~~~~~~~~~~~~~~~~~~ -The `Get started `__ section contains many platform +The `Get started `__ section contains many platform specific descriptions e.g. for ESP32, Arduino, NXP, RT-Thread, NuttX, etc. diff --git a/docs/widgets/label.rst b/docs/widgets/label.rst index 63681dac6..01ae6dbb3 100644 --- a/docs/widgets/label.rst +++ b/docs/widgets/label.rst @@ -133,7 +133,7 @@ Some aspects of the scrolling animations in long modes :cpp:enumerator:`LV_LABEL_LONG_SCROLL` and :cpp:enumerator:`LV_LABEL_LONG_SCROLL_CIRCULAR` can be customized by setting the animation property of a style, using :cpp:func:`lv_style_set_anim`. -It will be treated as a template which will be used to create the scroll animatins. +It will be treated as a template which will be used to create the scroll animations. .. _lv_label_symbols: diff --git a/docs/widgets/spinner.rst b/docs/widgets/spinner.rst index 486230f49..d6adb628e 100644 --- a/docs/widgets/spinner.rst +++ b/docs/widgets/spinner.rst @@ -28,7 +28,7 @@ To create a spinner use :cpp:expr:`lv_spinner_create(parent)`. Using :cpp:expr:`lv_spinner_set_anim_params(spinner, spin_duration, angle)` the duration -of one revulation and the length of he arc can be customized. +of one revolution and the length of he arc can be customized. .. _lv_spinner_events: diff --git a/env_support/cmake/micropython.cmake b/env_support/cmake/micropython.cmake index ad0ec01f9..4619ee297 100644 --- a/env_support/cmake/micropython.cmake +++ b/env_support/cmake/micropython.cmake @@ -8,7 +8,7 @@ add_library(lvgl_interface INTERFACE) # ${SOURCES} must NOT be given to add_library directly for some reason (won't be # built) target_sources(lvgl_interface INTERFACE ${SOURCES}) -# Micropython builds with -Werror; we need to suppress some warnings, such as: +# MicroPython builds with -Werror; we need to suppress some warnings, such as: # # /home/test/build/lv_micropython/ports/rp2/build-PICO/lv_mp.c:29316:16: error: # 'lv_style_transition_dsc_t_path_xcb_callback' defined but not used diff --git a/env_support/cmsis-pack/LVGL.lvgl.pdsc b/env_support/cmsis-pack/LVGL.lvgl.pdsc index f41f70f07..78cbdb2b3 100644 --- a/env_support/cmsis-pack/LVGL.lvgl.pdsc +++ b/env_support/cmsis-pack/LVGL.lvgl.pdsc @@ -99,15 +99,15 @@ - LVGL 9.0.0-dev - - Montyly update for November + - Monthly update for November - LVGL 9.0.0-dev - - Montyly update for October + - Monthly update for October - LVGL 9.0.0-dev - - Montyly update for September + - Monthly update for September - Introduce a new component: File Explorer - Add support for TTF (Tiny TTF) - Add GPU Support for GD32F450-IPA @@ -115,7 +115,7 @@ - LVGL 9.0.0-dev - Add the binding for pikascript (an ultra-light-weight python VM) - - Montyly update for August + - Monthly update for August - LVGL 9.0.0-dev @@ -171,7 +171,7 @@ Cortex-M SysTick - Performance Analaysis + Performance Analysis @@ -1814,7 +1814,7 @@ -/*! \brief enable demo:bencharmk */ +/*! \brief enable demo:benchmark */ #define LV_USE_DEMO_BENCHMARK 1 diff --git a/env_support/cmsis-pack/lv_conf_cmsis.h b/env_support/cmsis-pack/lv_conf_cmsis.h index f152f61aa..07f9ef290 100644 --- a/env_support/cmsis-pack/lv_conf_cmsis.h +++ b/env_support/cmsis-pack/lv_conf_cmsis.h @@ -380,7 +380,7 @@ #define LV_ATTRIBUTE_FAST_MEM /*Export integer constant to binding. This macro is used with constants in the form of LV_ that - *should also appear on LVGL binding API such as Micropython.*/ + *should also appear on LVGL binding API such as MicroPython.*/ #define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning /*The default value just prevents GCC warning*/ /*Prefix all global extern data with this*/ @@ -486,7 +486,7 @@ #endif /*Enable Arabic/Persian processing - *In these languages characters should be replaced with an other form based on their position in the text*/ + *In these languages characters should be replaced with another form based on their position in the text*/ #define LV_USE_ARABIC_PERSIAN_CHARS 0 /*================== @@ -790,7 +790,7 @@ /*Requires: lv_keyboard*/ #if LV_USE_IME_PINYIN /*1: Use default thesaurus*/ - /*If you do not use the default thesaurus, be sure to use `lv_ime_pinyin` after setting the thesauruss*/ + /*If you do not use the default thesaurus, be sure to use `lv_ime_pinyin` after setting the thesaurus*/ #define LV_IME_PINYIN_USE_DEFAULT_DICT 1 /*Set the maximum number of candidate panels that can be displayed*/ /*This needs to be adjusted according to the size of the screen*/ @@ -832,7 +832,7 @@ #define LV_USE_X11 0 #if LV_USE_X11 #define LV_X11_DIRECT_EXIT 1 /*Exit the application when all X11 windows have been closed*/ - #define LV_X11_DOUBLE_BUFFER 1 /*Use double buffers for endering*/ + #define LV_X11_DOUBLE_BUFFER 1 /*Use double buffers for rendering*/ /*select only 1 of the following render modes (LV_X11_RENDER_MODE_PARTIAL preferred!)*/ #define LV_X11_RENDER_MODE_PARTIAL 1 /*Partial render mode (preferred)*/ #define LV_X11_RENDER_MODE_DIRECT 0 /*direct render mode*/ diff --git a/env_support/pikascript/pika_lv_timer_t.c b/env_support/pikascript/pika_lv_timer_t.c index b0b50ebac..cea970c37 100644 --- a/env_support/pikascript/pika_lv_timer_t.c +++ b/env_support/pikascript/pika_lv_timer_t.c @@ -11,7 +11,7 @@ PikaEventListener* g_pika_lv_timer_event_listener; void __pika_timer_cb(lv_timer_t* timer) { - PikaObj* eventHandleObj = pks_eventLisener_getEventHandleObj( + PikaObj* eventHandleObj = pks_eventListener_getEventHandleObj( g_pika_lv_timer_event_listener, (uint32_t)timer); obj_newDirectObj(eventHandleObj, "timer", New_pika_lvgl_lv_timer_t); obj_setPtr(obj_getPtr(eventHandleObj, "timer"), "lv_timer", timer); @@ -30,9 +30,9 @@ void pika_lvgl_lv_timer_t_set_cb(PikaObj* self, Arg* cb) { obj_setArg(self, "eventCallBack", cb); /* init event_listener for the first time */ if (NULL == g_pika_lv_timer_event_listener) { - pks_eventLisener_init(&g_pika_lv_timer_event_listener); + pks_eventListener_init(&g_pika_lv_timer_event_listener); } - pks_eventLicener_registerEvent(g_pika_lv_timer_event_listener, + pks_eventListener_registerEvent(g_pika_lv_timer_event_listener, (uint32_t)lv_timer, self); } diff --git a/env_support/pikascript/pika_lvgl_lv_obj.c b/env_support/pikascript/pika_lvgl_lv_obj.c index 915403bb0..efda44136 100644 --- a/env_support/pikascript/pika_lvgl_lv_obj.c +++ b/env_support/pikascript/pika_lvgl_lv_obj.c @@ -50,7 +50,7 @@ void pika_lvgl_lv_obj_add_state(PikaObj* self, int state) { lv_obj_add_state(lv_obj, state); } -PikaObj* eventLisener_getHandler(PikaObj* self, uintptr_t event_id) { +PikaObj* eventListener_getHandler(PikaObj* self, uintptr_t event_id) { Args buffs = {0}; char* event_name = strsFormat(&buffs, PIKA_SPRINTF_BUFF_SIZE, "%d", event_id); @@ -63,13 +63,13 @@ PikaObj* eventLisener_getHandler(PikaObj* self, uintptr_t event_id) { static void __pika_event_cb(lv_event_t* e) { lv_obj_t* target = lv_event_get_target(e); PikaObj* event_handler = - eventLisener_getHandler(pika_lv_event_listener_g, (uintptr_t)target); + eventListener_getHandler(pika_lv_event_listener_g, (uintptr_t)target); PikaObj* evt = obj_getObj(event_handler, "_event_evt"); obj_setPtr(evt, "lv_event", e); obj_run(event_handler, "_event_cb(_event_evt)"); } -void eventLicener_registerEvent(PikaObj* self, +void eventListener_registerEvent(PikaObj* self, uintptr_t event_id, PikaObj* event_handler) { Args buffs = {0}; @@ -90,7 +90,7 @@ void pika_lvgl_lv_obj_add_event_cb(PikaObj* self, obj_setArg(self, "_event_cb", event_cb); obj_setPtr(self, "_event_user_data", user_data); obj_newDirectObj(self, "_event_evt", New_pika_lvgl_lv_event); - eventLicener_registerEvent(pika_lv_event_listener_g, (uintptr_t)lv_obj, self); + eventListener_registerEvent(pika_lv_event_listener_g, (uintptr_t)lv_obj, self); } void pika_lvgl_lv_obj_add_style(PikaObj *self, PikaObj* style, int selector){ diff --git a/examples/others/gridnav/lv_example_gridnav_3.c b/examples/others/gridnav/lv_example_gridnav_3.c index 320c8418d..e8c3dbf07 100644 --- a/examples/others/gridnav/lv_example_gridnav_3.c +++ b/examples/others/gridnav/lv_example_gridnav_3.c @@ -46,7 +46,7 @@ void lv_example_gridnav_3(void) label = lv_label_create(btn); lv_label_set_text(label, "Button 2"); - /*Create an other container with long text to show how LV_GRIDNAV_CTRL_SCROLL_FIRST works*/ + /*Create another container with long text to show how LV_GRIDNAV_CTRL_SCROLL_FIRST works*/ lv_obj_t * cont_sub1 = lv_obj_create(cont_main); lv_obj_set_size(cont_sub1, lv_pct(100), 100); @@ -65,7 +65,7 @@ void lv_example_gridnav_3(void) "Hello world!\n" "Hello world!"); - /*Create a third container that can be focused with ENTER and contains an other grid nav*/ + /*Create a third container that can be focused with ENTER and contains another grid nav*/ lv_obj_t * cont_sub2 = lv_obj_create(cont_main); lv_gridnav_add(cont_sub2, LV_GRIDNAV_CTRL_ROLLOVER); /*Only the container needs to be in a group*/ diff --git a/examples/others/observer/lv_example_observer_5.c b/examples/others/observer/lv_example_observer_5.c index 19cf0230c..47ea4eefa 100644 --- a/examples/others/observer/lv_example_observer_5.c +++ b/examples/others/observer/lv_example_observer_5.c @@ -146,7 +146,7 @@ static void download_timer_cb(lv_timer_t * t) } /** - * Emulate connection and FW dowlading by timers + * Emulate connection and FW downloading by timers */ static void fw_upload_manager_observer_cb(lv_observer_t * observer, lv_subject_t * subject) { diff --git a/examples/widgets/lottie/lv_example_lottie_1.c b/examples/widgets/lottie/lv_example_lottie_1.c index 8a7771a11..7fb781cd7 100644 --- a/examples/widgets/lottie/lv_example_lottie_1.c +++ b/examples/widgets/lottie/lv_example_lottie_1.c @@ -19,7 +19,7 @@ void lv_example_lottie_1(void) static uint8_t buf[64 * 64 * 4]; lv_lottie_set_buffer(lottie, 64, 64, buf); #else - /*For GPUs and special alignemnt/strid setting use a draw_buf instead*/ + /*For GPUs and special alignment/strid setting use a draw_buf instead*/ LV_DRAW_BUF_DEFINE(draw_buf, 64, 64, LV_COLOR_FORMAT_ARGB8888); lv_lottie_set_draw_buf(lottie, &draw_buf); #endif diff --git a/examples/widgets/lottie/lv_example_lottie_2.c b/examples/widgets/lottie/lv_example_lottie_2.c index 0f4824caf..fafa43712 100644 --- a/examples/widgets/lottie/lv_example_lottie_2.c +++ b/examples/widgets/lottie/lv_example_lottie_2.c @@ -17,7 +17,7 @@ void lv_example_lottie_2(void) static uint8_t buf[64 * 64 * 4]; lv_lottie_set_buffer(lottie, 64, 64, buf); #else - /*For GPUs and special alignemnt/strid setting use a draw_buf instead*/ + /*For GPUs and special alignment/strid setting use a draw_buf instead*/ LV_DRAW_BUF_DEFINE(draw_buf, 64, 64, LV_COLOR_FORMAT_ARGB8888); lv_lottie_set_draw_buf(lottie, &draw_buf); #endif diff --git a/examples/widgets/scale/lv_example_scale_6.c b/examples/widgets/scale/lv_example_scale_6.c index 478e4a0a9..0a5503577 100644 --- a/examples/widgets/scale/lv_example_scale_6.c +++ b/examples/widgets/scale/lv_example_scale_6.c @@ -49,7 +49,7 @@ static void timer_cb(lv_timer_t * timer) } /** - * A round scale with multiple needles, resembing a clock + * A round scale with multiple needles, resembling a clock */ void lv_example_scale_6(void) { diff --git a/lv_conf_template.h b/lv_conf_template.h index 488a770ed..8928a5559 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -424,7 +424,7 @@ #define LV_ATTRIBUTE_FAST_MEM /*Export integer constant to binding. This macro is used with constants in the form of LV_ that - *should also appear on LVGL binding API such as Micropython.*/ + *should also appear on LVGL binding API such as MicroPython.*/ #define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning /*The default value just prevents GCC warning*/ /*Prefix all global extern data with this*/ @@ -530,7 +530,7 @@ #endif /*Enable Arabic/Persian processing - *In these languages characters should be replaced with an other form based on their position in the text*/ + *In these languages characters should be replaced with another form based on their position in the text*/ #define LV_USE_ARABIC_PERSIAN_CHARS 0 /*================== @@ -887,7 +887,7 @@ #define LV_USE_IME_PINYIN 0 #if LV_USE_IME_PINYIN /*1: Use default thesaurus*/ - /*If you do not use the default thesaurus, be sure to use `lv_ime_pinyin` after setting the thesauruss*/ + /*If you do not use the default thesaurus, be sure to use `lv_ime_pinyin` after setting the thesaurus*/ #define LV_IME_PINYIN_USE_DEFAULT_DICT 1 /*Set the maximum number of candidate panels that can be displayed*/ /*This needs to be adjusted according to the size of the screen*/ @@ -930,7 +930,7 @@ #define LV_USE_X11 0 #if LV_USE_X11 #define LV_X11_DIRECT_EXIT 1 /*Exit the application when all X11 windows have been closed*/ - #define LV_X11_DOUBLE_BUFFER 1 /*Use double buffers for endering*/ + #define LV_X11_DOUBLE_BUFFER 1 /*Use double buffers for rendering*/ /*select only 1 of the following render modes (LV_X11_RENDER_MODE_PARTIAL preferred!)*/ #define LV_X11_RENDER_MODE_PARTIAL 1 /*Partial render mode (preferred)*/ #define LV_X11_RENDER_MODE_DIRECT 0 /*direct render mode*/ diff --git a/scripts/LVGLImage.py b/scripts/LVGLImage.py index d2fbdbd68..9ad0180cd 100755 --- a/scripts/LVGLImage.py +++ b/scripts/LVGLImage.py @@ -308,7 +308,7 @@ def write_c_array_file( stride: int, cf: ColorFormat, filename: str, - premulitplied: bool, + premultiplied: bool, compress: CompressMethod, data: bytes): varname = path.basename(filename).split('.')[0] @@ -318,7 +318,7 @@ def write_c_array_file( flags = "0" if compress is not CompressMethod.NONE: flags += " | LV_IMAGE_FLAGS_COMPRESSED" - if premulitplied: + if premultiplied: flags += " | LV_IMAGE_FLAGS_PREMULTIPLIED" macro = "LV_ATTRIBUTE_" + varname.upper() @@ -494,7 +494,7 @@ class LVGLImage: h: int = 0, data: bytes = b'') -> None: self.stride = 0 # default no valid stride value - self.premulitplied = False + self.premultiplied = False self.set_data(cf, w, h, data) def __repr__(self) -> str: @@ -570,12 +570,12 @@ class LVGLImage: self.stride = stride self.data = bytearray(b''.join(data_out)) - def premulitply(self): + def premultiply(self): """ Pre-multiply image RGB data with alpha, set corresponding image header flags """ - if self.premulitplied: - raise ParameterError("Image already pre-mulitplied") + if self.premultiplied: + raise ParameterError("Image already pre-multiplied") if not self.cf.has_alpha: raise ParameterError(f"Image has no alpha channel: {self.cf.name}") @@ -659,7 +659,7 @@ class LVGLImage: else: raise ParameterError(f"Not supported yet: {self.cf.name}") - self.premulitplied = True + self.premultiplied = True @property def data_len(self) -> int: @@ -752,7 +752,7 @@ class LVGLImage: bin = bytearray() flags = 0 flags |= 0x08 if compress != CompressMethod.NONE else 0 - flags |= 0x01 if self.premulitplied else 0 + flags |= 0x01 if self.premultiplied else 0 header = LVGLImageHeader(self.cf, self.w, @@ -778,7 +778,7 @@ class LVGLImage: else: data = self.data write_c_array_file(self.w, self.h, self.stride, self.cf, filename, - self.premulitplied, + self.premultiplied, compress, data) def to_png(self, filename: str): @@ -1232,7 +1232,7 @@ class PNGConverter: img = LVGLImage().from_png(f, self.cf, background=self.background) img.adjust_stride(align=self.align) if self.premultiply: - img.premulitply() + img.premultiply() output.append((f, img)) if self.ofmt == OutputFormat.BIN_FILE: img.to_bin(self._replace_ext(f, ".bin"), @@ -1337,7 +1337,7 @@ def test(): cf=ColorFormat.ARGB8565, background=0xFF_FF_00) img.adjust_stride(align=16) - img.premulitply() + img.premultiply() img.to_bin("output/cogwheel.ARGB8565.bin") img.to_c_array("output/cogwheel-abc.c") # file name is used as c var name img.to_png("output/cogwheel.ARGB8565.png.png") # convert back to png diff --git a/scripts/jpg_to_sjpg.py b/scripts/jpg_to_sjpg.py index 5a005bfee..52c3bef0d 100755 --- a/scripts/jpg_to_sjpg.py +++ b/scripts/jpg_to_sjpg.py @@ -40,7 +40,7 @@ print("\tRES = " + str(width) + " x " + str(height) + '\n') lenbuf = [] block_size = JPEG_SPLIT_HEIGHT; -spilts = math.ceil(height/block_size) +splits = math.ceil(height/block_size) c_code = '''//LVGL SJPG C ARRAY\n#include "lvgl/lvgl.h"\n\nconst uint8_t ''' + OUTPUT_FILE_NAME + '''_map[] = {\n''' @@ -49,7 +49,7 @@ sjpeg = bytearray() row_remaining = height; -for i in range(spilts): +for i in range(splits): if row_remaining < block_size: crop = im.crop((0, i*block_size, width, row_remaining + i*block_size)) else: @@ -61,7 +61,7 @@ for i in range(spilts): -for i in range(spilts): +for i in range(splits): f = open(str(i)+".jpg", "rb") a = f.read() f.close() @@ -83,7 +83,7 @@ header = header + width.to_bytes(2, byteorder='little'); header = header + height.to_bytes(2, byteorder='little'); #NUMBER OF ITEMS 2 BYTES -header = header + spilts.to_bytes(2, byteorder='little'); +header = header + splits.to_bytes(2, byteorder='little'); #NUMBER OF ITEMS 2 BYTES header = header + int(JPEG_SPLIT_HEIGHT).to_bytes(2, byteorder='little'); diff --git a/scripts/style_api_gen.py b/scripts/style_api_gen.py index 622907243..ad665f209 100755 --- a/scripts/style_api_gen.py +++ b/scripts/style_api_gen.py @@ -421,7 +421,7 @@ props = [ {'name': 'FLEX_GROW', 'style_type': 'num', 'var_type': 'uint8_t', 'default':'`LV_FLEX_ALIGN_ROW`', 'inherited': 0, 'layout': 1, 'ext_draw': 0, - 'dsc': "Defines how mayn space to take proprtionally the free space of the object's trach"}, + 'dsc': "Defines how much space to take proportionally from the free space of the object's track"}, diff --git a/src/core/lv_group.h b/src/core/lv_group.h index f05f9e19e..feab5acb2 100644 --- a/src/core/lv_group.h +++ b/src/core/lv_group.h @@ -122,7 +122,7 @@ void lv_group_add_obj(lv_group_t * group, lv_obj_t * obj); /** * Swap 2 object in a group. The object must be in the same group * @param obj1 pointer to an object - * @param obj2 pointer to an other object + * @param obj2 pointer to another object */ void lv_group_swap_obj(lv_obj_t * obj1, lv_obj_t * obj2); diff --git a/src/core/lv_obj.h b/src/core/lv_obj.h index 471ed88b1..27a6df2de 100644 --- a/src/core/lv_obj.h +++ b/src/core/lv_obj.h @@ -327,7 +327,7 @@ bool lv_obj_has_flag(const lv_obj_t * obj, lv_obj_flag_t f); * Check if a given flag or any of the flags are set on an object. * @param obj pointer to an object * @param f the flag(s) to check (OR-ed values can be used) - * @return true: at lest one flag flag is set; false: none of the flags are set + * @return true: at least one flag is set; false: none of the flags are set */ bool lv_obj_has_flag_any(const lv_obj_t * obj, lv_obj_flag_t f); diff --git a/src/core/lv_obj_event.h b/src/core/lv_obj_event.h index 3b32b20f0..f5b406be1 100644 --- a/src/core/lv_obj_event.h +++ b/src/core/lv_obj_event.h @@ -28,7 +28,7 @@ extern "C" { /** * Used as the event parameter of ::LV_EVENT_HIT_TEST to check if an `point` can click the object or not. * `res` should be set like this: - * - If already set to `false` an other event wants that point non clickable. If you want to respect it leave it as `false` or set `true` to overwrite it. + * - If already set to `false` another event wants that point non clickable. If you want to respect it leave it as `false` or set `true` to overwrite it. * - If already set `true` and `point` shouldn't be clickable set to `false` * - If already set to `true` you agree that `point` can click the object leave it as `true` */ @@ -97,7 +97,7 @@ lv_obj_t * lv_event_get_target_obj(lv_event_t * e); * @param obj pointer to an object * @param filter an event code (e.g. `LV_EVENT_CLICKED`) on which the event should be called. `LV_EVENT_ALL` can be used to receive all the events. * @param event_cb the new event function - * @param user_data custom data data will be available in `event_cb` + * @param user_data custom data will be available in `event_cb` * @return handler to the event. It can be used in `lv_obj_remove_event_dsc`. */ lv_event_dsc_t * lv_obj_add_event_cb(lv_obj_t * obj, lv_event_cb_t event_cb, lv_event_code_t filter, void * user_data); diff --git a/src/core/lv_obj_pos.h b/src/core/lv_obj_pos.h index f60703070..3c7234fec 100644 --- a/src/core/lv_obj_pos.h +++ b/src/core/lv_obj_pos.h @@ -179,9 +179,9 @@ void lv_obj_set_align(lv_obj_t * obj, lv_align_t align); void lv_obj_align(lv_obj_t * obj, lv_align_t align, int32_t x_ofs, int32_t y_ofs); /** - * Align an object to an other object. + * Align an object to another object. * @param obj pointer to an object to align - * @param base pointer to an other object (if NULL `obj`s parent is used). 'obj' will be aligned to it. + * @param base pointer to another object (if NULL `obj`s parent is used). 'obj' will be aligned to it. * @param align type of alignment (see 'lv_align_t' enum) * @param x_ofs x coordinate offset after alignment * @param y_ofs y coordinate offset after alignment diff --git a/src/core/lv_obj_tree.c b/src/core/lv_obj_tree.c index f5e764b64..c265506be 100644 --- a/src/core/lv_obj_tree.c +++ b/src/core/lv_obj_tree.c @@ -212,7 +212,7 @@ void lv_obj_move_to_index(lv_obj_t * obj, int32_t index) } const uint32_t parent_child_count = lv_obj_get_child_count(parent); - /* old_index only can be 0 or greater, this point can not be reached if the parent is not null */ + /* old_index only can be 0 or greater, this point cannot be reached if the parent is not null */ const int32_t old_index = lv_obj_get_index(obj); LV_ASSERT(0 <= old_index); diff --git a/src/core/lv_refr.c b/src/core/lv_refr.c index 11e1d4b41..75308ac8a 100644 --- a/src/core/lv_refr.c +++ b/src/core/lv_refr.c @@ -807,7 +807,7 @@ static void refr_obj_and_children(lv_layer_t * layer, lv_obj_t * top_obj) } } - /*Call the post draw draw function of the parents of the to object*/ + /*Call the post draw function of the parents of the to object*/ lv_obj_send_event(parent, LV_EVENT_DRAW_POST_BEGIN, (void *)layer); lv_obj_send_event(parent, LV_EVENT_DRAW_POST, (void *)layer); lv_obj_send_event(parent, LV_EVENT_DRAW_POST_END, (void *)layer); @@ -896,7 +896,7 @@ void refr_obj(lv_layer_t * layer, lv_obj_t * obj) lv_result_t res = layer_get_area(layer, obj, layer_type, &layer_area_full, &obj_draw_size); if(res != LV_RESULT_OK) return; - /*Simple layers can be subdivied into smaller layers*/ + /*Simple layers can be subdivided into smaller layers*/ uint32_t max_rgb_row_height = lv_area_get_height(&layer_area_full); uint32_t max_argb_row_height = lv_area_get_height(&layer_area_full); if(layer_type == LV_LAYER_TYPE_SIMPLE) { diff --git a/src/display/lv_display.c b/src/display/lv_display.c index 49d8b00b3..8ff630420 100644 --- a/src/display/lv_display.c +++ b/src/display/lv_display.c @@ -187,7 +187,7 @@ void lv_display_delete(lv_display_t * disp) disp->act_scr = NULL; while(disp->screen_cnt != 0) { - /*Delete the screenst*/ + /*Delete the screens*/ lv_obj_delete(disp->screens[0]); } diff --git a/src/display/lv_display.h b/src/display/lv_display.h index 575de4ad2..498e5ea8f 100644 --- a/src/display/lv_display.h +++ b/src/display/lv_display.h @@ -362,7 +362,7 @@ lv_obj_t * lv_display_get_layer_sys(lv_display_t * disp); /** * Return the bottom layer. The bottom layer is the same on all screen and it is under the normal screen layer. - * It's visible only if the the screen is transparent. + * It's visible only if the screen is transparent. * @param disp pointer to display (NULL to use the default screen) * @return pointer to the bottom layer object */ diff --git a/src/draw/lv_draw.h b/src/draw/lv_draw.h index 19f6fd422..9e430ab01 100644 --- a/src/draw/lv_draw.h +++ b/src/draw/lv_draw.h @@ -231,7 +231,7 @@ lv_draw_task_t * lv_draw_add_task(lv_layer_t * layer, const lv_area_t * coords); * It will send an event about the new draw task to the widget * and assign it to a draw unit. * @param layer pointer to a layer - * @param t poinr to a draw task + * @param t pointer to a draw task */ void lv_draw_finalize_task_creation(lv_layer_t * layer, lv_draw_task_t * t); @@ -271,7 +271,7 @@ lv_draw_task_t * lv_draw_get_next_available_task(lv_layer_t * layer, lv_draw_tas /** * Tell how many draw task are waiting to be drawn on the area of `t_check`. - * It can be used to determine if a GPU shall combine many draw tasks in to one or not. + * It can be used to determine if a GPU shall combine many draw tasks into one or not. * If a lot of tasks are waiting for the current ones it makes sense to draw them one-by-one * to not block the dependent tasks' rendering * @param t_check the task whose dependent tasks shall be counted diff --git a/src/draw/lv_draw_buf.h b/src/draw/lv_draw_buf.h index 05f54780a..e120ae26a 100644 --- a/src/draw/lv_draw_buf.h +++ b/src/draw/lv_draw_buf.h @@ -218,7 +218,7 @@ uint32_t lv_draw_buf_width_to_stride_user(const lv_draw_buf_handlers_t * handler void lv_draw_buf_clear(lv_draw_buf_t * draw_buf, const lv_area_t * a); /** - * Copy an area from a buffer to an other + * Copy an area from a buffer to another * @param dest pointer to the destination draw buffer * @param dest_area the area to copy from the destination buffer, if NULL, use the whole buffer * @param src pointer to the source draw buffer diff --git a/src/draw/lv_draw_image.h b/src/draw/lv_draw_image.h index a11e1dacd..737e8b439 100644 --- a/src/draw/lv_draw_image.h +++ b/src/draw/lv_draw_image.h @@ -113,7 +113,7 @@ lv_draw_image_dsc_t * lv_draw_task_get_image_dsc(lv_draw_task_t * task); void lv_draw_image(lv_layer_t * layer, const lv_draw_image_dsc_t * dsc, const lv_area_t * coords); /** - * Create a draw task to blend a layer to an other layer + * Create a draw task to blend a layer to another layer * @param layer pointer to a layer * @param dsc pointer to an initialized draw descriptor * @param coords the coordinates of the layer. diff --git a/src/draw/lv_draw_vector.c b/src/draw/lv_draw_vector.c index e6fda0f91..b03f6e8c1 100644 --- a/src/draw/lv_draw_vector.c +++ b/src/draw/lv_draw_vector.c @@ -23,7 +23,7 @@ #define RAD_TO_DEG 57.295779513082320876798154814105f #define MATH_RADIANS(deg) ((deg) * DEG_TO_RAD) -#define MATH_DEGRESS(rad) ((rad) * RAD_TO_DEG) +#define MATH_DEGREES(rad) ((rad) * RAD_TO_DEG) /********************* * DEFINES diff --git a/src/draw/lv_image_decoder.c b/src/draw/lv_image_decoder.c index abce60579..6aa4d01c0 100644 --- a/src/draw/lv_image_decoder.c +++ b/src/draw/lv_image_decoder.c @@ -270,7 +270,7 @@ lv_draw_buf_t * lv_image_decoder_post_process(lv_image_decoder_dsc_t * dsc, lv_d else { decoded = lv_draw_buf_dup_user(image_cache_draw_buf_handlers, decoded); if(decoded == NULL) { - LV_LOG_ERROR("No memory for premulitplying."); + LV_LOG_ERROR("No memory for premultiplying."); return NULL; } diff --git a/src/draw/lv_image_dsc.h b/src/draw/lv_image_dsc.h index 68c123ea3..7b2d9b951 100644 --- a/src/draw/lv_image_dsc.h +++ b/src/draw/lv_image_dsc.h @@ -20,7 +20,7 @@ extern "C" { *********************/ /** Magic number for lvgl image, 9 means lvgl version 9 - * It must not be a valid ASCII character nor larger than 0x80. See `lv_image_src_get_type`. + * It must be neither a valid ASCII character nor larger than 0x80. See `lv_image_src_get_type`. */ #define LV_IMAGE_HEADER_MAGIC (0x19) LV_EXPORT_CONST_INT(LV_IMAGE_HEADER_MAGIC); diff --git a/src/draw/nxp/vglite/lv_draw_vglite_img.c b/src/draw/nxp/vglite/lv_draw_vglite_img.c index 456372d3a..83dcc7d92 100644 --- a/src/draw/nxp/vglite/lv_draw_vglite_img.c +++ b/src/draw/nxp/vglite/lv_draw_vglite_img.c @@ -409,8 +409,8 @@ static void _vglite_draw_pattern(const lv_area_t * clip_area, const lv_area_t * vg_lite_color_t vgcol = _vglite_recolor(dsc); /* Filter */ - bool has_trasform = (dsc->rotation != 0 || dsc->scale_x != LV_SCALE_NONE || dsc->scale_y != LV_SCALE_NONE); - vg_lite_filter_t filter = has_trasform ? VG_LITE_FILTER_BI_LINEAR : VG_LITE_FILTER_POINT; + bool has_transform = (dsc->rotation != 0 || dsc->scale_x != LV_SCALE_NONE || dsc->scale_y != LV_SCALE_NONE); + vg_lite_filter_t filter = has_transform ? VG_LITE_FILTER_BI_LINEAR : VG_LITE_FILTER_POINT; /* Draw Pattern */ VGLITE_CHECK_ERROR(vg_lite_draw_pattern(dst_vgbuf, &path, VG_LITE_FILL_NON_ZERO, &path_matrix, diff --git a/src/draw/sw/lv_draw_sw.c b/src/draw/sw/lv_draw_sw.c index 1bd96e1ed..73dd05055 100644 --- a/src/draw/sw/lv_draw_sw.c +++ b/src/draw/sw/lv_draw_sw.c @@ -222,25 +222,25 @@ void lv_draw_sw_rgb565_swap(void * buf, uint32_t buf_size_px) } -void lv_draw_sw_rotate(const void * src, void * dest, int32_t src_width, int32_t src_height, int32_t src_sride, +void lv_draw_sw_rotate(const void * src, void * dest, int32_t src_width, int32_t src_height, int32_t src_stride, int32_t dest_stride, lv_display_rotation_t rotation, lv_color_format_t color_format) { if(rotation == LV_DISPLAY_ROTATION_90) { switch(color_format) { #if LV_DRAW_SW_SUPPORT_RGB565 case LV_COLOR_FORMAT_RGB565: - rotate90_rgb565(src, dest, src_width, src_height, src_sride, dest_stride); + rotate90_rgb565(src, dest, src_width, src_height, src_stride, dest_stride); break; #endif #if LV_DRAW_SW_SUPPORT_RGB888 case LV_COLOR_FORMAT_RGB888: - rotate90_rgb888(src, dest, src_width, src_height, src_sride, dest_stride); + rotate90_rgb888(src, dest, src_width, src_height, src_stride, dest_stride); break; #endif #if LV_DRAW_SW_SUPPORT_ARGB8888 || LV_DRAW_SW_SUPPORT_XRGB8888 case LV_COLOR_FORMAT_XRGB8888: case LV_COLOR_FORMAT_ARGB8888: - rotate90_argb8888(src, dest, src_width, src_height, src_sride, dest_stride); + rotate90_argb8888(src, dest, src_width, src_height, src_stride, dest_stride); break; #endif default: @@ -254,18 +254,18 @@ void lv_draw_sw_rotate(const void * src, void * dest, int32_t src_width, int32_t switch(color_format) { #if LV_DRAW_SW_SUPPORT_RGB565 case LV_COLOR_FORMAT_RGB565: - rotate180_rgb565(src, dest, src_width, src_height, src_sride, dest_stride); + rotate180_rgb565(src, dest, src_width, src_height, src_stride, dest_stride); break; #endif #if LV_DRAW_SW_SUPPORT_RGB888 case LV_COLOR_FORMAT_RGB888: - rotate180_rgb888(src, dest, src_width, src_height, src_sride, dest_stride); + rotate180_rgb888(src, dest, src_width, src_height, src_stride, dest_stride); break; #endif #if LV_DRAW_SW_SUPPORT_ARGB8888 || LV_DRAW_SW_SUPPORT_XRGB8888 case LV_COLOR_FORMAT_XRGB8888: case LV_COLOR_FORMAT_ARGB8888: - rotate180_argb8888(src, dest, src_width, src_height, src_sride, dest_stride); + rotate180_argb8888(src, dest, src_width, src_height, src_stride, dest_stride); break; #endif default: @@ -279,18 +279,18 @@ void lv_draw_sw_rotate(const void * src, void * dest, int32_t src_width, int32_t switch(color_format) { #if LV_DRAW_SW_SUPPORT_RGB565 case LV_COLOR_FORMAT_RGB565: - rotate270_rgb565(src, dest, src_width, src_height, src_sride, dest_stride); + rotate270_rgb565(src, dest, src_width, src_height, src_stride, dest_stride); break; #endif #if LV_DRAW_SW_SUPPORT_RGB888 case LV_COLOR_FORMAT_RGB888: - rotate270_rgb888(src, dest, src_width, src_height, src_sride, dest_stride); + rotate270_rgb888(src, dest, src_width, src_height, src_stride, dest_stride); break; #endif #if LV_DRAW_SW_SUPPORT_ARGB8888 || LV_DRAW_SW_SUPPORT_XRGB8888 case LV_COLOR_FORMAT_XRGB8888: case LV_COLOR_FORMAT_ARGB8888: - rotate270_argb8888(src, dest, src_width, src_height, src_sride, dest_stride); + rotate270_argb8888(src, dest, src_width, src_height, src_stride, dest_stride); break; #endif default: diff --git a/src/draw/sw/lv_draw_sw.h b/src/draw/sw/lv_draw_sw.h index ff6204e7e..a97665be8 100644 --- a/src/draw/sw/lv_draw_sw.h +++ b/src/draw/sw/lv_draw_sw.h @@ -180,17 +180,17 @@ void lv_draw_sw_vector(lv_draw_unit_t * draw_unit, const lv_draw_vector_task_dsc void lv_draw_sw_rgb565_swap(void * buf, uint32_t buf_size_px); /** - * Rotate a buffer into an other buffer + * Rotate a buffer into another buffer * @param src the source buffer * @param dest the destination buffer * @param src_width source width in pixels * @param src_height source height in pixels - * @param src_sride source stride in bytes (number of bytes in a row) + * @param src_stride source stride in bytes (number of bytes in a row) * @param dest_stride destination stride in bytes (number of bytes in a row) * @param rotation LV_DISPLAY_ROTATION_0/90/180/270 * @param color_format LV_COLOR_FORMAT_RGB565/RGB888/XRGB8888/ARGB8888 */ -void lv_draw_sw_rotate(const void * src, void * dest, int32_t src_width, int32_t src_height, int32_t src_sride, +void lv_draw_sw_rotate(const void * src, void * dest, int32_t src_width, int32_t src_height, int32_t src_stride, int32_t dest_stride, lv_display_rotation_t rotation, lv_color_format_t color_format); /*********************** diff --git a/src/draw/sw/lv_draw_sw_box_shadow.c b/src/draw/sw/lv_draw_sw_box_shadow.c index 67b93322c..4ccb3b837 100644 --- a/src/draw/sw/lv_draw_sw_box_shadow.c +++ b/src/draw/sw/lv_draw_sw_box_shadow.c @@ -582,7 +582,7 @@ static void LV_ATTRIBUTE_FAST_MEM shadow_draw_corner_buf(const lv_area_t * coord lv_draw_sw_mask_radius_init(&mask_param, &sh_area, r, false); #if SHADOW_ENHANCE - /*Set half shadow width width because blur will be repeated*/ + /*Set half shadow width because blur will be repeated*/ if(sw_ori == 1) sw = 1; else sw = sw_ori >> 1; #endif /*SHADOW_ENHANCE*/ diff --git a/src/draw/sw/lv_draw_sw_img.c b/src/draw/sw/lv_draw_sw_img.c index 08a431da5..1bc4cf780 100644 --- a/src/draw/sw/lv_draw_sw_img.c +++ b/src/draw/sw/lv_draw_sw_img.c @@ -270,7 +270,7 @@ static void img_draw_core(lv_draw_unit_t * draw_unit, const lv_draw_image_dsc_t if(decoder_res == LV_RESULT_OK) lv_image_decoder_close(&mask_decoder_dsc); } - /* check whether it is possible to accelerate the operation in synchronouse mode */ + /* check whether it is possible to accelerate the operation in synchronous mode */ else if(LV_RESULT_INVALID == LV_DRAW_SW_IMAGE(transformed, /* whether require transform */ cf, /* image format */ src_buf, /* image buffer */ diff --git a/src/draw/vg_lite/lv_draw_vg_lite_img.c b/src/draw/vg_lite/lv_draw_vg_lite_img.c index 25e99ac1c..01b5152a4 100644 --- a/src/draw/vg_lite/lv_draw_vg_lite_img.c +++ b/src/draw/vg_lite/lv_draw_vg_lite_img.c @@ -87,8 +87,8 @@ void lv_draw_vg_lite_img(lv_draw_unit_t * draw_unit, const lv_draw_image_dsc_t * lv_memset(&color, dsc->opa, sizeof(color)); } - bool has_trasform = (dsc->rotation != 0 || dsc->scale_x != LV_SCALE_NONE || dsc->scale_y != LV_SCALE_NONE); - vg_lite_filter_t filter = has_trasform ? VG_LITE_FILTER_BI_LINEAR : VG_LITE_FILTER_POINT; + bool has_transform = (dsc->rotation != 0 || dsc->scale_x != LV_SCALE_NONE || dsc->scale_y != LV_SCALE_NONE); + vg_lite_filter_t filter = has_transform ? VG_LITE_FILTER_BI_LINEAR : VG_LITE_FILTER_POINT; vg_lite_matrix_t matrix; vg_lite_identity(&matrix); diff --git a/src/draw/vg_lite/lv_vg_lite_decoder.c b/src/draw/vg_lite/lv_vg_lite_decoder.c index cf8ca1560..928267a8c 100644 --- a/src/draw/vg_lite/lv_vg_lite_decoder.c +++ b/src/draw/vg_lite/lv_vg_lite_decoder.c @@ -207,7 +207,7 @@ static lv_result_t decoder_open_variable(lv_image_decoder_t * decoder, lv_image_ uint32_t stride = lv_draw_buf_width_to_stride(width, src_cf); lv_draw_buf_init(draw_buf, width, height, src_cf, stride, (void *)image_data, image_data_size); - /* Use alloced bit to indicate we should not free the memory */ + /* Use allocated bit to indicate we should not free the memory */ draw_buf->header.flags &= ~LV_IMAGE_FLAGS_ALLOCATED; /* Do not add this kind of image to cache, since its life is managed by user. */ diff --git a/src/draw/vg_lite/lv_vg_lite_math.c b/src/draw/vg_lite/lv_vg_lite_math.c index 08b180bf8..52b4bb950 100644 --- a/src/draw/vg_lite/lv_vg_lite_math.c +++ b/src/draw/vg_lite/lv_vg_lite_math.c @@ -46,7 +46,9 @@ float math_fast_inv_sqrtf(float number) x2 = number * 0.5f; y = number; i = *(int32_t *)&y; /* evil floating point bit level hacking */ - i = 0x5f3759df - (i >> 1); /* what the fuck? */ + i = 0x5f3759df /* floating-point representation of an approximation of {\sqrt {2^{127}}}} see https://en.wikipedia.org/wiki/Fast_inverse_square_root. */ + - (i >> + 1); y = *(float *)&i; y = y * (threehalfs - (x2 * y * y)); /* 1st iteration */ diff --git a/src/draw/vg_lite/lv_vg_lite_math.h b/src/draw/vg_lite/lv_vg_lite_math.h index 5607333b4..3b4b45d75 100644 --- a/src/draw/vg_lite/lv_vg_lite_math.h +++ b/src/draw/vg_lite/lv_vg_lite_math.h @@ -40,7 +40,7 @@ extern "C" { #define MATH_SQRTF(x) sqrtf(x) #define MATH_RADIANS(deg) ((deg) * DEG_TO_RAD) -#define MATH_DEGRESS(rad) ((rad) * RAD_TO_DEG) +#define MATH_DEGREES(rad) ((rad) * RAD_TO_DEG) /********************** * TYPEDEFS diff --git a/src/draw/vg_lite/lv_vg_lite_utils.c b/src/draw/vg_lite/lv_vg_lite_utils.c index ecb4c50a4..f7db6098e 100644 --- a/src/draw/vg_lite/lv_vg_lite_utils.c +++ b/src/draw/vg_lite/lv_vg_lite_utils.c @@ -90,7 +90,7 @@ void lv_vg_lite_dump_info(void) vg_lite_uint32_t mem_avail = 0; vg_lite_get_mem_size(&mem_avail); - LV_LOG_USER("Memory Avaliable: %" LV_PRId32 " Bytes", (uint32_t)mem_avail); + LV_LOG_USER("Memory Available: %" LV_PRId32 " Bytes", (uint32_t)mem_avail); } const char * lv_vg_lite_error_string(vg_lite_error_t error) @@ -398,7 +398,7 @@ vg_lite_buffer_format_t lv_vg_lite_vg_fmt(lv_color_format_t cf) return VG_LITE_NV12; default: - LV_LOG_ERROR("unsupport color format: %d", cf); + LV_LOG_ERROR("unsupported color format: %d", cf); break; } @@ -489,7 +489,7 @@ void lv_vg_lite_buffer_format_bytes( *mul = 3; break; default: - LV_LOG_ERROR("unsupport color format: 0x%" PRIx32, (uint32_t)format); + LV_LOG_ERROR("unsupported color format: 0x%" PRIx32, (uint32_t)format); LV_ASSERT(false); break; } diff --git a/src/drivers/display/renesas_glcdc/lv_renesas_glcdc.c b/src/drivers/display/renesas_glcdc/lv_renesas_glcdc.c index 7baa20ebd..15b67846d 100644 --- a/src/drivers/display/renesas_glcdc/lv_renesas_glcdc.c +++ b/src/drivers/display/renesas_glcdc/lv_renesas_glcdc.c @@ -190,7 +190,7 @@ static void glcdc_init(void) lv_memzero(fb_background, sizeof(fb_background)); #ifdef _RENESAS_RA_ - /* Initalize GLCDC driver */ + /* Initialize GLCDC driver */ uint8_t * p_fb = &fb_background[1][0]; fsp_err_t err; diff --git a/src/drivers/glfw/lv_glfw_window.c b/src/drivers/glfw/lv_glfw_window.c index b09f569ee..7b26b9d46 100644 --- a/src/drivers/glfw/lv_glfw_window.c +++ b/src/drivers/glfw/lv_glfw_window.c @@ -236,7 +236,7 @@ static void mouse_button_callback(GLFWwindow * window, int button, int action, i } } -static void mouse_move_cllback(GLFWwindow * window, double xpos, double ypos) +static void mouse_move_callback(GLFWwindow * window, double xpos, double ypos) { LV_UNUSED(window); lv_display_t * disp = lv_display_get_default(); @@ -309,7 +309,7 @@ static int window_create(lv_display_t * disp) glfwSetFramebufferSizeCallback(dsc->window, framebuffer_size_callback); glfwSetMouseButtonCallback(dsc->window, mouse_button_callback); - glfwSetCursorPosCallback(dsc->window, mouse_move_cllback); + glfwSetCursorPosCallback(dsc->window, mouse_move_callback); glfwSetKeyCallback(dsc->window, key_callback); diff --git a/src/drivers/libinput/lv_libinput.h b/src/drivers/libinput/lv_libinput.h index 4ec1160a0..0441c25a7 100644 --- a/src/drivers/libinput/lv_libinput.h +++ b/src/drivers/libinput/lv_libinput.h @@ -116,7 +116,7 @@ size_t lv_libinput_find_devs(lv_libinput_capability capabilities, char ** found, lv_indev_t * lv_libinput_create(lv_indev_type_t indev_type, const char * dev_path); /** - * Delete a libinput input devic + * Delete a libinput input device * @param indev pointer to input device */ void lv_libinput_delete(lv_indev_t * indev); diff --git a/src/drivers/sdl/lv_sdl_mouse.c b/src/drivers/sdl/lv_sdl_mouse.c index 7531aafab..9e4248047 100644 --- a/src/drivers/sdl/lv_sdl_mouse.c +++ b/src/drivers/sdl/lv_sdl_mouse.c @@ -189,7 +189,7 @@ void _lv_sdl_mouse_handler(SDL_Event * event) case SDL_MOUSEWHEEL: #if LV_SDL_MOUSEWHEEL_MODE == LV_SDL_MOUSEWHEEL_MODE_CROWN #ifdef __EMSCRIPTEN__ - /*Escripten scales it wrong*/ + /*Emscripten scales it wrong*/ if(event->wheel.y < 0) dsc->diff++; if(event->wheel.y > 0) dsc->diff--; #else diff --git a/src/drivers/sdl/lv_sdl_mousewheel.c b/src/drivers/sdl/lv_sdl_mousewheel.c index 5d423aa92..d38ced474 100644 --- a/src/drivers/sdl/lv_sdl_mousewheel.c +++ b/src/drivers/sdl/lv_sdl_mousewheel.c @@ -117,7 +117,7 @@ void _lv_sdl_mousewheel_handler(SDL_Event * event) switch(event->type) { case SDL_MOUSEWHEEL: #ifdef __EMSCRIPTEN__ - /*Escripten scales it wrong*/ + /*Emscripten scales it wrong*/ if(event->wheel.y < 0) dsc->diff++; if(event->wheel.y > 0) dsc->diff--; #else diff --git a/src/drivers/x11/lv_x11.h b/src/drivers/x11/lv_x11.h index 61e13256e..eeb13b2bc 100644 --- a/src/drivers/x11/lv_x11.h +++ b/src/drivers/x11/lv_x11.h @@ -39,7 +39,7 @@ typedef void(*lv_x11_close_cb)(void * user_data); **********************/ /** - * create and add keyboard, mouse and scrillwheel objects and connect them to x11 display. + * create and add keyboard, mouse and scrollwheel objects and connect them to x11 display. * * This is a convenience method handling the typical input initialisation of an X11 window: * - create keyboard (@ref lv_x11_keyboard_create) diff --git a/src/drivers/x11/lv_x11_display.c b/src/drivers/x11/lv_x11_display.c index 98a1f13c8..91e5f2995 100644 --- a/src/drivers/x11/lv_x11_display.c +++ b/src/drivers/x11/lv_x11_display.c @@ -160,7 +160,7 @@ static void x11_flush_cb(lv_display_t * disp, const lv_area_t * area, uint8_t * } /** - * event callbed by lvgl display if resolution has been changed (@ref lv_display_set_resolution has been called) + * event called by lvgl display if resolution has been changed (@ref lv_display_set_resolution has been called) * @param[in] e event data, containing lv_display_t object */ static void x11_resolution_evt_cb(lv_event_t * e) @@ -189,7 +189,7 @@ static void x11_resolution_evt_cb(lv_event_t * e) } /** - * event callbed by lvgl display if display has been closed (@ref lv_display_delete has been called) + * event called by lvgl display if display has been closed (@ref lv_display_delete has been called) * @param[in] e event data, containing lv_display_t object */ static void x11_disp_delete_evt_cb(lv_event_t * e) diff --git a/src/drivers/x11/lv_x11_input.c b/src/drivers/x11/lv_x11_input.c index 0e35a6769..ecbd8d4e7 100644 --- a/src/drivers/x11/lv_x11_input.c +++ b/src/drivers/x11/lv_x11_input.c @@ -33,7 +33,7 @@ typedef struct _x11_inp_data { lv_indev_t * mousewheel; /**< encoder input device object */ lv_timer_t * timer; /**< timer object for @ref x11_event_handler */ /* user input related information */ - char kb_buffer[32]; /**< keyboard buffer for X keyboard inpputs */ + char kb_buffer[32]; /**< keyboard buffer for X keyboard inputs */ lv_point_t mouse_pos; /**< current reported mouse position */ bool left_mouse_btn; /**< current state of left mouse button */ bool right_mouse_btn; /**< current state of right mouse button */ @@ -180,7 +180,7 @@ static void x11_inp_event_handler(lv_timer_t * t) } /** - * event callbed by lvgl display if display has been closed (@ref lv_display_delete has been called) + * event called by lvgl display if display has been closed (@ref lv_display_delete has been called) * @param[in] e event data, containing lv_display_t object */ static void x11_inp_delete_evt_cb(lv_event_t * e) diff --git a/src/font/lv_font_fmt_txt.c b/src/font/lv_font_fmt_txt.c index 65a820dd4..785d6f041 100644 --- a/src/font/lv_font_fmt_txt.c +++ b/src/font/lv_font_fmt_txt.c @@ -488,13 +488,13 @@ static inline uint8_t rle_next(void) ret = get_bits(rle->in, rle->rdp, rle->bpp); if(rle->rdp != 0 && rle->prev_v == ret) { rle->count = 0; - rle->state = RLE_STATE_REPEATE; + rle->state = RLE_STATE_REPEATED; } rle->prev_v = ret; rle->rdp += rle->bpp; } - else if(rle->state == RLE_STATE_REPEATE) { + else if(rle->state == RLE_STATE_REPEATED) { v = get_bits(rle->in, rle->rdp, 1); rle->count++; rle->rdp += 1; diff --git a/src/font/lv_font_fmt_txt.h b/src/font/lv_font_fmt_txt.h index a08ffb1b6..4240c95b0 100644 --- a/src/font/lv_font_fmt_txt.h +++ b/src/font/lv_font_fmt_txt.h @@ -194,7 +194,7 @@ typedef struct { #if LV_USE_FONT_COMPRESSED typedef enum { RLE_STATE_SINGLE = 0, - RLE_STATE_REPEATE, + RLE_STATE_REPEATED, RLE_STATE_COUNTER, } lv_font_fmt_rle_state_t; diff --git a/src/font/lv_symbol_def.h b/src/font/lv_symbol_def.h index 7c2365869..3fc2a6d71 100644 --- a/src/font/lv_symbol_def.h +++ b/src/font/lv_symbol_def.h @@ -27,7 +27,7 @@ extern "C" { 62018, 62019, 62020, 62087, 62099, 62189, 62212, 62810, 63426, 63650 */ -/* These symbols can be prefined in the lv_conf.h file. +/* These symbols can be predefined in the lv_conf.h file. * If they are not predefined, they will use the following values */ diff --git a/src/indev/lv_indev.c b/src/indev/lv_indev.c index 890459156..52c904e48 100644 --- a/src/indev/lv_indev.c +++ b/src/indev/lv_indev.c @@ -30,7 +30,7 @@ #define LV_INDEV_DEF_SCROLL_THROW 10 /*Long press time in milliseconds. - *Time to send `LV_EVENT_LONG_PRESSSED`)*/ + *Time to send `LV_EVENT_LONG_PRESSED`)*/ #define LV_INDEV_DEF_LONG_PRESS_TIME 400 /*Repeated trigger period in long press [ms] @@ -134,7 +134,7 @@ lv_indev_t * lv_indev_create(void) indev->long_press_repeat_time = LV_INDEV_DEF_LONG_PRESS_REP_TIME; indev->gesture_limit = LV_INDEV_DEF_GESTURE_LIMIT; indev->gesture_min_velocity = LV_INDEV_DEF_GESTURE_MIN_VELOCITY; - indev->rotary_sensitvity = LV_INDEV_DEF_ROTARY_SENSITIVITY; + indev->rotary_sensitivity = LV_INDEV_DEF_ROTARY_SENSITIVITY; return indev; } @@ -1373,7 +1373,7 @@ static void indev_proc_pointer_diff(lv_indev_t * indev) bool editable = lv_obj_is_editable(obj); if(editable) { - uint32_t indev_sensitivity = indev->rotary_sensitvity; + uint32_t indev_sensitivity = indev->rotary_sensitivity; uint32_t obj_sensitivity = lv_obj_get_style_rotary_sensitivity(indev_obj_act, 0); int32_t diff = (int32_t)((int32_t)indev->pointer.diff * indev_sensitivity * obj_sensitivity + 32768) >> 16; send_event(LV_EVENT_ROTARY, &diff); @@ -1385,7 +1385,7 @@ static void indev_proc_pointer_diff(lv_indev_t * indev) indev->pointer.act_obj = obj; lv_obj_t * scroll_obj = lv_indev_find_scroll_obj(indev); if(scroll_obj == NULL) return; - uint32_t indev_sensitivity = indev->rotary_sensitvity; + uint32_t indev_sensitivity = indev->rotary_sensitivity; uint32_t obj_sensitivity = lv_obj_get_style_rotary_sensitivity(scroll_obj, 0); int32_t diff = (int32_t)((int32_t)indev->pointer.diff * indev_sensitivity * obj_sensitivity + 32768) >> 16; diff --git a/src/indev/lv_indev_private.h b/src/indev/lv_indev_private.h index ddd7077a2..04a37e801 100644 --- a/src/indev/lv_indev_private.h +++ b/src/indev/lv_indev_private.h @@ -70,7 +70,7 @@ struct _lv_indev_t { uint16_t long_press_repeat_time; /**< Rotary diff count will be multiplied by this value and divided by 256*/ - int32_t rotary_sensitvity; + int32_t rotary_sensitivity; struct { /*Pointer and button data*/ diff --git a/src/libs/bin_decoder/lv_bin_decoder.c b/src/libs/bin_decoder/lv_bin_decoder.c index ab4158169..5000982b9 100644 --- a/src/libs/bin_decoder/lv_bin_decoder.c +++ b/src/libs/bin_decoder/lv_bin_decoder.c @@ -422,7 +422,7 @@ lv_result_t lv_bin_decoder_get_area(lv_image_decoder_t * decoder, lv_image_decod else { decoded_area->y1++; decoded_area->y2++; - decoded = decoder_data->decoded_partial; /*Already alloced*/ + decoded = decoder_data->decoded_partial; /*Already allocated*/ } img_data = decoded->data; /*Get the buffer to operate on*/ diff --git a/src/libs/lodepng/lodepng.c b/src/libs/lodepng/lodepng.c index d5b9d1c1a..44eadc280 100644 --- a/src/libs/lodepng/lodepng.c +++ b/src/libs/lodepng/lodepng.c @@ -1938,7 +1938,7 @@ static unsigned deflateDynamic(LodePNGBitWriter * writer, Hash * hash, size_t datasize = dataend - datapos; /* - If we could call "bitlen_cl" the the code length code lengths ("clcl"), that is the bit lengths of codes to represent + If we could call "bitlen_cl" the code length code lengths ("clcl"), that is the bit lengths of codes to represent tree_cl in CLCL_ORDER, then due to the huffman compression of huffman tree representations ("two levels"), there are some analogies: bitlen_lld is to tree_cl what data is to tree_ll and tree_d. diff --git a/src/libs/lodepng/lodepng.h b/src/libs/lodepng/lodepng.h index 2670e1c32..e9dbfa9a9 100644 --- a/src/libs/lodepng/lodepng.h +++ b/src/libs/lodepng/lodepng.h @@ -278,7 +278,7 @@ struct _LodePNGDecompressSettings { /*Maximum decompressed size, beyond this the decoder may (and is encouraged to) stop decoding, return an error, output a data size > max_output_size and all the data up to that point. This is - not hard limit nor a guarantee, but can prevent excessive memory usage. This setting is + neither a hard limit nor a guarantee, but can prevent excessive memory usage. This setting is ignored by the PNG decoder, but is used by the deflate/zlib decoder and can be used by custom ones. Set to 0 to impose no limit (the default).*/ size_t max_output_size; @@ -1187,7 +1187,7 @@ The following features are supported by the decoder: *) encoding of PNGs, from any raw image to 24- or 32-bit color, or the same color type as the raw image *) Adam7 interlace and deinterlace for any color type *) loading the image from harddisk or decoding it from a buffer from other sources than harddisk -*) support for alpha channels, including RGBA color modelete,translucent palettes and color keying +*) support for alpha channels, including RGBA color model,translucent palettes and color keying *) zlib decompression (inflate) *) zlib compression (deflate) *) CRC32 and ADLER32 checksums diff --git a/src/libs/lz4/lz4.h b/src/libs/lz4/lz4.h index 72080233e..ce763af13 100644 --- a/src/libs/lz4/lz4.h +++ b/src/libs/lz4/lz4.h @@ -76,7 +76,7 @@ extern "C" { metadata includes block's compressed size, and maximum bound of decompressed size. Each application is free to encode and pass such metadata in whichever way it wants. - lz4.h only handle blocks, it can not generate Frames. + lz4.h only handle blocks, it cannot generate Frames. Blocks are different from Frames (doc/lz4_Frame_format.md). Frames bundle both blocks and metadata in a specified manner. @@ -592,7 +592,7 @@ LZ4LIB_STATIC_API int LZ4_compress_fast_extState_fastReset (void* state, const c * Alternatively, the provided dictionaryStream may be NULL, * in which case any existing dictionary stream is unset. * - * If a dictionary is provided, it replaces any pre-existing stream history. + * If a dictionary is provided, it replaces any preexisting stream history. * The dictionary contents are the only history that can be referenced and * logically immediately precede the data compressed in the first subsequent * compression call. diff --git a/src/libs/rlottie/lv_rlottie.c b/src/libs/rlottie/lv_rlottie.c index 672fd28d7..eed803252 100644 --- a/src/libs/rlottie/lv_rlottie.c +++ b/src/libs/rlottie/lv_rlottie.c @@ -121,7 +121,7 @@ static void lv_rlottie_constructor(const lv_obj_class_t * class_p, lv_obj_t * ob rlottie->animation = lottie_animation_from_file(create_info.path); } if(rlottie->animation == NULL) { - LV_LOG_WARN("The aniamtion can't be opened"); + LV_LOG_WARN("The animation can't be opened"); return; } @@ -131,18 +131,18 @@ static void lv_rlottie_constructor(const lv_obj_class_t * class_p, lv_obj_t * ob rlottie->scanline_width = create_info.width * LV_ARGB32 / 8; - size_t allocaled_buf_size = (create_info.width * create_info.height * LV_ARGB32 / 8); - rlottie->allocated_buf = lv_malloc(allocaled_buf_size); + size_t allocated_buf_size = (create_info.width * create_info.height * LV_ARGB32 / 8); + rlottie->allocated_buf = lv_malloc(allocated_buf_size); if(rlottie->allocated_buf != NULL) { - rlottie->allocated_buffer_size = allocaled_buf_size; - memset(rlottie->allocated_buf, 0, allocaled_buf_size); + rlottie->allocated_buffer_size = allocated_buf_size; + memset(rlottie->allocated_buf, 0, allocated_buf_size); } rlottie->imgdsc.header.cf = LV_COLOR_FORMAT_ARGB8888; rlottie->imgdsc.header.h = create_info.height; rlottie->imgdsc.header.w = create_info.width; rlottie->imgdsc.data = (void *)rlottie->allocated_buf; - rlottie->imgdsc.data_size = allocaled_buf_size; + rlottie->imgdsc.data_size = allocated_buf_size; lv_image_set_src(obj, &rlottie->imgdsc); diff --git a/src/libs/thorvg/rapidjson/document.h b/src/libs/thorvg/rapidjson/document.h index d1420719b..f18fbd5f5 100644 --- a/src/libs/thorvg/rapidjson/document.h +++ b/src/libs/thorvg/rapidjson/document.h @@ -856,7 +856,7 @@ public: /*! \param a An array obtained by \c GetArray(). \note \c Array is always pass-by-value. - \note the source array is moved into this value and the sourec array becomes empty. + \note the source array is moved into this value and the source array becomes empty. */ GenericValue(Array a) RAPIDJSON_NOEXCEPT : data_(a.value_.data_) { a.value_.data_ = Data(); @@ -867,7 +867,7 @@ public: /*! \param o An object obtained by \c GetObject(). \note \c Object is always pass-by-value. - \note the source object is moved into this value and the sourec object becomes empty. + \note the source object is moved into this value and the source object becomes empty. */ GenericValue(Object o) RAPIDJSON_NOEXCEPT : data_(o.value_.data_) { o.value_.data_ = Data(); @@ -922,7 +922,7 @@ public: if (RAPIDJSON_LIKELY(this != &rhs)) { // Can't destroy "this" before assigning "rhs", otherwise "rhs" // could be used after free if it's an sub-Value of "this", - // hence the temporary danse. + // hence the temporary dance. GenericValue temp; temp.RawAssign(rhs); this->~GenericValue(); @@ -1820,7 +1820,7 @@ public: uint64_t GetUint64() const { RAPIDJSON_ASSERT(data_.f.flags & kUint64Flag); return data_.n.u64; } //! Get the value as double type. - /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessDouble() to check whether the converison is lossless. + /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessDouble() to check whether the conversion is lossless. */ double GetDouble() const { RAPIDJSON_ASSERT(IsNumber()); @@ -1832,7 +1832,7 @@ public: } //! Get the value as float type. - /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessFloat() to check whether the converison is lossless. + /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessFloat() to check whether the conversion is lossless. */ float GetFloat() const { return static_cast(GetDouble()); diff --git a/src/libs/thorvg/rapidjson/encodings.h b/src/libs/thorvg/rapidjson/encodings.h index f9f1ed181..5ee169e10 100644 --- a/src/libs/thorvg/rapidjson/encodings.h +++ b/src/libs/thorvg/rapidjson/encodings.h @@ -452,7 +452,7 @@ struct UTF32 { } }; -//! UTF-32 little endian enocoding. +//! UTF-32 little endian encoding. template struct UTF32LE : UTF32 { template @@ -609,7 +609,7 @@ enum UTFType { }; //! Dynamically select encoding according to stream's runtime-specified UTF encoding type. -/*! \note This class can be used with AutoUTFInputtStream and AutoUTFOutputStream, which provides GetType(). +/*! \note This class can be used with AutoUTFInputStream and AutoUTFOutputStream, which provides GetType(). */ template struct AutoUTF { diff --git a/src/libs/thorvg/rapidjson/pointer.h b/src/libs/thorvg/rapidjson/pointer.h index 4f6b7d6f6..d0d762d2a 100644 --- a/src/libs/thorvg/rapidjson/pointer.h +++ b/src/libs/thorvg/rapidjson/pointer.h @@ -173,7 +173,7 @@ public: //! Assignment operator. GenericPointer& operator=(const GenericPointer& rhs) { if (this != &rhs) { - // Do not delete ownAllcator + // Do not delete ownAllocator if (nameBuffer_) Allocator::Free(tokens_); @@ -191,7 +191,7 @@ public: return *this; } - //! Swap the content of this pointer with an other. + //! Swap the content of this pointer with another. /*! \param other The pointer to swap with. \note Constant complexity. @@ -525,7 +525,7 @@ public: \note There are only 3 situations when a URI cannot be resolved: - 1. A value in the path is not an array nor object. + 1. A value in the path is neither an array nor object. 2. An object value does not contain the token. 3. A token is out of range of an array value. @@ -586,7 +586,7 @@ public: \note There are only 3 situations when a value cannot be resolved: - 1. A value in the path is not an array nor object. + 1. A value in the path is neither an array nor object. 2. An object value does not contain the token. 3. A token is out of range of an array value. diff --git a/src/libs/thorvg/rapidjson/reader.h b/src/libs/thorvg/rapidjson/reader.h index 55546601e..86c1f28ea 100644 --- a/src/libs/thorvg/rapidjson/reader.h +++ b/src/libs/thorvg/rapidjson/reader.h @@ -1002,7 +1002,7 @@ private: //!@endcond for (;;) { - // Scan and copy string before "\\\"" or < 0x20. This is an optional optimzation. + // Scan and copy string before "\\\"" or < 0x20. This is an optional optimization. if (!(parseFlags & kParseValidateEncodingFlag)) ScanCopyUnescapedString(is, os); @@ -2018,7 +2018,7 @@ private: case IterativeParsingObjectInitialState: case IterativeParsingArrayInitialState: { - // Push the state(Element or MemeberValue) if we are nested in another array or value of member. + // Push the state(Element or MemberValue) if we are nested in another array or value of member. // In this way we can get the correct state on ObjectFinish or ArrayFinish by frame pop. IterativeParsingState n = src; if (src == IterativeParsingArrayInitialState || src == IterativeParsingElementDelimiterState) diff --git a/src/libs/thorvg/rapidjson/schema.h b/src/libs/thorvg/rapidjson/schema.h index cb799cbac..453e43e30 100644 --- a/src/libs/thorvg/rapidjson/schema.h +++ b/src/libs/thorvg/rapidjson/schema.h @@ -264,7 +264,7 @@ public: virtual void DestroySchemaValidator(ISchemaValidator* validator) = 0; virtual void* CreateHasher() = 0; virtual uint64_t GetHashCode(void* hasher) = 0; - virtual void DestroryHasher(void* hasher) = 0; + virtual void DestroyHasher(void* hasher) = 0; virtual void* MallocState(size_t size) = 0; virtual void FreeState(void* p) = 0; }; @@ -311,7 +311,7 @@ public: virtual void StartMissingDependentProperties() = 0; virtual void AddMissingDependentProperty(const SValue& targetName) = 0; virtual void EndMissingDependentProperties(const SValue& sourceName) = 0; - virtual void AddDependencySchemaError(const SValue& souceName, ISchemaValidator* subvalidator) = 0; + virtual void AddDependencySchemaError(const SValue& sourceName, ISchemaValidator* subvalidator) = 0; virtual bool EndDependencyErrors() = 0; virtual void DisallowedValue(const ValidateErrorCode code) = 0; @@ -468,7 +468,7 @@ struct SchemaValidationContext { ~SchemaValidationContext() { if (hasher) - factory.DestroryHasher(hasher); + factory.DestroyHasher(hasher); if (validators) { for (SizeType i = 0; i < validatorCount; i++) { if (validators[i]) { @@ -2920,7 +2920,7 @@ public: return static_cast(hasher)->GetHashCode(); } - virtual void DestroryHasher(void* hasher) { + virtual void DestroyHasher(void* hasher) { HasherType* h = static_cast(hasher); h->~HasherType(); StateAllocator::Free(h); diff --git a/src/libs/thorvg/thorvg.h b/src/libs/thorvg/thorvg.h index e591c662a..da3944c5d 100644 --- a/src/libs/thorvg/thorvg.h +++ b/src/libs/thorvg/thorvg.h @@ -255,7 +255,7 @@ struct Vertex /** - * @brief A data structure representing a triange in a texture mesh + * @brief A data structure representing a triangle in a texture mesh * * @param vertex The three vertices that make up the polygon * @@ -2010,7 +2010,7 @@ public: * It's useful when you need to save the composed scene or image from a paint object and recreate it later. * * The file format is decided by the extension name(i.e. "*.tvg") while the supported formats depend on the TVG packaging environment. - * If it doesn't support the file format, the save() method returns the @c Result::NonSuppport result. + * If it doesn't support the file format, the save() method returns the @c Result::NonSupport result. * * Once you export a paint to the file successfully, you can recreate it using the Picture class. * diff --git a/src/libs/thorvg/thorvg_capi.h b/src/libs/thorvg/thorvg_capi.h index e71452274..98b709ea2 100644 --- a/src/libs/thorvg/thorvg_capi.h +++ b/src/libs/thorvg/thorvg_capi.h @@ -86,7 +86,7 @@ typedef struct _Tvg_Canvas Tvg_Canvas; /** * \brief A structure representing a graphical element. * -* \warning The TvgPaint objects can not be shared between Canvases. +* \warning The TvgPaint objects cannot be shared between Canvases. */ typedef struct _Tvg_Paint Tvg_Paint; @@ -2277,7 +2277,7 @@ TVG_API Tvg_Animation* tvg_animation_new(void); * \brief Specifies the current frame in the animation. * * \param[in] animation A Tvg_Animation pointer to the animation object. -* \param[in] no The index of the animation frame to be displayed. The index should be less than the tvg_animatio_total_frame(). +* \param[in] no The index of the animation frame to be displayed. The index should be less than the tvg_animation_total_frame(). * * \return Tvg_Result enumeration. * \retval TVG_RESULT_SUCCESS Succeed. @@ -2469,7 +2469,7 @@ TVG_API Tvg_Result tvg_lottie_animation_set_marker(Tvg_Animation* animation, con * \brief Gets the marker count of the animation. (Experimental API) * * \param[in] animation The Tvg_Animation pointer to the Lottie animation object. -* \param[out] cnt The count value of the merkers. +* \param[out] cnt The count value of the markers. * * \return Tvg_Result enumeration. * \retval TVG_RESULT_SUCCESS Succeed. diff --git a/src/libs/thorvg/tvgCanvas.h b/src/libs/thorvg/tvgCanvas.h index 6fe923a2e..171f6aaea 100644 --- a/src/libs/thorvg/tvgCanvas.h +++ b/src/libs/thorvg/tvgCanvas.h @@ -47,7 +47,7 @@ struct Canvas::Impl ~Impl() { - //make it sure any deffered jobs + //make it sure any deferred jobs renderer->sync(); renderer->clear(); @@ -66,7 +66,7 @@ struct Canvas::Impl Result push(unique_ptr paint) { - //You can not push paints during rendering. + //You cannot push paints during rendering. if (status == Status::Drawing) return Result::InsufficientCondition; auto p = paint.release(); diff --git a/src/libs/thorvg/tvgLoader.cpp b/src/libs/thorvg/tvgLoader.cpp index eb4ba187f..8d1a3c58b 100644 --- a/src/libs/thorvg/tvgLoader.cpp +++ b/src/libs/thorvg/tvgLoader.cpp @@ -320,7 +320,7 @@ LoadModule* LoaderMgr::loader(const string& path, bool* invalid) } delete(loader); } - //Unkown MimeType. Try with the candidates in the order + //Unknown MimeType. Try with the candidates in the order for (int i = 0; i < static_cast(FileType::Raw); i++) { if (auto loader = _find(static_cast(i))) { if (loader->open(path)) { @@ -395,7 +395,7 @@ LoadModule* LoaderMgr::loader(const char* data, uint32_t size, const string& mim } } } - //Unkown MimeType. Try with the candidates in the order + //Unknown MimeType. Try with the candidates in the order for (int i = 0; i < static_cast(FileType::Raw); i++) { auto loader = _find(static_cast(i)); if (loader) { diff --git a/src/libs/thorvg/tvgLottieBuilder.cpp b/src/libs/thorvg/tvgLottieBuilder.cpp index 707c7993f..82a43cfd2 100644 --- a/src/libs/thorvg/tvgLottieBuilder.cpp +++ b/src/libs/thorvg/tvgLottieBuilder.cpp @@ -66,8 +66,8 @@ struct RenderContext Matrix* transform = nullptr; float roundness = 0.0f; bool fragmenting = false; //render context has been fragmented by filling - bool reqFragment = false; //requirment to fragment the render context - bool ownPropagator = true; //this rendering context shares the propergator + bool reqFragment = false; //requirement to fragment the render context + bool ownPropagator = true; //this rendering context shares the propagator RenderContext() { @@ -419,7 +419,7 @@ static void _repeat(LottieGroup* parent, unique_ptr path, RenderContext* shape->transform(pm ? mathMultiply(&m, pm) : m); if (ctx->roundness > 1.0f && P(shape)->rs.stroke) { - TVGERR("LOTTIE", "FIXME: Path roundesss should be applied properly!"); + TVGERR("LOTTIE", "FIXME: Path roundness should be applied properly!"); P(shape)->rs.stroke->join = StrokeJoin::Round; } @@ -1260,7 +1260,7 @@ static void _buildReference(LottieComposition* comp, LottieLayer* layer) } -static void _bulidHierarchy(LottieGroup* parent, LottieLayer* child) +static void _buildHierarchy(LottieGroup* parent, LottieLayer* child) { if (child->pid == -1) return; @@ -1318,11 +1318,11 @@ static bool _buildComposition(LottieComposition* comp, LottieGroup* parent) if (child->matte.target) { //parenting - _bulidHierarchy(parent, child->matte.target); + _buildHierarchy(parent, child->matte.target); //precomp referencing if (child->matte.target->refId) _buildReference(comp, child->matte.target); } - _bulidHierarchy(parent, child); + _buildHierarchy(parent, child); //attach the necessary font data if (child->type == LottieLayer::Text) _attachFont(comp, child); diff --git a/src/libs/thorvg/tvgLottieExpressions.cpp b/src/libs/thorvg/tvgLottieExpressions.cpp index 466173c44..aa6c9b13b 100644 --- a/src/libs/thorvg/tvgLottieExpressions.cpp +++ b/src/libs/thorvg/tvgLottieExpressions.cpp @@ -40,7 +40,7 @@ struct ExpContent }; -//reserved expressions speicifiers +//reserved expressions specifiers static const char* EXP_NAME = "name"; static const char* EXP_CONTENT = "content"; static const char* EXP_WIDTH = "width"; @@ -851,7 +851,7 @@ static jerry_value_t _key(const jerry_call_info_t* info, const jerry_value_t arg static jerry_value_t _createPath(const jerry_call_info_t* info, const jerry_value_t args[], const jerry_length_t argsCnt) { - //TODO: arg1: points, arg2: inTagents, arg3: outTangents, arg4: isClosed + //TODO: arg1: points, arg2: inTangents, arg3: outTangents, arg4: isClosed auto arg1 = jerry_value_to_object(args[0]); auto pathset = jerry_object_get_native_ptr(arg1, nullptr); if (!pathset) { @@ -872,7 +872,7 @@ static jerry_value_t _uniformPath(const jerry_call_info_t* info, const jerry_val auto pathset = static_cast(jerry_object_get_native_ptr(info->function, nullptr)); /* TODO: ThorVG prebuilds the path data for performance. - It acutally need to constructs the Array for points, inTangents, outTangents and then return here... */ + It actually need to constructs the Array for points, inTangents, outTangents and then return here... */ auto obj = jerry_object(); jerry_object_set_native_ptr(obj, nullptr, pathset); return obj; @@ -888,7 +888,7 @@ static jerry_value_t _isClosed(const jerry_call_info_t* info, const jerry_value_ static void _buildPath(jerry_value_t context, LottieExpression* exp) { - //Trick for fast buliding path. + //Trick for fast building path. auto points = jerry_function_external(_uniformPath); jerry_object_set_native_ptr(points, nullptr, exp->property); jerry_object_set_sz(context, "points", points); @@ -1224,7 +1224,7 @@ jerry_value_t LottieExpressions::evaluate(float frameNo, LottieExpression* exp) auto eval = jerry_eval((jerry_char_t *) exp->code, strlen(exp->code), JERRY_PARSE_NO_OPTS); if (jerry_value_is_exception(eval) || jerry_value_is_undefined(eval)) { - exp->enabled = false; // The feature is experimental, it will be forcely turned off if it's incompatible. + exp->enabled = false; // The feature is experimental, it will be forcefully turned off if it's incompatible. return jerry_undefined(); } diff --git a/src/libs/thorvg/tvgLottieLoader.cpp b/src/libs/thorvg/tvgLottieLoader.cpp index cbc0a4d19..8230211a6 100644 --- a/src/libs/thorvg/tvgLottieLoader.cpp +++ b/src/libs/thorvg/tvgLottieLoader.cpp @@ -298,13 +298,13 @@ bool LottieLoader::override(const char* slot) if (idx < 1) success = false; free(temp); - rebuild = overriden = success; + rebuild = overridden = success; //reset slots - } else if (overriden) { + } else if (overridden) { for (auto s = comp->slots.begin(); s < comp->slots.end(); ++s) { (*s)->reset(); } - overriden = false; + overridden = false; rebuild = true; } return success; diff --git a/src/libs/thorvg/tvgLottieLoader.h b/src/libs/thorvg/tvgLottieLoader.h index 38b4d3ac5..57ad9b7f2 100644 --- a/src/libs/thorvg/tvgLottieLoader.h +++ b/src/libs/thorvg/tvgLottieLoader.h @@ -47,7 +47,7 @@ public: char* dirName = nullptr; //base resource directory bool copy = false; //"content" is owned by this loader - bool overriden = false; //overridden properties with slots + bool overridden = false; //overridden properties with slots bool rebuild = false; //require building the lottie scene LottieLoader(); @@ -70,7 +70,7 @@ public: //Marker Supports uint32_t markersCnt(); const char* markers(uint32_t index); - bool segment(const char* marker, float& beign, float& end); + bool segment(const char* marker, float& begin, float& end); private: bool header(); diff --git a/src/libs/thorvg/tvgLottieModel.cpp b/src/libs/thorvg/tvgLottieModel.cpp index 226c24cab..5230adb4b 100644 --- a/src/libs/thorvg/tvgLottieModel.cpp +++ b/src/libs/thorvg/tvgLottieModel.cpp @@ -40,7 +40,7 @@ void LottieSlot::reset() { - if (!overriden) return; + if (!overridden) return; for (auto pair = pairs.begin(); pair < pairs.end(); ++pair) { switch (type) { @@ -67,7 +67,7 @@ void LottieSlot::reset() delete(pair->prop); pair->prop = nullptr; } - overriden = false; + overridden = false; } @@ -78,7 +78,7 @@ void LottieSlot::assign(LottieObject* target) //backup the original properties before overwriting switch (type) { case LottieProperty::Type::ColorStop: { - if (!overriden) { + if (!overridden) { pair->prop = new LottieColorStop; *static_cast(pair->prop) = static_cast(pair->obj)->colorStops; } @@ -87,7 +87,7 @@ void LottieSlot::assign(LottieObject* target) break; } case LottieProperty::Type::Color: { - if (!overriden) { + if (!overridden) { pair->prop = new LottieColor; *static_cast(pair->prop) = static_cast(pair->obj)->color; } @@ -96,7 +96,7 @@ void LottieSlot::assign(LottieObject* target) break; } case LottieProperty::Type::TextDoc: { - if (!overriden) { + if (!overridden) { pair->prop = new LottieTextDoc; *static_cast(pair->prop) = static_cast(pair->obj)->doc; } @@ -107,7 +107,7 @@ void LottieSlot::assign(LottieObject* target) default: break; } } - overriden = true; + overridden = true; } @@ -255,7 +255,7 @@ Fill* LottieGradient::fill(float frameNo, LottieExpressions* exps) auto s = start(frameNo, exps); auto e = end(frameNo, exps); - //Linear Graident + //Linear Gradient if (id == 1) { fill = LinearGradient::gen().release(); static_cast(fill)->linear(s.x, s.y, e.x, e.y); @@ -277,7 +277,7 @@ Fill* LottieGradient::fill(float frameNo, LottieExpressions* exps) auto angle = mathDeg2Rad((startAngle + this->angle(frameNo, exps))); auto fx = s.x + cos(angle) * progress * r; auto fy = s.y + sin(angle) * progress * r; - // Lottie dosen't have any focal radius concept + // Lottie doesn't have any focal radius concept P(static_cast(fill))->radial(s.x, s.y, r, fx, fy, 0.0f); } } diff --git a/src/libs/thorvg/tvgLottieModel.h b/src/libs/thorvg/tvgLottieModel.h index 277e3d264..6ba92de1c 100644 --- a/src/libs/thorvg/tvgLottieModel.h +++ b/src/libs/thorvg/tvgLottieModel.h @@ -520,7 +520,7 @@ struct LottieGroup : LottieObject Scene* scene = nullptr; //tvg render data Array children; - bool reqFragment = false; //requirment to fragment the render context + bool reqFragment = false; //requirement to fragment the render context bool buildDone = false; //completed in building the composition. bool allowMerge = true; //if this group is consisted of simple (transformed) shapes. bool trimpath = false; //this group has a trimpath. @@ -598,7 +598,7 @@ struct LottieSlot ~LottieSlot() { free(sid); - if (!overriden) return; + if (!overridden) return; for (auto pair = pairs.begin(); pair < pairs.end(); ++pair) { delete(pair->prop); } @@ -607,7 +607,7 @@ struct LottieSlot char* sid; Array pairs; LottieProperty::Type type; - bool overriden = false; + bool overridden = false; }; diff --git a/src/libs/thorvg/tvgLottieParser.cpp b/src/libs/thorvg/tvgLottieParser.cpp index 00890e43a..17e43b09e 100644 --- a/src/libs/thorvg/tvgLottieParser.cpp +++ b/src/libs/thorvg/tvgLottieParser.cpp @@ -235,7 +235,7 @@ void LottieParser::getValue(PathSet& path) Array outPts; Array outCmds; - //Resuse the buffers + //Reuse the buffers outPts.data = path.pts; outPts.reserved = path.ptsCnt; outCmds.data = path.cmds; @@ -350,7 +350,7 @@ void LottieParser::getValue(RGB24& color) } -void LottieParser::getInperpolatorPoint(Point& pt) +void LottieParser::getInterpolatorPoint(Point& pt) { enterObject(); while (auto key = nextObjectKey()) { @@ -432,9 +432,9 @@ void LottieParser::parseKeyFrame(T& prop) while (auto key = nextObjectKey()) { if (KEY_AS("i")) { interpolator = true; - getInperpolatorPoint(inTangent); + getInterpolatorPoint(inTangent); } else if (KEY_AS("o")) { - getInperpolatorPoint(outTangent); + getInterpolatorPoint(outTangent); } else if (KEY_AS("n")) { if (peekType() == kStringType) { interpolatorKey = getString(); @@ -906,7 +906,7 @@ LottieImage* LottieParser::parseImage(const char* data, const char* subPath, boo //Used for Image Asset auto image = new LottieImage; - //embeded image resource. should start with "data:" + //embedded image resource. should start with "data:" //header look like "data:image/png;base64," so need to skip till ','. if (embedded && !strncmp(data, "data:", 5)) { //figure out the mimetype @@ -1016,7 +1016,7 @@ void LottieParser::parseMarkers() } } -void LottieParser::parseChars(Array& glyphes) +void LottieParser::parseChars(Array& glyphs) { enterArray(); while (nextArrayValue()) { @@ -1038,7 +1038,7 @@ void LottieParser::parseChars(Array& glyphes) } else skip(key); } glyph->prepare(); - glyphes.push(glyph); + glyphs.push(glyph); } } @@ -1287,11 +1287,11 @@ LottieLayer* LottieParser::parseLayers() } -void LottieParser::postProcess(Array& glyphes) +void LottieParser::postProcess(Array& glyphs) { //aggregate font characters - for (uint32_t g = 0; g < glyphes.count; ++g) { - auto glyph = glyphes[g]; + for (uint32_t g = 0; g < glyphs.count; ++g) { + auto glyph = glyphs[g]; for (uint32_t i = 0; i < comp->fonts.count; ++i) { auto& font = comp->fonts[i]; if (!strcmp(font->family, glyph->family) && !strcmp(font->style, glyph->style)) { @@ -1370,7 +1370,7 @@ bool LottieParser::parse() comp = new LottieComposition; if (!comp) return false; - Array glyphes; + Array glyphs; while (auto key = nextObjectKey()) { if (KEY_AS("v")) comp->version = getStringCopy(); @@ -1383,7 +1383,7 @@ bool LottieParser::parse() else if (KEY_AS("assets")) parseAssets(); else if (KEY_AS("layers")) comp->root = parseLayers(); else if (KEY_AS("fonts")) parseFonts(); - else if (KEY_AS("chars")) parseChars(glyphes); + else if (KEY_AS("chars")) parseChars(glyphs); else if (KEY_AS("markers")) parseMarkers(); else skip(key); } @@ -1396,7 +1396,7 @@ bool LottieParser::parse() comp->root->inFrame = comp->startFrame; comp->root->outFrame = comp->endFrame; - postProcess(glyphes); + postProcess(glyphs); return true; } diff --git a/src/libs/thorvg/tvgLottieParser.h b/src/libs/thorvg/tvgLottieParser.h index 9192e6502..a8b6b0d9f 100644 --- a/src/libs/thorvg/tvgLottieParser.h +++ b/src/libs/thorvg/tvgLottieParser.h @@ -56,7 +56,7 @@ private: LottieInterpolator* getInterpolator(const char* key, Point& in, Point& out); uint8_t getDirection(); - void getInperpolatorPoint(Point& pt); + void getInterpolatorPoint(Point& pt); void getPathSet(LottiePathSet& path); void getLayerSize(float& val); void getValue(TextDocument& doc); @@ -107,9 +107,9 @@ private: void parseTextRange(LottieText* text); void parseAssets(); void parseFonts(); - void parseChars(Array& glyphes); + void parseChars(Array& glyphs); void parseMarkers(); - void postProcess(Array& glyphes); + void postProcess(Array& glyphs); //Current parsing context struct Context { diff --git a/src/libs/thorvg/tvgLottieParserHandler.cpp b/src/libs/thorvg/tvgLottieParserHandler.cpp index 6a5dae3ef..4d00441b8 100644 --- a/src/libs/thorvg/tvgLottieParserHandler.cpp +++ b/src/libs/thorvg/tvgLottieParserHandler.cpp @@ -206,7 +206,7 @@ const char* LookaheadParserHandler::nextObjectKey() return result; } - /* SPECIAL CASE: The parser works with a prdefined rule that it will be only + /* SPECIAL CASE: The parser works with a predefined rule that it will be only while (nextObjectKey()) for each object but in case of our nested group object we can call multiple time nextObjectKey() while exiting the object so ignore those and don't put parser in the error state. */ diff --git a/src/libs/thorvg/tvgSaver.cpp b/src/libs/thorvg/tvgSaver.cpp index 620a25162..f2a22ec6c 100644 --- a/src/libs/thorvg/tvgSaver.cpp +++ b/src/libs/thorvg/tvgSaver.cpp @@ -125,7 +125,7 @@ Result Saver::save(std::unique_ptr paint, const string& path, bool compre auto p = paint.release(); if (!p) return Result::MemoryCorruption; - //Already on saving an other resource. + //Already on saving another resource. if (pImpl->saveModule) { if (P(p)->refCnt == 0) delete(p); return Result::InsufficientCondition; @@ -168,7 +168,7 @@ Result Saver::save(unique_ptr animation, const string& path, uint32_t return Result::InsufficientCondition; } - //Already on saving an other resource. + //Already on saving another resource. if (pImpl->saveModule) { if (remove) delete(a); return Result::InsufficientCondition; diff --git a/src/libs/thorvg/tvgScene.h b/src/libs/thorvg/tvgScene.h index 41c0156e9..8347d924d 100644 --- a/src/libs/thorvg/tvgScene.h +++ b/src/libs/thorvg/tvgScene.h @@ -108,7 +108,7 @@ struct Scene::Impl { if ((needComp = needComposition(opacity))) { /* Overriding opacity value. If this scene is half-translucent, - It must do intermeidate composition with that opacity value. */ + It must do intermediate composition with that opacity value. */ this->opacity = opacity; opacity = 255; } diff --git a/src/libs/thorvg/tvgShape.h b/src/libs/thorvg/tvgShape.h index 9fcea0e0e..bb5e6f37f 100644 --- a/src/libs/thorvg/tvgShape.h +++ b/src/libs/thorvg/tvgShape.h @@ -102,7 +102,7 @@ struct Shape::Impl { if ((needComp = needComposition(opacity))) { /* Overriding opacity value. If this scene is half-translucent, - It must do intermeidate composition with that opacity value. */ + It must do intermediate composition with that opacity value. */ this->opacity = opacity; opacity = 255; } diff --git a/src/libs/thorvg/tvgSvgLoader.cpp b/src/libs/thorvg/tvgSvgLoader.cpp index 312a3b70b..34ca2c5b4 100644 --- a/src/libs/thorvg/tvgSvgLoader.cpp +++ b/src/libs/thorvg/tvgSvgLoader.cpp @@ -583,7 +583,7 @@ static constexpr struct }; -static bool _hslToRgb(float hue, float satuation, float brightness, uint8_t* red, uint8_t* green, uint8_t* blue) +static bool _hslToRgb(float hue, float saturation, float brightness, uint8_t* red, uint8_t* green, uint8_t* blue) { if (!red || !green || !blue) return false; @@ -591,12 +591,12 @@ static bool _hslToRgb(float hue, float satuation, float brightness, uint8_t* red float _red = 0, _green = 0, _blue = 0; uint32_t i = 0; - if (mathZero(satuation)) _red = _green = _blue = brightness; + if (mathZero(saturation)) _red = _green = _blue = brightness; else { if (mathEqual(hue, 360.0)) hue = 0.0f; hue /= 60.0f; - v = (brightness <= 0.5f) ? (brightness * (1.0f + satuation)) : (brightness + satuation - (brightness * satuation)); + v = (brightness <= 0.5f) ? (brightness * (1.0f + saturation)) : (brightness + saturation - (brightness * saturation)); p = brightness + brightness - v; if (!mathZero(v)) sv = (v - p) / v; @@ -665,7 +665,7 @@ static bool _toColor(const char* str, uint8_t* r, uint8_t* g, uint8_t* b, char** unsigned char tr, tg, tb; if (len == 4 && str[0] == '#') { - //Case for "#456" should be interprete as "#445566" + //Case for "#456" should be interpreted as "#445566" if (isxdigit(str[1]) && isxdigit(str[2]) && isxdigit(str[3])) { char tmp[3] = { '\0', '\0', '\0' }; tmp[0] = str[1]; @@ -713,7 +713,7 @@ static bool _toColor(const char* str, uint8_t* r, uint8_t* g, uint8_t* b, char** return true; } else if (len >= 10 && (str[0] == 'h' || str[0] == 'H') && (str[1] == 's' || str[1] == 'S') && (str[2] == 'l' || str[2] == 'L') && str[3] == '(' && str[len - 1] == ')') { float th, ts, tb; - const char *content, *hue, *satuation, *brightness; + const char *content, *hue, *saturation, *brightness; content = str + 4; content = _skipSpace(content, nullptr); if (_parseNumber(&content, &hue, &th) && hue) { @@ -721,12 +721,12 @@ static bool _toColor(const char* str, uint8_t* r, uint8_t* g, uint8_t* b, char** hue = _skipSpace(hue, nullptr); hue = (char*)_skipComma(hue); hue = _skipSpace(hue, nullptr); - if (_parseNumber(&hue, &satuation, &ts) && satuation && *satuation == '%') { + if (_parseNumber(&hue, &saturation, &ts) && saturation && *saturation == '%') { ts /= 100.0f; - satuation = _skipSpace(satuation + 1, nullptr); - satuation = (char*)_skipComma(satuation); - satuation = _skipSpace(satuation, nullptr); - if (_parseNumber(&satuation, &brightness, &tb) && brightness && *brightness == '%') { + saturation = _skipSpace(saturation + 1, nullptr); + saturation = (char*)_skipComma(saturation); + saturation = _skipSpace(saturation, nullptr); + if (_parseNumber(&saturation, &brightness, &tb) && brightness && *brightness == '%') { tb /= 100.0f; brightness = _skipSpace(brightness + 1, nullptr); if (brightness && brightness[0] == ')' && brightness[1] == '\0') { @@ -3257,7 +3257,7 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content, else parent = loader->doc; if (!strcmp(tagName, "style")) { // TODO: For now only the first style node is saved. After the css id selector - // is introduced this if condition shouldin't be necessary any more + // is introduced this if condition shouldn't be necessary any more if (!loader->cssStyle) { node = method(loader, nullptr, attrs, attrsLength, simpleXmlParseAttributes); loader->cssStyle = node; diff --git a/src/libs/thorvg/tvgSvgPath.cpp b/src/libs/thorvg/tvgSvgPath.cpp index 52e0dec97..42312c37b 100644 --- a/src/libs/thorvg/tvgSvgPath.cpp +++ b/src/libs/thorvg/tvgSvgPath.cpp @@ -193,7 +193,7 @@ void _pathAppendArcTo(Array* cmds, Array* pts, Point* cur, P cx += (sx + x) / 2.0f; cy += (sy + y) / 2.0f; - //Sstep 4 (F6.5.4) + //Step 4 (F6.5.4) //We dont' use arccos (as per w3c doc), see //http://www.euclideanspace.com/maths/algebra/vectors/angleBetween/index.htm //Note: atan2 (0.0, 1.0) == 0.0 diff --git a/src/libs/thorvg/tvgSvgSceneBuilder.cpp b/src/libs/thorvg/tvgSvgSceneBuilder.cpp index 7d13bd4d1..585e487a2 100644 --- a/src/libs/thorvg/tvgSvgSceneBuilder.cpp +++ b/src/libs/thorvg/tvgSvgSceneBuilder.cpp @@ -148,7 +148,7 @@ static unique_ptr _applyRadialGradientProperty(SvgStyleGradient* if (isTransform) finalTransform = *g->transform; if (g->userSpace) { - //The radius scalling is done according to the Units section: + //The radius scaling is done according to the Units section: //https://www.w3.org/TR/2015/WD-SVG2-20150915/coords.html g->radial->cx = g->radial->cx * vBox.w; g->radial->cy = g->radial->cy * vBox.h; diff --git a/src/libs/thorvg/tvgSwRaster.cpp b/src/libs/thorvg/tvgSwRaster.cpp index 686712fc8..237e30de7 100644 --- a/src/libs/thorvg/tvgSwRaster.cpp +++ b/src/libs/thorvg/tvgSwRaster.cpp @@ -868,11 +868,11 @@ static bool _rasterCompositeDirectMaskedRleImage(SwSurface* surface, const SwIma { auto span = image->rle->spans; auto cbuffer = surface->compositor->image.buf8; - auto ctride = surface->compositor->image.stride; + auto cstride = surface->compositor->image.stride; for (uint32_t i = 0; i < image->rle->size; ++i, ++span) { auto src = image->buf8 + (span->y + image->oy) * image->stride + (span->x + image->ox); - auto cmp = &cbuffer[span->y * ctride + span->x]; + auto cmp = &cbuffer[span->y * cstride + span->x]; auto alpha = MULTIPLY(span->coverage, opacity); if (alpha == 255) { for (uint32_t x = 0; x < span->len; ++x, ++src, ++cmp) { @@ -893,11 +893,11 @@ static bool _rasterDirectDirectMaskedRleImage(SwSurface* surface, const SwImage* { auto span = image->rle->spans; auto cbuffer = surface->compositor->image.buf8; - auto ctride = surface->compositor->image.stride; + auto cstride = surface->compositor->image.stride; for (uint32_t i = 0; i < image->rle->size; ++i, ++span) { auto src = image->buf8 + (span->y + image->oy) * image->stride + (span->x + image->ox); - auto cmp = &cbuffer[span->y * ctride + span->x]; + auto cmp = &cbuffer[span->y * cstride + span->x]; auto dst = &surface->buf8[span->y * surface->stride + span->x]; auto alpha = MULTIPLY(span->coverage, opacity); if (alpha == 255) { @@ -1949,7 +1949,7 @@ bool rasterConvertCS(Surface* surface, ColorSpace to) ScopedLock lock(surface->key); if (surface->cs == to) return true; - //TOOD: Support SIMD accelerations + //TODO: Support SIMD accelerations auto from = surface->cs; if (((from == ColorSpace::ABGR8888) || (from == ColorSpace::ABGR8888S)) && ((to == ColorSpace::ARGB8888) || (to == ColorSpace::ARGB8888S))) { diff --git a/src/libs/thorvg/tvgSwRasterAvx.h b/src/libs/thorvg/tvgSwRasterAvx.h index 742d7ec42..82c177ce3 100644 --- a/src/libs/thorvg/tvgSwRasterAvx.h +++ b/src/libs/thorvg/tvgSwRasterAvx.h @@ -180,7 +180,7 @@ static bool avxRasterTranslucentRle(SwSurface* surface, const SwRleData* rle, ui } //2. fill the aligned memory using avx - N_32BITS_IN_128REG pixels processed at once - //In order to avoid unneccessary avx variables declarations a check is made whether there are any iterations at all + //In order to avoid unnecessary avx variables declarations a check is made whether there are any iterations at all uint32_t iterations = (span->len - notAligned) / N_32BITS_IN_128REG; uint32_t avxFilled = 0; if (iterations > 0) { diff --git a/src/libs/thorvg/tvgSwRenderer.cpp b/src/libs/thorvg/tvgSwRenderer.cpp index f793bf64a..70234a952 100644 --- a/src/libs/thorvg/tvgSwRenderer.cpp +++ b/src/libs/thorvg/tvgSwRenderer.cpp @@ -232,7 +232,7 @@ struct SwSceneTask : SwTask void run(unsigned tid) override { - //TODO: Skip the run if the scene hans't changed. + //TODO: Skip the run if the scene hasn't changed. if (!sceneRle) sceneRle = static_cast(calloc(1, sizeof(SwRleData))); else rleReset(sceneRle); diff --git a/src/libs/thorvg/tvgSwRle.cpp b/src/libs/thorvg/tvgSwRle.cpp index b0d1b4241..689f2fe1f 100644 --- a/src/libs/thorvg/tvgSwRle.cpp +++ b/src/libs/thorvg/tvgSwRle.cpp @@ -325,7 +325,7 @@ static void _genSpan(SwRleData* rle, const SwSpan* spans, uint32_t count) } -static void _horizLine(RleWorker& rw, SwCoord x, SwCoord y, SwCoord area, SwCoord acount) +static void _horizLine(RleWorker& rw, SwCoord x, SwCoord y, SwCoord area, SwCoord aCount) { x += rw.cellMin.x; y += rw.cellMin.y; @@ -349,11 +349,11 @@ static void _horizLine(RleWorker& rw, SwCoord x, SwCoord y, SwCoord area, SwCoor //span has ushort coordinates. check limit overflow if (x >= SHRT_MAX) { - TVGERR("SW_ENGINE", "X-coordiante overflow!"); + TVGERR("SW_ENGINE", "X-coordinate overflow!"); x = SHRT_MAX; } if (y >= SHRT_MAX) { - TVGERR("SW_ENGINE", "Y Coordiante overflow!"); + TVGERR("SW_ENGINE", "Y Coordinate overflow!"); y = SHRT_MAX; } @@ -368,11 +368,11 @@ static void _horizLine(RleWorker& rw, SwCoord x, SwCoord y, SwCoord area, SwCoor //Clip x range SwCoord xOver = 0; - if (x + acount >= rw.cellMax.x) xOver -= (x + acount - rw.cellMax.x); + if (x + aCount >= rw.cellMax.x) xOver -= (x + aCount - rw.cellMax.x); if (x < rw.cellMin.x) xOver -= (rw.cellMin.x - x); - //span->len += (acount + xOver) - 1; - span->len += (acount + xOver); + //span->len += (aCount + xOver) - 1; + span->len += (aCount + xOver); return; } @@ -387,19 +387,19 @@ static void _horizLine(RleWorker& rw, SwCoord x, SwCoord y, SwCoord area, SwCoor //Clip x range SwCoord xOver = 0; - if (x + acount >= rw.cellMax.x) xOver -= (x + acount - rw.cellMax.x); + if (x + aCount >= rw.cellMax.x) xOver -= (x + aCount - rw.cellMax.x); if (x < rw.cellMin.x) { xOver -= (rw.cellMin.x - x); x = rw.cellMin.x; } //Nothing to draw - if (acount + xOver <= 0) return; + if (aCount + xOver <= 0) return; //add a span to the current list span->x = x; span->y = y; - span->len = (acount + xOver); + span->len = (aCount + xOver); span->coverage = coverage; ++rw.spansCnt; rw.ySpan = y; @@ -772,7 +772,7 @@ static SwSpan* _intersectSpansRegion(const SwRleData *clip, const SwRleData *tar auto clipEnd = clip->spans + clip->size; while (spans < end && clipSpans < clipEnd) { - //align y cooridnates. + //align y coordinates. if (clipSpans->y > spans->y) { ++spans; continue; diff --git a/src/libs/thorvg/tvgSwShape.cpp b/src/libs/thorvg/tvgSwShape.cpp index bdfabb61c..e2652c1ea 100644 --- a/src/libs/thorvg/tvgSwShape.cpp +++ b/src/libs/thorvg/tvgSwShape.cpp @@ -295,7 +295,7 @@ static SwOutline* _genDashOutline(const RenderShape* rshape, const Matrix* trans } trimmed = true; - //just a dasy style. + //just a dash style. } else { if (dash.cnt == 0) return nullptr; } diff --git a/src/libs/thorvg/tvgSwStroke.cpp b/src/libs/thorvg/tvgSwStroke.cpp index bfee9f75a..954250c8c 100644 --- a/src/libs/thorvg/tvgSwStroke.cpp +++ b/src/libs/thorvg/tvgSwStroke.cpp @@ -665,7 +665,7 @@ static void _beginSubPath(SwStroke& stroke, const SwPoint& to, bool closed) /* Determine if we need to check whether the border radius is greater than the radius of curvature of a curve, to handle this case specially. This is only required if bevel joins or butt caps may be created because - round & miter joins and round & square caps cover the nagative sector + round & miter joins and round & square caps cover the negative sector created with wide strokes. */ if ((stroke.join != StrokeJoin::Round) || (!stroke.closedSubPath && stroke.cap == StrokeCap::Butt)) stroke.handleWideStrokes = true; @@ -718,7 +718,7 @@ static void _endSubPath(SwStroke& stroke) _addCap(stroke, stroke.subPathAngle + SW_ANGLE_PI, 0); /* now end the right subpath accordingly. The left one is rewind - and deosn't need further processing */ + and doesn't need further processing */ _borderClose(right, false); } } @@ -862,7 +862,7 @@ bool strokeParseOutline(SwStroke* stroke, const SwOutline& outline) ++pt; ++types; - //emit a signel line_to + //emit a single line_to if (types[0] == SW_CURVE_TYPE_POINT) { _lineTo(*stroke, *pt); //types cubic diff --git a/src/libs/tiny_ttf/stb_rect_pack.h b/src/libs/tiny_ttf/stb_rect_pack.h index b265df907..b4c8b4d0b 100644 --- a/src/libs/tiny_ttf/stb_rect_pack.h +++ b/src/libs/tiny_ttf/stb_rect_pack.h @@ -469,7 +469,7 @@ static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context * context, // insert the new node into the right starting point, and // let 'cur' point to the remaining nodes needing to be - // stiched back in + // stitched back in cur = *res.prev_link; if(cur->x < res.x) { diff --git a/src/libs/tiny_ttf/stb_truetype_htcw.h b/src/libs/tiny_ttf/stb_truetype_htcw.h index e91997b4b..9efa0240b 100644 --- a/src/libs/tiny_ttf/stb_truetype_htcw.h +++ b/src/libs/tiny_ttf/stb_truetype_htcw.h @@ -912,7 +912,7 @@ STBTT_DEF unsigned char * stbtt_GetCodepointBitmap(const stbtt_fontinfo * info, STBTT_DEF unsigned char * stbtt_GetCodepointBitmapSubpixel(const stbtt_fontinfo * info, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint, int * width, int * height, int * xoff, int * yoff); -// the same as stbtt_GetCodepoitnBitmap, but you can specify a subpixel +// the same as stbtt_GetCodepointBitmap, but you can specify a subpixel // shift for the character STBTT_DEF void stbtt_MakeCodepointBitmap(const stbtt_fontinfo * info, unsigned char * output, int out_w, int out_h, diff --git a/src/libs/tjpgd/tjpgd.c b/src/libs/tjpgd/tjpgd.c index f53810d73..7152adf17 100644 --- a/src/libs/tjpgd/tjpgd.c +++ b/src/libs/tjpgd/tjpgd.c @@ -316,7 +316,7 @@ static int huffext( /* >=0: decoded data, <0: error code */ dc--; /* Decrement number of available bytes */ if(flg) { /* In flag sequence? */ flg = 0; /* Exit flag sequence */ - if(*dp != 0) return 0 - (int)JDR_FMT1; /* Err: unexpected flag is detected (may be collapted data) */ + if(*dp != 0) return 0 - (int)JDR_FMT1; /* Err: unexpected flag is detected (may be corrupted data) */ *dp = 0xFF; /* The flag is a data 0xFF */ } else { @@ -426,7 +426,7 @@ static int huffext( /* >=0: decoded data, <0: error code */ } #endif - return 0 - (int)JDR_FMT1; /* Err: code not found (may be collapted data) */ + return 0 - (int)JDR_FMT1; /* Err: code not found (may be corrupted data) */ } @@ -462,7 +462,7 @@ static int bitext( /* >=0: extracted data, <0: error code */ dc--; /* Decrement number of available bytes */ if(flg) { /* In flag sequence? */ flg = 0; /* Exit flag sequence */ - if(*dp != 0) return 0 - (int)JDR_FMT1; /* Err: unexpected flag is detected (may be collapted data) */ + if(*dp != 0) return 0 - (int)JDR_FMT1; /* Err: unexpected flag is detected (may be corrupted data) */ *dp = 0xFF; /* The flag is a data 0xFF */ } else { @@ -534,7 +534,7 @@ static int bitext( /* >=0: extracted data, <0: error code */ JRESULT jd_restart( JDEC * jd, /* Pointer to the decompressor object */ - uint16_t rstn /* Expected restert sequence number */ + uint16_t rstn /* Expected restart sequence number */ ) { unsigned int i; @@ -563,7 +563,7 @@ JRESULT jd_restart( /* Check the marker */ if((d & 0xFFD8) != 0xFFD0 || (d & 7) != (rstn & 7)) { - return JDR_FMT1; /* Err: expected RSTn marker is not detected (may be collapted data) */ + return JDR_FMT1; /* Err: expected RSTn marker is not detected (may be corrupted data) */ } #else @@ -591,7 +591,7 @@ JRESULT jd_restart( /* Check the marker */ if((marker & 0xFFD8) != 0xFFD0 || (marker & 7) != (rstn & 7)) { - return JDR_FMT1; /* Err: expected RSTn marker was not detected (may be collapted data) */ + return JDR_FMT1; /* Err: expected RSTn marker was not detected (may be corrupted data) */ } jd->dbit = 0; /* Discard stuff bits */ @@ -892,7 +892,7 @@ JRESULT jd_mcu_output( /* Squeeze up pixel table if a part of MCU is to be truncated */ mx >>= jd->scale; - if(rx < mx) { /* Is the MCU spans rigit edge? */ + if(rx < mx) { /* Is the MCU spans right edge? */ uint8_t * s, * d; unsigned int xi, yi; @@ -940,7 +940,7 @@ JRESULT jd_mcu_output( JRESULT jd_prepare( JDEC * jd, /* Blank decompressor object */ - size_t (*infunc)(JDEC *, uint8_t *, size_t), /* JPEG strem input function */ + size_t (*infunc)(JDEC *, uint8_t *, size_t), /* JPEG stream input function */ void * pool, /* Working buffer for the decompression session */ size_t sz_pool, /* Size of working buffer */ void * dev /* I/O device identifier for the session */ @@ -977,7 +977,7 @@ JRESULT jd_prepare( marker = LDB_WORD(seg); /* Marker */ len = LDB_WORD(seg + 2); /* Length field */ if(len <= 2 || (marker >> 8) != 0xFF) return JDR_FMT1; - len -= 2; /* Segent content size */ + len -= 2; /* Segment content size */ ofs += 4 + len; /* Number of bytes loaded */ switch(marker & 0xFF) { @@ -1023,7 +1023,7 @@ JRESULT jd_prepare( if(rc) return rc; break; - case 0xDB: /* DQT - Define Quaitizer Tables */ + case 0xDB: /* DQT - Define Quantizer Tables */ if(len > JD_SZBUF) return JDR_MEM2; if(jd->infunc(jd, seg, len) != len) return JDR_INP; /* Load segment data */ @@ -1044,7 +1044,7 @@ JRESULT jd_prepare( if(b != 0x00 && b != 0x11) return JDR_FMT3; /* Err: Different table number for DC/AC element */ n = i ? 1 : 0; /* Component class */ if(!jd->huffbits[n][0] || !jd->huffbits[n][1]) { /* Check huffman table for this component */ - return JDR_FMT1; /* Err: Nnot loaded */ + return JDR_FMT1; /* Err: Not loaded */ } if(!jd->qttbl[jd->qtid[i]]) { /* Check dequantizer table for this component */ return JDR_FMT1; /* Err: Not loaded */ @@ -1083,7 +1083,7 @@ JRESULT jd_prepare( case 0xCE: /* SOF14 */ case 0xCF: /* SOF15 */ case 0xD9: /* EOI */ - return JDR_FMT3; /* Unsuppoted JPEG standard (may be progressive JPEG) */ + return JDR_FMT3; /* Unsupported JPEG standard (may be progressive JPEG) */ default: /* Unknown segment (comment, exif or etc..) */ /* Skip segment data (null pointer specifies to remove data from the stream) */ diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index 4496d9a6c..fee35a97f 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -1243,7 +1243,7 @@ #endif /*Export integer constant to binding. This macro is used with constants in the form of LV_ that - *should also appear on LVGL binding API such as Micropython.*/ + *should also appear on LVGL binding API such as MicroPython.*/ #ifndef LV_EXPORT_CONST_INT #ifdef CONFIG_LV_EXPORT_CONST_INT #define LV_EXPORT_CONST_INT CONFIG_LV_EXPORT_CONST_INT @@ -1609,7 +1609,7 @@ #endif /*Enable Arabic/Persian processing - *In these languages characters should be replaced with an other form based on their position in the text*/ + *In these languages characters should be replaced with another form based on their position in the text*/ #ifndef LV_USE_ARABIC_PERSIAN_CHARS #ifdef CONFIG_LV_USE_ARABIC_PERSIAN_CHARS #define LV_USE_ARABIC_PERSIAN_CHARS CONFIG_LV_USE_ARABIC_PERSIAN_CHARS @@ -2892,7 +2892,7 @@ #endif #if LV_USE_IME_PINYIN /*1: Use default thesaurus*/ - /*If you do not use the default thesaurus, be sure to use `lv_ime_pinyin` after setting the thesauruss*/ + /*If you do not use the default thesaurus, be sure to use `lv_ime_pinyin` after setting the thesaurus*/ #ifndef LV_IME_PINYIN_USE_DEFAULT_DICT #ifdef _LV_KCONFIG_PRESENT #ifdef CONFIG_LV_IME_PINYIN_USE_DEFAULT_DICT @@ -3063,7 +3063,7 @@ #define LV_X11_DOUBLE_BUFFER 0 #endif #else - #define LV_X11_DOUBLE_BUFFER 1 /*Use double buffers for endering*/ + #define LV_X11_DOUBLE_BUFFER 1 /*Use double buffers for rendering*/ #endif #endif /*select only 1 of the following render modes (LV_X11_RENDER_MODE_PARTIAL preferred!)*/ diff --git a/src/misc/lv_anim.c b/src/misc/lv_anim.c index ebab4e6fe..f744cfc0b 100644 --- a/src/misc/lv_anim.c +++ b/src/misc/lv_anim.c @@ -133,8 +133,8 @@ uint32_t lv_anim_get_playtime(const lv_anim_t * a) return LV_ANIM_PLAYTIME_INFINITE; } - uint32_t repeate_cnt = a->repeat_cnt; - if(repeate_cnt < 1) repeate_cnt = 1; + uint32_t repeat_cnt = a->repeat_cnt; + if(repeat_cnt < 1) repeat_cnt = 1; uint32_t playtime = a->repeat_delay + a->duration + a->playback_delay + a->playback_duration; playtime = playtime * a->repeat_cnt; diff --git a/src/misc/lv_area.h b/src/misc/lv_area.h index 27b08e023..9a0c8a847 100644 --- a/src/misc/lv_area.h +++ b/src/misc/lv_area.h @@ -215,13 +215,13 @@ bool _lv_area_is_point_on(const lv_area_t * a_p, const lv_point_t * p_p, int32_t /** * Check if two area has common parts * @param a1_p pointer to an area. - * @param a2_p pointer to an other area + * @param a2_p pointer to another area * @return false: a1_p and a2_p has no common parts */ bool _lv_area_is_on(const lv_area_t * a1_p, const lv_area_t * a2_p); /** - * Check if an area is fully on an other + * Check if an area is fully on another * @param ain_p pointer to an area which could be in 'aholder_p' * @param aholder_p pointer to an area which could involve 'ain_p' * @param radius radius of `aholder_p` (e.g. for rounded rectangle) @@ -230,7 +230,7 @@ bool _lv_area_is_on(const lv_area_t * a1_p, const lv_area_t * a2_p); bool _lv_area_is_in(const lv_area_t * ain_p, const lv_area_t * aholder_p, int32_t radius); /** - * Check if an area is fully out of an other + * Check if an area is fully out of another * @param aout_p pointer to an area which could be in 'aholder_p' * @param aholder_p pointer to an area which could involve 'ain_p' * @param radius radius of `aholder_p` (e.g. for rounded rectangle) @@ -246,7 +246,7 @@ bool _lv_area_is_out(const lv_area_t * aout_p, const lv_area_t * aholder_p, int3 bool _lv_area_is_equal(const lv_area_t * a, const lv_area_t * b); /** - * Align an area to an other + * Align an area to another * @param base an area where the other will be aligned * @param to_align the area to align * @param align `LV_ALIGN_...` @@ -262,7 +262,7 @@ void lv_area_align(const lv_area_t * base, lv_area_t * to_align, lv_align_t alig * @param scale_x horizontal zoom, 256 means 100% * @param scale_y vertical zoom, 256 means 100% * @param pivot pointer to the pivot point of the transformation - * @param zoom_first true: zoom first and rotate after that; else: opssoite order + * @param zoom_first true: zoom first and rotate after that; else: opposite order */ void lv_point_transform(lv_point_t * point, int32_t angle, int32_t scale_x, int32_t scale_y, const lv_point_t * pivot, bool zoom_first); @@ -275,7 +275,7 @@ void lv_point_transform(lv_point_t * point, int32_t angle, int32_t scale_x, int3 * @param scale_x horizontal zoom, 256 means 100% * @param scale_y vertical zoom, 256 means 100% * @param pivot pointer to the pivot point of the transformation - * @param zoom_first true: zoom first and rotate after that; else: opssoite order + * @param zoom_first true: zoom first and rotate after that; else: opposite order */ void lv_point_array_transform(lv_point_t * points, size_t count, int32_t angle, int32_t scale_x, int32_t scale_y, const lv_point_t * pivot, diff --git a/src/misc/lv_bidi.c b/src/misc/lv_bidi.c index a4bbb2e02..f3a0f7489 100644 --- a/src/misc/lv_bidi.c +++ b/src/misc/lv_bidi.c @@ -17,7 +17,7 @@ /********************* * DEFINES *********************/ -#define LV_BIDI_BRACKLET_DEPTH 4 +#define LV_BIDI_BRACKET_DEPTH 4 // Highest bit of the 16-bit pos_conv value specifies whether this pos is RTL or not #define GET_POS(x) ((x) & 0x7FFF) @@ -28,12 +28,12 @@ * TYPEDEFS **********************/ typedef struct { - uint32_t bracklet_pos; + uint32_t bracket_pos; lv_base_dir_t dir; } bracket_stack_t; typedef struct { - bracket_stack_t br_stack[LV_BIDI_BRACKLET_DEPTH]; + bracket_stack_t br_stack[LV_BIDI_BRACKET_DEPTH]; uint8_t br_stack_p; } lv_bidi_ctx_t; @@ -640,9 +640,9 @@ static lv_base_dir_t bracket_process(lv_bidi_ctx_t * ctx, const char * txt, uint /*The letter was an opening bracket*/ if(bracket_left[i] != '\0') { - if(bracket_dir == LV_BASE_DIR_NEUTRAL || ctx->br_stack_p == LV_BIDI_BRACKLET_DEPTH) return LV_BASE_DIR_NEUTRAL; + if(bracket_dir == LV_BASE_DIR_NEUTRAL || ctx->br_stack_p == LV_BIDI_BRACKET_DEPTH) return LV_BASE_DIR_NEUTRAL; - ctx->br_stack[ctx->br_stack_p].bracklet_pos = i; + ctx->br_stack[ctx->br_stack_p].bracket_pos = i; ctx->br_stack[ctx->br_stack_p].dir = bracket_dir; ctx->br_stack_p++; @@ -650,7 +650,7 @@ static lv_base_dir_t bracket_process(lv_bidi_ctx_t * ctx, const char * txt, uint } else if(ctx->br_stack_p > 0) { /*Is the letter a closing bracket of the last opening?*/ - if(letter == bracket_right[ctx->br_stack[ctx->br_stack_p - 1].bracklet_pos]) { + if(letter == bracket_right[ctx->br_stack[ctx->br_stack_p - 1].bracket_pos]) { bracket_dir = ctx->br_stack[ctx->br_stack_p - 1].dir; ctx->br_stack_p--; return bracket_dir; diff --git a/src/misc/lv_ll.h b/src/misc/lv_ll.h index 4221b68fe..7a9007c8f 100644 --- a/src/misc/lv_ll.h +++ b/src/misc/lv_ll.h @@ -142,7 +142,7 @@ void lv_ll_swap(lv_ll_t * ll_p, void * n1_p, void * n2_p); */ /** - * Move a node before an other node in the same linked list + * Move a node before another node in the same linked list * @param ll_p pointer to a linked list * @param n_act pointer to node to move * @param n_after pointer to a node which should be after `n_act` diff --git a/src/misc/lv_math.c b/src/misc/lv_math.c index bb497828a..a303a4c79 100644 --- a/src/misc/lv_math.c +++ b/src/misc/lv_math.c @@ -226,7 +226,7 @@ void LV_ATTRIBUTE_FAST_MEM lv_sqrt(uint32_t x, lv_sqrt_res_t * q, uint32_t mask) // Alternative Integer Square Root function // Contributors include Arne Steinarson for the basic approximation idea, // Dann Corbit and Mathew Hendry for the first cut at the algorithm, -// Lawrence Kirby for the rearrangement, improvments and range optimization +// Lawrence Kirby for the rearrangement, improvements and range optimization // and Paul Hsieh for the round-then-adjust idea. */ int32_t LV_ATTRIBUTE_FAST_MEM lv_sqrt32(uint32_t x) diff --git a/src/misc/lv_text.c b/src/misc/lv_text.c index 6127904eb..f563a66fa 100644 --- a/src/misc/lv_text.c +++ b/src/misc/lv_text.c @@ -180,8 +180,8 @@ static uint32_t lv_text_get_next_word(const char * txt, const lv_font_t * font, uint32_t letter = 0; /*Letter at i*/ uint32_t letter_next = 0; /*Letter at i_next*/ int32_t letter_w; - int32_t cur_w = 0; /*Pixel Width of transversed string*/ - uint32_t word_len = 0; /*Number of characters in the transversed word*/ + int32_t cur_w = 0; /*Pixel Width of traversed string*/ + uint32_t word_len = 0; /*Number of characters in the traversed word*/ uint32_t break_index = NO_BREAK_FOUND; /*only used for "long" words*/ uint32_t break_letter_count = 0; /*Number of characters up to the long word break point*/ diff --git a/src/misc/lv_text_ap.c b/src/misc/lv_text_ap.c index e565224d0..00c23fc25 100644 --- a/src/misc/lv_text_ap.c +++ b/src/misc/lv_text_ap.c @@ -185,14 +185,14 @@ void _lv_text_ap_proc(const char * txt, char * txt_out) continue; } - uint8_t conjunction_to_previuse = (i == 0 || + uint8_t conjunction_to_previous = (i == 0 || idx_previous == LV_UNDEF_ARABIC_PERSIAN_CHARS) ? 0 : ap_chars_map[idx_previous].ap_chars_conjunction.conj_to_next; uint8_t conjunction_to_next = ((i == txt_length - 1) || idx_next == LV_UNDEF_ARABIC_PERSIAN_CHARS) ? 0 : ap_chars_map[idx_next].ap_chars_conjunction.conj_to_previous; uint32_t lam_alef = lv_text_lam_alef(index_current, idx_next); if(lam_alef) { - if(conjunction_to_previuse) { + if(conjunction_to_previous) { lam_alef ++; } ch_fin[j] = lam_alef; @@ -202,11 +202,11 @@ void _lv_text_ap_proc(const char * txt, char * txt_out) continue; } - if(conjunction_to_previuse && conjunction_to_next) + if(conjunction_to_previous && conjunction_to_next) ch_fin[j] = ap_chars_map[index_current].char_end_form + ap_chars_map[index_current].char_middle_form_offset; - else if(!conjunction_to_previuse && conjunction_to_next) + else if(!conjunction_to_previous && conjunction_to_next) ch_fin[j] = ap_chars_map[index_current].char_end_form + ap_chars_map[index_current].char_beginning_form_offset; - else if(conjunction_to_previuse && !conjunction_to_next) + else if(conjunction_to_previous && !conjunction_to_next) ch_fin[j] = ap_chars_map[index_current].char_end_form; else ch_fin[j] = ap_chars_map[index_current].char_end_form + ap_chars_map[index_current].char_isolated_form_offset; diff --git a/src/misc/lv_text_private.h b/src/misc/lv_text_private.h index 85cd03776..8980f2970 100644 --- a/src/misc/lv_text_private.h +++ b/src/misc/lv_text_private.h @@ -45,7 +45,7 @@ uint32_t lv_text_get_next_line(const char * txt, const lv_font_t * font, int32_t int32_t max_width, int32_t * used_width, lv_text_flag_t flag); /** - * Insert a string into an other + * Insert a string into another * @param txt_buf the original text (must be big enough for the result text and NULL terminated) * @param pos position to insert (0: before the original text, 1: after the first char etc.) * @param ins_txt text to insert, must be '\0' terminated diff --git a/src/others/gridnav/lv_gridnav.c b/src/others/gridnav/lv_gridnav.c index e5e3183e5..bbdddbd15 100644 --- a/src/others/gridnav/lv_gridnav.c +++ b/src/others/gridnav/lv_gridnav.c @@ -43,7 +43,7 @@ static void gridnav_event_cb(lv_event_t * e); static lv_obj_t * find_chid(lv_obj_t * obj, lv_obj_t * start_child, find_mode_t mode); static lv_obj_t * find_first_focusable(lv_obj_t * obj); static lv_obj_t * find_last_focusable(lv_obj_t * obj); -static bool obj_is_focuable(lv_obj_t * obj); +static bool obj_is_focusable(lv_obj_t * obj); static int32_t get_x_center(lv_obj_t * obj); static int32_t get_y_center(lv_obj_t * obj); @@ -108,7 +108,7 @@ void lv_gridnav_set_focused(lv_obj_t * cont, lv_obj_t * to_focus, lv_anim_enable return; } - if(obj_is_focuable(to_focus) == false) { + if(obj_is_focusable(to_focus) == false) { LV_LOG_WARN("The object to focus is not focusable"); return; } @@ -298,7 +298,7 @@ static lv_obj_t * find_chid(lv_obj_t * obj, lv_obj_t * start_child, find_mode_t for(i = 0; i < child_cnt; i++) { lv_obj_t * child = lv_obj_get_child(obj, i); if(child == start_child) continue; - if(obj_is_focuable(child) == false) continue; + if(obj_is_focusable(child) == false) continue; int32_t x_err = 0; int32_t y_err = 0; @@ -360,7 +360,7 @@ static lv_obj_t * find_first_focusable(lv_obj_t * obj) uint32_t i; for(i = 0; i < child_cnt; i++) { lv_obj_t * child = lv_obj_get_child(obj, i); - if(obj_is_focuable(child)) return child; + if(obj_is_focusable(child)) return child; } return NULL; @@ -372,12 +372,12 @@ static lv_obj_t * find_last_focusable(lv_obj_t * obj) int32_t i; for(i = child_cnt - 1; i >= 0; i--) { lv_obj_t * child = lv_obj_get_child(obj, i); - if(obj_is_focuable(child)) return child; + if(obj_is_focusable(child)) return child; } return NULL; } -static bool obj_is_focuable(lv_obj_t * obj) +static bool obj_is_focusable(lv_obj_t * obj) { if(lv_obj_has_flag(obj, LV_OBJ_FLAG_HIDDEN)) return false; if(lv_obj_has_flag(obj, LV_OBJ_FLAG_CLICKABLE | LV_OBJ_FLAG_CLICK_FOCUSABLE)) return true; diff --git a/src/others/vg_lite_tvg/vg_lite.h b/src/others/vg_lite_tvg/vg_lite.h index 0bf97d4ce..9a54eecb1 100644 --- a/src/others/vg_lite_tvg/vg_lite.h +++ b/src/others/vg_lite_tvg/vg_lite.h @@ -817,7 +817,7 @@ typedef unsigned int vg_lite_color_t; vg_lite_paint_type_t paintType; /*! Get paintcolor from different paint types. */ vg_lite_uint8_t fc_enable; /*! enable im fastclear. */ vg_lite_uint8_t scissor_layer; /*! The buffer is scissor buffer. */ - vg_lite_uint8_t premultiplied; /*! The RGB pixel values are alpha-premultipled */ + vg_lite_uint8_t premultiplied; /*! The RGB pixel values are alpha-premultiplied */ } vg_lite_buffer_t; /* Memory allocation info by kernel. */ @@ -926,14 +926,14 @@ typedef unsigned int vg_lite_color_t; /* Colorkey definition */ typedef struct vg_lite_color_key { - vg_lite_uint8_t enable; /*! The color key is effective only when "enable" is ture, */ - vg_lite_uint8_t low_r; /*! The R chanel of low_rgb. */ - vg_lite_uint8_t low_g; /*! The G chanel of low_rgb. */ - vg_lite_uint8_t low_b; /*! The B chanel of low_rgb. */ + vg_lite_uint8_t enable; /*! The color key is effective only when "enable" is true, */ + vg_lite_uint8_t low_r; /*! The R channel of low_rgb. */ + vg_lite_uint8_t low_g; /*! The G channel of low_rgb. */ + vg_lite_uint8_t low_b; /*! The B channel of low_rgb. */ vg_lite_uint8_t alpha; /*! The alpha channel to replace destination pixel alpha channel.*/ - vg_lite_uint8_t hign_r; /*! The R chanel of hign_rgb. */ - vg_lite_uint8_t hign_g; /*! The G chanel of hign_rgb. */ - vg_lite_uint8_t hign_b; /*! The B chanel of hign_rgb. */ + vg_lite_uint8_t hign_r; /*! The R channel of hign_rgb. */ + vg_lite_uint8_t hign_g; /*! The G channel of hign_rgb. */ + vg_lite_uint8_t hign_b; /*! The B channel of hign_rgb. */ } vg_lite_color_key_t; /* Four colorkey definition. @@ -1281,7 +1281,7 @@ typedef unsigned int vg_lite_color_t; /* Setup 3x3 gaussian blur weight values to filter image pixels. * - * Paramters w0, w1, w2 define a 3x3 gaussian blur weight matrix as below + * Parameters w0, w1, w2 define a 3x3 gaussian blur weight matrix as below * * | w2 w1 w2 | * | w1 w0 w1 | diff --git a/src/others/vg_lite_tvg/vg_lite_matrix.c b/src/others/vg_lite_tvg/vg_lite_matrix.c index a6e57d104..42f8ce38b 100644 --- a/src/others/vg_lite_tvg/vg_lite_matrix.c +++ b/src/others/vg_lite_tvg/vg_lite_matrix.c @@ -129,7 +129,7 @@ vg_lite_error_t vg_lite_rotate(vg_lite_float_t degrees, vg_lite_matrix_t * matri /* Convert degrees into radians. */ vg_lite_float_t angle = (degrees / 180.0f) * 3.141592654f; - /* Compuet cosine and sine values. */ + /* Compute cosine and sine values. */ vg_lite_float_t cos_angle = cosf(angle); vg_lite_float_t sin_angle = sinf(angle); diff --git a/src/others/vg_lite_tvg/vg_lite_tvg.cpp b/src/others/vg_lite_tvg/vg_lite_tvg.cpp index 9d12835ae..6f096ce24 100644 --- a/src/others/vg_lite_tvg/vg_lite_tvg.cpp +++ b/src/others/vg_lite_tvg/vg_lite_tvg.cpp @@ -1079,7 +1079,7 @@ extern "C" { /* Clamp color. */ ClampColor(COLOR_FROM_RAMP(src_ramp), COLOR_FROM_RAMP(trg_ramp), 0); - /* First stop greater then zero? */ + /* First stop greater than zero? */ if((trg_count == 0) && (src_ramp->stop > 0.0f)) { /* Force the first stop to 0.0f. */ trg_ramp->stop = 0.0f; @@ -1390,7 +1390,7 @@ Empty_sequence_handler: /* Clamp color. */ ClampColor(COLOR_FROM_RAMP(srcRamp), COLOR_FROM_RAMP(trgRamp), 0); - /* First stop greater then zero? */ + /* First stop greater than zero? */ if((trgCount == 0) && (srcRamp->stop > 0.0f)) { /* Force the first stop to 0.0f. */ trgRamp->stop = 0.0f; diff --git a/src/stdlib/builtin/lv_tlsf.c b/src/stdlib/builtin/lv_tlsf.c index 3d83b8dc4..6048245c3 100644 --- a/src/stdlib/builtin/lv_tlsf.c +++ b/src/stdlib/builtin/lv_tlsf.c @@ -80,7 +80,7 @@ && defined (__GNUC_PATCHLEVEL__) #if defined (__SNC__) -/* SNC for Playstation 3. */ +/* SNC for PlayStation 3. */ tlsf_decl int tlsf_ffs(unsigned int word) { @@ -586,8 +586,8 @@ static void remove_free_block(control_t * control, block_header_t * block, int f { block_header_t * prev = block->prev_free; block_header_t * next = block->next_free; - tlsf_assert(prev && "prev_free field can not be null"); - tlsf_assert(next && "next_free field can not be null"); + tlsf_assert(prev && "prev_free field cannot be null"); + tlsf_assert(next && "next_free field cannot be null"); next->prev_free = prev; prev->next_free = next; diff --git a/src/themes/default/lv_theme_default.c b/src/themes/default/lv_theme_default.c index a78914626..75a137d19 100644 --- a/src/themes/default/lv_theme_default.c +++ b/src/themes/default/lv_theme_default.c @@ -641,7 +641,7 @@ lv_theme_t * lv_theme_default_init(lv_display_t * disp, lv_color_t color_primary const lv_font_t * font) { /*This trick is required only to avoid the garbage collection of - *styles' data if LVGL is used in a binding (e.g. Micropython) + *styles' data if LVGL is used in a binding (e.g. MicroPython) *In a general case styles could be in a simple `static lv_style_t my_style...` variables*/ if(!lv_theme_default_is_inited()) { diff --git a/src/themes/mono/lv_theme_mono.c b/src/themes/mono/lv_theme_mono.c index 5251e0b13..6beaa9ac6 100644 --- a/src/themes/mono/lv_theme_mono.c +++ b/src/themes/mono/lv_theme_mono.c @@ -205,7 +205,7 @@ void lv_theme_mono_deinit(void) lv_theme_t * lv_theme_mono_init(lv_display_t * disp, bool dark_bg, const lv_font_t * font) { /*This trick is required only to avoid the garbage collection of - *styles' data if LVGL is used in a binding (e.g. Micropython) + *styles' data if LVGL is used in a binding (e.g. MicroPython) *In a general case styles could be in simple `static lv_style_t my_style...` variables*/ if(!lv_theme_mono_is_inited()) { theme_def = lv_malloc_zeroed(sizeof(my_theme_t)); diff --git a/src/themes/simple/lv_theme_simple.c b/src/themes/simple/lv_theme_simple.c index 0b2f4484a..b7dac5b1c 100644 --- a/src/themes/simple/lv_theme_simple.c +++ b/src/themes/simple/lv_theme_simple.c @@ -176,7 +176,7 @@ void lv_theme_simple_deinit(void) lv_theme_t * lv_theme_simple_init(lv_display_t * disp) { /*This trick is required only to avoid the garbage collection of - *styles' data if LVGL is used in a binding (e.g. Micropython) + *styles' data if LVGL is used in a binding (e.g. MicroPython) *In a general case styles could be in simple `static lv_style_t my_style...` variables*/ if(!lv_theme_simple_is_inited()) { theme_def = lv_malloc_zeroed(sizeof(my_theme_t)); diff --git a/src/tick/lv_tick.h b/src/tick/lv_tick.h index b770ac1fa..eb53fe8d9 100644 --- a/src/tick/lv_tick.h +++ b/src/tick/lv_tick.h @@ -76,8 +76,8 @@ void lv_delay_ms(uint32_t ms); void lv_tick_set_cb(lv_tick_get_cb_t cb); /** - * Set a custom callback for 'lv_dalay_ms' - * @param cb call this callback in 'lv_dalay_ms' + * Set a custom callback for 'lv_delay_ms' + * @param cb call this callback in 'lv_delay_ms' */ void lv_delay_set_cb(lv_delay_cb_t cb); diff --git a/src/widgets/bar/lv_bar.h b/src/widgets/bar/lv_bar.h index e61be7e51..212abff28 100644 --- a/src/widgets/bar/lv_bar.h +++ b/src/widgets/bar/lv_bar.h @@ -109,7 +109,7 @@ void lv_bar_set_start_value(lv_obj_t * obj, int32_t start_value, lv_anim_enable_ * @param obj pointer to the bar object * @param min minimum value * @param max maximum value - * @note If min is greater than max, the drawing direction becomes to the oppsite direction. + * @note If min is greater than max, the drawing direction becomes to the opposite direction. */ void lv_bar_set_range(lv_obj_t * obj, int32_t min, int32_t max); diff --git a/src/widgets/calendar/lv_calendar.c b/src/widgets/calendar/lv_calendar.c index e749fe1b1..96282aef9 100644 --- a/src/widgets/calendar/lv_calendar.c +++ b/src/widgets/calendar/lv_calendar.c @@ -386,7 +386,7 @@ static uint8_t get_month_length(int32_t year, int32_t month) { month--; if(month < 0) { - year--; /*Already in the previous year (won't be less then -12 to skip a whole year)*/ + year--; /*Already in the previous year (won't be less than -12 to skip a whole year)*/ month = 12 + month; /*`month` is negative, the result will be < 12*/ } if(month >= 12) { diff --git a/src/widgets/calendar/lv_calendar_header_dropdown.c b/src/widgets/calendar/lv_calendar_header_dropdown.c index 77d508be9..8b22609de 100644 --- a/src/widgets/calendar/lv_calendar_header_dropdown.c +++ b/src/widgets/calendar/lv_calendar_header_dropdown.c @@ -78,12 +78,12 @@ void lv_calendar_header_dropdown_set_year_list(lv_obj_t * parent, const char * y } /* Search for the year dropdown - * Index is 0 because in the header dropdown constructor the year dropdpwn (year_dd) + * Index is 0 because in the header dropdown constructor the year dropdown (year_dd) * is the first created child of the header */ const int32_t year_dropdown_index = 0; lv_obj_t * year_dropdown = lv_obj_get_child_by_type(header, year_dropdown_index, &lv_dropdown_class); if(NULL == year_dropdown) { - /* year dropdpwn not found */ + /* year dropdown not found */ return; } diff --git a/src/widgets/dropdown/lv_dropdown.c b/src/widgets/dropdown/lv_dropdown.c index 8f68bb46b..7a554bd32 100644 --- a/src/widgets/dropdown/lv_dropdown.c +++ b/src/widgets/dropdown/lv_dropdown.c @@ -729,7 +729,7 @@ static void lv_dropdown_event(const lv_obj_class_t * class_p, lv_event_t * e) lv_dropdown_close(obj); } else if(c == LV_KEY_ENTER) { - /* Handle the ENTER key only if it was send by an other object. + /* Handle the ENTER key only if it was send by another object. * Do no process it if ENTER is sent by the dropdown because it's handled in LV_EVENT_RELEASED */ lv_obj_t * indev_obj = lv_indev_get_active_obj(); if(indev_obj != obj) { diff --git a/src/widgets/label/lv_label.c b/src/widgets/label/lv_label.c index f9e10cf50..ebebbe497 100644 --- a/src/widgets/label/lv_label.c +++ b/src/widgets/label/lv_label.c @@ -575,7 +575,7 @@ void lv_label_ins_text(lv_obj_t * obj, uint32_t pos, const char * txt) lv_label_t * label = (lv_label_t *)obj; - /*Can not append to static text*/ + /*Cannot append to static text*/ if(label->static_txt != 0) return; lv_obj_invalidate(obj); @@ -601,7 +601,7 @@ void lv_label_cut_text(lv_obj_t * obj, uint32_t pos, uint32_t cnt) LV_ASSERT_OBJ(obj, MY_CLASS); lv_label_t * label = (lv_label_t *)obj; - /*Can not append to static text*/ + /*Cannot append to static text*/ if(label->static_txt) return; lv_obj_invalidate(obj); diff --git a/src/widgets/label/lv_label.h b/src/widgets/label/lv_label.h index e555f089f..f2d4463ef 100644 --- a/src/widgets/label/lv_label.h +++ b/src/widgets/label/lv_label.h @@ -212,7 +212,7 @@ uint32_t lv_label_get_text_selection_end(const lv_obj_t * obj); *====================*/ /** - * Insert a text to a label. The label text can not be static. + * Insert a text to a label. The label text cannot be static. * @param obj pointer to a label object * @param pos character index to insert. Expressed in character index and not byte index. * 0: before first char. LV_LABEL_POS_LAST: after last char. @@ -221,10 +221,10 @@ uint32_t lv_label_get_text_selection_end(const lv_obj_t * obj); void lv_label_ins_text(lv_obj_t * obj, uint32_t pos, const char * txt); /** - * Delete characters from a label. The label text can not be static. + * Delete characters from a label. The label text cannot be static. * @param obj pointer to a label object * @param pos character index from where to cut. Expressed in character index and not byte index. - * 0: start in from of the first character + * 0: start in front of the first character * @param cnt number of characters to cut */ void lv_label_cut_text(lv_obj_t * obj, uint32_t pos, uint32_t cnt); diff --git a/src/widgets/scale/lv_scale.c b/src/widgets/scale/lv_scale.c index 506eca2e0..f772411b0 100644 --- a/src/widgets/scale/lv_scale.c +++ b/src/widgets/scale/lv_scale.c @@ -1358,7 +1358,7 @@ static void scale_store_main_line_tick_width_compensation(lv_obj_t * obj, const const bool is_last_tick = scale->total_tick_count == tick_idx; const int32_t tick_width = is_major_tick ? major_tick_width : minor_tick_width; - /* Exit early if tick_idx is not the first nor last tick on the main line */ + /* Exit early if tick_idx is neither the first nor last tick on the main line */ if(((!is_last_tick) && (!is_first_tick)) /* Exit early if scale mode is round. It doesn't support main line compensation */ || ((LV_SCALE_MODE_ROUND_INNER == scale->mode) || (LV_SCALE_MODE_ROUND_OUTER == scale->mode))) { diff --git a/src/widgets/textarea/lv_textarea.h b/src/widgets/textarea/lv_textarea.h index e27796468..ab90c63bd 100644 --- a/src/widgets/textarea/lv_textarea.h +++ b/src/widgets/textarea/lv_textarea.h @@ -181,7 +181,7 @@ void lv_textarea_set_accepted_chars(lv_obj_t * obj, const char * list); void lv_textarea_set_max_length(lv_obj_t * obj, uint32_t num); /** - * In `LV_EVENT_INSERT` the text which planned to be inserted can be replaced by an other text. + * In `LV_EVENT_INSERT` the text which planned to be inserted can be replaced by another text. * It can be used to add automatic formatting to the text area. * @param obj pointer to a text area object * @param txt pointer to a new string to insert. If `""` no text will be added. diff --git a/tests/micropy_test/__init__.py b/tests/micropy_test/__init__.py index 62a0ae2d2..44285e298 100644 --- a/tests/micropy_test/__init__.py +++ b/tests/micropy_test/__init__.py @@ -1,5 +1,5 @@ """ -The test script will only run the one test on microptyhon. It is not a +The test script will only run the one test on micropython. It is not a framework that can be used for other tests. This has a reduced code footprint. entrypoint API is almost the same as the framework. @@ -16,7 +16,7 @@ python3 -m pip install pillow Example command line to run the test. I suggest doing this from the root of the binding directory. It is just a simple location to do it from. -Paths that are passed in MUST be relitive to the current working directory. +Paths that are passed in MUST be relative to the current working directory. python3 lib/lv_bindings/lvgl/tests/micropy_test/__init__.py --artifact-path=lib/lv_bindings/lvgl/tests/micropy_test/artifacts --mpy-path=ports/unix/build-standard/micropython """ diff --git a/tests/src/test_cases/draw/test_draw_layer.c b/tests/src/test_cases/draw/test_draw_layer.c index dff6ba70f..174a733de 100644 --- a/tests/src/test_cases/draw/test_draw_layer.c +++ b/tests/src/test_cases/draw/test_draw_layer.c @@ -56,7 +56,7 @@ void test_draw_layer_bitmap_mask_from_image_not_found(void) lv_obj_t * obj = lv_obj_create(lv_screen_active()); lv_obj_set_size(obj, 200, 200); lv_obj_set_style_bg_color(obj, lv_color_hex3(0xf88), 0); - lv_obj_set_style_bitmap_mask_src(obj, "A:not/exisiting/file", 0); + lv_obj_set_style_bitmap_mask_src(obj, "A:nonexistent/file", 0); lv_obj_center(obj); lv_obj_t * label = lv_label_create(obj); diff --git a/tests/src/test_cases/test_fs.c b/tests/src/test_cases/test_fs.c index 8e27fe502..cb8965f60 100644 --- a/tests/src/test_cases/test_fs.c +++ b/tests/src/test_cases/test_fs.c @@ -45,7 +45,7 @@ void test_read(void) res = lv_fs_open(&fb, "B:src/test_files/readtest.txt", LV_FS_MODE_RD); TEST_ASSERT_EQUAL(LV_FS_RES_OK, res); - /*Use an odd size to make sure it's not aligned with the drivier's'cache size*/ + /*Use an odd size to make sure it's not aligned with the driver's cache size*/ uint8_t buf[79]; uint32_t cnt = 0; uint32_t br = 1; diff --git a/tests/src/test_cases/test_margin_align.c b/tests/src/test_cases/test_margin_align.c index 9aef1fe32..2f667140a 100644 --- a/tests/src/test_cases/test_margin_align.c +++ b/tests/src/test_cases/test_margin_align.c @@ -33,7 +33,7 @@ void obj_set_margin(lv_obj_t * obj, int32_t left, int32_t top, int32_t right, in lv_obj_set_style_margin_bottom(obj, bottom, LV_PART_MAIN); } -// takes no effect on postiton but size. +// takes no effect on position but size. void test_align(void) { lv_obj_t * obj0 = active_screen; diff --git a/tests/src/test_cases/test_profiler.c b/tests/src/test_cases/test_profiler.c index 094877f9a..9925c93cf 100644 --- a/tests/src/test_cases/test_profiler.c +++ b/tests/src/test_cases/test_profiler.c @@ -43,7 +43,7 @@ void tearDown(void) void test_profiler_normal(void) { - /* enable profier */ + /* enable profiler */ lv_profiler_builtin_set_enable(true); /* reset */ @@ -71,7 +71,7 @@ void test_profiler_normal(void) void test_profiler_disable(void) { - /* disable profier */ + /* disable profiler */ lv_profiler_builtin_set_enable(false); /* reset */ diff --git a/tests/src/test_cases/test_snapshot.c b/tests/src/test_cases/test_snapshot.c index 15d5fcd93..203a4c0f0 100644 --- a/tests/src/test_cases/test_snapshot.c +++ b/tests/src/test_cases/test_snapshot.c @@ -67,7 +67,7 @@ void test_snapshot_with_transform_should_not_leak_memory(void) TEST_ASSERT_EQUAL(initial_available_memory, final_available_memory); } -void test_snapshot_take_snapshot_immidiately_after_obj_create(void) +void test_snapshot_take_snapshot_immediately_after_obj_create(void) { lv_obj_t * label = lv_label_create(lv_screen_active()); lv_obj_set_style_text_font(label, &lv_font_montserrat_28, 0); @@ -123,7 +123,7 @@ void test_snapshot_with_transform_should_not_leak_memory(void) } -void test_snapshot_take_snapshot_immidiately_after_obj_create(void) +void test_snapshot_take_snapshot_immediately_after_obj_create(void) { } diff --git a/tests/src/test_cases/widgets/test_roller.c b/tests/src/test_cases/widgets/test_roller.c index 8249c456d..736611ef3 100644 --- a/tests/src/test_cases/widgets/test_roller.c +++ b/tests/src/test_cases/widgets/test_roller.c @@ -235,12 +235,12 @@ void test_roller_with_overlay_and_bubble_events_enabled(void) // //void test_roller_release_handler_pointer_indev(void) //{ -// /* Clic in the widget */ +// /* Click in the widget */ // lv_test_mouse_click_at(roller_mouse->coords.x1 + 5, roller_mouse->coords.y1 + 5); // /* Check which is the selected option */ // TEST_ASSERT_EQUAL(0, lv_roller_get_selected(roller_mouse)); // -// /* Clic further down the roller */ +// /* Click further down the roller */ // lv_test_mouse_click_at(roller_mouse->coords.x1 + 5, roller_mouse->coords.y1 + 100); // /* Check which is the selected option */ // TEST_ASSERT_NOT_EQUAL(0, lv_roller_get_selected(roller_mouse)); diff --git a/tests/src/test_cases/widgets/test_scale.c b/tests/src/test_cases/widgets/test_scale.c index 00da0441f..cb0fcc86a 100644 --- a/tests/src/test_cases/widgets/test_scale.c +++ b/tests/src/test_cases/widgets/test_scale.c @@ -371,7 +371,7 @@ void test_scale_set_line_needle_value(void) lv_obj_t * line = lv_line_create(scale); - /* test the scale alocating the array */ + /* test the scale allocating the array */ lv_scale_set_line_needle_value(scale, line, 50, 35); TEST_ASSERT_EQUAL_UINT32(2, lv_line_get_point_count(line)); const lv_point_precise_t * allocated_points_array = lv_line_get_points(line);