diff --git a/src/lib/gl_engine/tvgGlRenderer.cpp b/src/lib/gl_engine/tvgGlRenderer.cpp index 6fd1c2d5..2d11fb77 100644 --- a/src/lib/gl_engine/tvgGlRenderer.cpp +++ b/src/lib/gl_engine/tvgGlRenderer.cpp @@ -147,8 +147,8 @@ bool GlRenderer::renderShape(RenderData data) const Fill* gradient = sdata->shape->fill(); if (gradient != nullptr) { - drawPrimitive(*sdata, gradient, i, RenderUpdateFlag::Gradient); - } + drawPrimitive(*sdata, gradient, i, RenderUpdateFlag::Gradient); + } } if(flags & (RenderUpdateFlag::Color | RenderUpdateFlag::Transform)) diff --git a/src/lib/gl_engine/tvgGlShaderSrc.cpp b/src/lib/gl_engine/tvgGlShaderSrc.cpp index ef8d8f9b..bba73dcd 100644 --- a/src/lib/gl_engine/tvgGlShaderSrc.cpp +++ b/src/lib/gl_engine/tvgGlShaderSrc.cpp @@ -26,13 +26,13 @@ #define TVG_COMPOSE_SHADER(shader) #shader const char* COLOR_VERT_SHADER = TVG_COMPOSE_SHADER( - attribute mediump vec4 aLocation; \n - uniform highp mat4 uTransform; \n - varying highp float vOpacity; \n - void main() \n - { \n + attribute mediump vec4 aLocation; \n + uniform highp mat4 uTransform; \n + varying highp float vOpacity; \n + void main() \n + { \n gl_Position = uTransform * vec4(aLocation.xy, 0.0, 1.0); \n - vOpacity = aLocation.z; \n + vOpacity = aLocation.z; \n }); const char* COLOR_FRAG_SHADER = TVG_COMPOSE_SHADER( @@ -47,11 +47,11 @@ const char* GRADIENT_VERT_SHADER = TVG_COMPOSE_SHADER( attribute highp vec4 aLocation; \n varying highp float vOpacity; \n varying highp vec2 vPos; \n -uniform highp mat4 uTransform; \n +uniform highp mat4 uTransform; \n \n void main() \n { \n - gl_Position = uTransform * vec4(aLocation.xy, 0.0, 1.0); \n + gl_Position = uTransform * vec4(aLocation.xy, 0.0, 1.0); \n vOpacity = aLocation.z; \n vPos = vec2((aLocation.x + 1.0) / 2.0, ((-1.0 * aLocation.y) +1.0) / 2.0); \n }); @@ -62,7 +62,7 @@ precision highp float; const int MAX_STOP_COUNT = 4; \n uniform highp vec2 uSize; \n uniform highp vec2 uCanvasSize; \n -uniform float nStops; \n +uniform float nStops; \n uniform float noise_level; \n uniform float stopPoints[MAX_STOP_COUNT]; \n uniform vec4 stopColors[MAX_STOP_COUNT]; \n diff --git a/src/lib/sw_engine/tvgSwRasterNeon.h b/src/lib/sw_engine/tvgSwRasterNeon.h index 593e4d30..a4b3cdae 100644 --- a/src/lib/sw_engine/tvgSwRasterNeon.h +++ b/src/lib/sw_engine/tvgSwRasterNeon.h @@ -26,8 +26,8 @@ static inline uint8x8_t ALPHA_BLEND(uint8x8_t c, uint8x8_t a) { - uint16x8_t t = vmull_u8(c, a); - return vshrn_n_u16(t, 8); + uint16x8_t t = vmull_u8(c, a); + return vshrn_n_u16(t, 8); } diff --git a/src/loaders/external_jpg/meson.build b/src/loaders/external_jpg/meson.build index aeecf9f1..ce657bad 100644 --- a/src/loaders/external_jpg/meson.build +++ b/src/loaders/external_jpg/meson.build @@ -6,7 +6,7 @@ source_file = [ jpg_dep = dependency('libturbojpeg', required: false) if not jpg_dep.found() - jpg_dep = cc.find_library('turbojpeg', required: false) + jpg_dep = cc.find_library('turbojpeg', required: false) endif if jpg_dep.found() diff --git a/src/meson.build b/src/meson.build index 8e8ce582..3342a4b5 100644 --- a/src/meson.build +++ b/src/meson.build @@ -28,38 +28,38 @@ if host_machine.system() != 'windows' endif thorvg_lib = library( - 'thorvg', - include_directories : headers, - version : meson.project_version(), - dependencies : thorvg_lib_dep, - install : true, - cpp_args : compiler_flags, - gnu_symbol_visibility : 'hidden', + 'thorvg', + include_directories : headers, + version : meson.project_version(), + dependencies : thorvg_lib_dep, + install : true, + cpp_args : compiler_flags, + gnu_symbol_visibility : 'hidden', ) thorvg_dep = declare_dependency( - include_directories: headers, - link_with : thorvg_lib + include_directories: headers, + link_with : thorvg_lib ) if (cc.get_id() == 'emscripten') - subdir('wasm') + subdir('wasm') - executable('thorvg-wasm', - [], - include_directories : headers, - dependencies : [thorvg_lib_dep, thorvg_wasm_dep], - ) + executable('thorvg-wasm', + [], + include_directories : headers, + dependencies : [thorvg_lib_dep, thorvg_wasm_dep], + ) endif pkg_mod = import('pkgconfig') pkg_mod.generate( - libraries : thorvg_lib, - version : meson.project_version(), - name : 'libthorvg', - filebase : 'thorvg', - description : 'A Thor library for rendering vector graphics' + libraries : thorvg_lib, + version : meson.project_version(), + name : 'libthorvg', + filebase : 'thorvg', + description : 'A Thor library for rendering vector graphics' ) subdir('bin')