Merge branch '24.8'

src/cairo-fixed-type-private.h

@@ -59,7 +59,7 @@ typedef cairo_int128_t	cairo_fixed_96_32_t;
  * making sure that you compute a double-to-fixed magic number.
  * (see below).
  */
-#define CAIRO_FIXED_FRAC_BITS	16
+#define CAIRO_FIXED_FRAC_BITS	8
 
 /* A signed type %CAIRO_FIXED_BITS in size; the main fixed point type */
 typedef int32_t cairo_fixed_t;

src/cairo-ps-surface.c

@@ -1628,16 +1628,16 @@ _string_array_stream_write (cairo_output_stream_t *base,
 		stream->column++;
 		stream->string_size++;
 		break;
-		/* Have to also be careful to never split the final ~> sequence. */
-	    case '~':
-		_cairo_output_stream_write (stream->output, &c, 1);
-		stream->column++;
-		stream->string_size++;
-		length--;
-		c = *data++;
-		break;
 	    }
 	}
+	/* Have to be careful to never split the final ~> sequence. */
+        if (c == '~') {
+	    _cairo_output_stream_write (stream->output, &c, 1);
+	    stream->column++;
+	    stream->string_size++;
+	    length--;
+	    c = *data++;
+	}
 	_cairo_output_stream_write (stream->output, &c, 1);
 	stream->column++;
 	stream->string_size++;