Merge pull request neutrinolabs#230 from metalefty/v0.9-cherry-pick

[v0.9] Merge neutrinolabs#228 for v0.9
metalefty · Sep 6, 2022 · 6a14034 · 6a14034
2 parents 39978f7 + c91251d
commit 6a14034
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/module/rdpImageText8.c b/module/rdpImageText8.c
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 /* this should be before all X11 .h files */
 #include <xorg-server.h>
 #include <xorgVersion.h>
- 
+
 /* all driver need this */
 #include <xf86.h>
 #include <xf86_OSproc.h>

diff --git a/scripts/display_test_logs b/scripts/display_test_logs
@@ -3,14 +3,14 @@
 # Display any logs in the tests folder
 
 # Move to the project root directory
-if cd `dirname $0`/.. ; then
+if cd "$(dirname "$0")/.."; then
     found=
     for f in tests/*.log; do
-        if [ -f $f ]; then
+        if [ -f "$f" ]; then
             echo
-            echo === $f ===
+            echo "=== $f ==="
             echo
-            cat $f
+            cat "$f"
             found=1
         fi
     done
@@ -19,4 +19,4 @@ if cd `dirname $0`/.. ; then
     fi
 fi
 
-exit $?
+exit "$?"
diff --git a/scripts/install_xorgxrdp_build_dependencies_with_apt.sh b/scripts/install_xorgxrdp_build_dependencies_with_apt.sh
@@ -44,7 +44,7 @@ in
         ;;
     *)
         echo "unsupported architecture: $ARCH"
-        exit 1;
+        exit 1
         ;;
 esac
 

diff --git a/tests/yuv2rgb/yuv2rgb_speed.c b/tests/yuv2rgb/yuv2rgb_speed.c
@@ -80,7 +80,7 @@ yuv to rgb speed testing
   _Y = ( ((1053 * ((_R) << 4)) >> 16) + ((2064 * ((_G) << 4)) >> 16) +  (( 401 * ((_B) << 4)) >> 16)) +  16; \
   _U = ( ((1798 * ((_B) << 4)) >> 16) - (( 606 * ((_R) << 4)) >> 16) -  ((1192 * ((_G) << 4)) >> 16)) + 128; \
   _V = ( ((1798 * ((_R) << 4)) >> 16) - ((1507 * ((_G) << 4)) >> 16) -  (( 291 * ((_B) << 4)) >> 16)) + 128;
-  
+
 /******************************************************************************/
 static int
 a8r8g8b8_to_nv12_box(char *s8, int src_stride,
@@ -173,7 +173,7 @@ a8r8g8b8_to_nv12_box(char *s8, int src_stride,
         }
     }
 
-    return 0; 
+    return 0;
 }
 
 int output_params(void)