Merge branch 'colorfilter-parser-comments' into 'master'

colorfilter: Fix parsing comments

See merge request compiz/compiz-plugins-main!85

Author: soreau

data/filters/contrast

@@ -6,15 +6,15 @@ TEMP dark;
 
 TEX input, fragment.texcoord[0], texture[0], RECT;
 
-# Subtract color by 0.51 => everything with more then 0.51 will have at least 0 ;
+# Subtract color by 0.51 => everything with more then 0.51 will have at least 0
 SUB output.rgb, input, 0.51;
 
-# Create a dark color..;
+# Create a dark color..
 SUB dark.rgb, input, 0.3;
-# ..and a bright color ;
+# ..and a bright color
 ADD bright.rgb, input, 0.3;
 
-# All colors which are < 0 (original color - 0.51 < 0) get a dark color and everything else a bright color ;
+# All colors which are < 0 (original color - 0.51 < 0) get a dark color and everything else a bright color
 CMP output.rgb, output, dark, bright;
 
 MOV result.color, output;

data/filters/negative-lightness

@@ -12,7 +12,6 @@ negative-lightness.frag
 #const c1 = 4 60 360 120
 #const c2 = 180 240 0.016666668
 TEMP R0;
-TEMP R0;
 TEMP R1;
 TEMP R2;
 TEMP R3;

src/colorfilter/parser.c

@@ -352,10 +352,21 @@ programParseSource (CompFunctionData *data,
 	source++;
     }
 
-    /* Strip linefeeds */
+    /* Strip linefeeds and comments */
     next = source;
-    while ((next = strstr (next, "\n")))
-	*next = ' ';
+    while ((next = strpbrk (next, "#\n\r")))
+    {
+	if (*next == '#')
+	{
+	    char *line_end = strpbrk (next, "\r\n");
+	    if (! line_end)
+		*next = '\0';
+	    else
+		memmove (next, line_end, strlen (line_end) + 1);
+	}
+	else
+	    *next = ' ';
+    }
 
     line = strtok_r (source, ";", &strtok_ptr);
     /* Parse each instruction */
@@ -367,16 +378,6 @@ programParseSource (CompFunctionData *data,
 	/* Find instruction type */
 	type = NoOp;
 
-	/* Comments */
-	if (strncmp (current, "#", 1) == 0)
-	{
-	    free (line);
-	    line = strtok_r (NULL, ";", &strtok_ptr);
-	    continue;
-	}
-	if ((next = strstr (current, "#")))
-	    *next = 0;
-
 	/* Data ops */
 	if (strncmp (current, "END", 3) == 0)
 	    type = NoOp;