pixman: Branch 'master' - 3 commits

[GitLab Mirror]

 Makefile.win32.common           |   18 +++++++++++++++---
 pixman/pixman-radial-gradient.c |   30 ++++++++++++++++++++++++------
 2 files changed, 39 insertions(+), 9 deletions(-)

New commits:
commit 72959837abb669972cf21b3dda6f3bb645be2750
Author: Niveditha Rau <niveditha.rau at oracle.com>
Date:   Fri Feb 22 13:06:32 2019 -0800

    void function should not return a value
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/pixman/pixman-radial-gradient.c b/pixman/pixman-radial-gradient.c
index 0367d78..e8e99c9 100644
--- a/pixman/pixman-radial-gradient.c
+++ b/pixman/pixman-radial-gradient.c
@@ -111,12 +111,18 @@ radial_write_color (double                         a,
 	if (repeat == PIXMAN_REPEAT_NONE)
 	{
 	    if (0 <= t && t <= pixman_fixed_1)
-		return write_pixel (walker, t, buffer);
+	    {
+		write_pixel (walker, t, buffer);
+		return;
+	    }
 	}
 	else
 	{
 	    if (t * dr >= mindr)
-		return write_pixel (walker, t, buffer);
+	    {
+		write_pixel (walker, t, buffer);
+		return;
+	    }
 	}
 
 	memset (buffer, 0, Bpp);
@@ -146,16 +152,28 @@ radial_write_color (double                         a,
 	if (repeat == PIXMAN_REPEAT_NONE)
 	{
 	    if (0 <= t0 && t0 <= pixman_fixed_1)
-		return write_pixel (walker, t0, buffer);
+	    {
+		write_pixel (walker, t0, buffer);
+		return;
+	    }
 	    else if (0 <= t1 && t1 <= pixman_fixed_1)
-		return write_pixel (walker, t1, buffer);
+	    {
+		write_pixel (walker, t1, buffer);
+		return;
+           }
 	}
 	else
 	{
 	    if (t0 * dr >= mindr)
-		return write_pixel (walker, t0, buffer);
+	    {
+		write_pixel (walker, t0, buffer);
+		return;
+	    }
 	    else if (t1 * dr >= mindr)
-		return write_pixel (walker, t1, buffer);
+	    {
+		write_pixel (walker, t1, buffer);
+		return;
+	    }
 	}
     }
 
commit ef4fb03248ae7748090ec52f02261c331590579c
Author: Simon Richter <Simon.Richter at hogyros.de>
Date:   Mon Feb 11 16:51:35 2019 +0100

    Windows: Support building with SHELL=cmd.exe
    
    When GNU Make is not from msys, the startup cost for sh.exe is massive
    compared to cmd.exe.
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/Makefile.win32.common b/Makefile.win32.common
index 0048cf8..1b2f894 100644
--- a/Makefile.win32.common
+++ b/Makefile.win32.common
@@ -1,5 +1,17 @@
 LIBRARY = pixman-1
 
+ifeq ($(shell echo ""),)
+# POSIX style shell
+mkdir_p = mkdir -p $1
+rm = $(RM) $1
+echo = echo "$1"
+else
+# DOS/Windows style shell
+mkdir_p = if not exist $(subst /,\,$1) md $(subst /,\,$1)
+echo = echo $1
+rm = del $(subst /,\,$1)
+endif
+
 CC = cl
 LD = link
 AR = lib
@@ -50,12 +62,12 @@ endif
 endif
 
 $(CFG_VAR):
-	@mkdir $@
+	@$(call mkdir_p,$@)
 
 $(CFG_VAR)/%.obj: %.c $(libpixman_headers) | $(CFG_VAR)
 	$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $<
 
 clean: inform $(CFG_VAR)
-	@cd $(CFG_VAR) && echo > silence_error.exe && $(RM) *.exe *.ilk *.lib *.obj *.pdb
+	-$(call rm,$(CFG_VAR)/*.exe $(CFG_VAR)/*.ilk $(CFG_VAR)/*.lib $(CFG_VAR)/*.obj $(CFG_VAR)/*.pdb)
 
 .PHONY: inform clean
commit 55d8f956c2da14ea2235c066dbc6e431b973e042
Author: Simon Richter <Simon.Richter at hogyros.de>
Date:   Mon Feb 11 16:51:34 2019 +0100

    Windows: Show compiler invocation
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/Makefile.win32.common b/Makefile.win32.common
index 756fc94..0048cf8 100644
--- a/Makefile.win32.common
+++ b/Makefile.win32.common
@@ -53,7 +53,7 @@ $(CFG_VAR):
 	@mkdir $@
 
 $(CFG_VAR)/%.obj: %.c $(libpixman_headers) | $(CFG_VAR)
-	@$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $<
+	$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $<
 
 clean: inform $(CFG_VAR)
 	@cd $(CFG_VAR) && echo > silence_error.exe && $(RM) *.exe *.ilk *.lib *.obj *.pdb