Use supersampling to reduce fuzz, update reference images (1daba12d) · 提交 · PBS / Inkscape · GitLab

+10 −5

原始行号	差异行号	差异行
		@@ -11,6 +11,7 @@
		# OUTPUT_PAGE - index of page in multipage output (optional), starts from 0
		# FUZZ_PERCENTAGE - maximum allowed normalized root-mean-squared distance between compared images
		# RASTER_DPI - DPI setting for rasterizing vector formats before root-mean-squared comparison
		# SUPERSAMPLING - Rasterise vector formats at larger size and scale down by this factor
		# PARAMETERS - additional command line parameters to pass to Inkscape
		# REFERENCE_INKSCAPE - rasterize REFERENCE_FILENAME using inkscape
		# Avoid this when possible! Preferably reference should be a raster image and when that's not
		@@ -111,7 +112,7 @@ function(add_cli_test_cmp fixture testname)
		# parse arguments
		set(options REFERENCE_INKSCAPE)
		set(oneValueArgs OUTPUT_FILENAME OUTPUT_PAGE REFERENCE_FILENAME
		FUZZ_PERCENTAGE RASTER_DPI PNG_FILENAME)
		FUZZ_PERCENTAGE RASTER_DPI SUPERSAMPLING PNG_FILENAME)
		set(multiValueArgs EXPECTED_FILES TEST_SCRIPT)
		cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

		@@ -147,7 +148,7 @@ function(add_cli_test_cmp fixture testname)
		COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/check_output.sh
		"${ARG_OUTPUT_FILENAME}" "${ARG_OUTPUT_PAGE}" "${ARG_REFERENCE_FILENAME}"
		"${ARG_EXPECTED_FILES}" "${ARG_TEST_SCRIPT}" "${ARG_PNG}"
		"${ARG_FUZZ}" "${ARG_RASTER_DPI}")
		"${ARG_FUZZ}" "${ARG_RASTER_DPI}" "${ARG_SUPERSAMPLING}")
		set_tests_properties(${testname} PROPERTIES
		FIXTURES_REQUIRED ${fixture}
		ENVIRONMENT "${CMAKE_CTEST_ENV}"
		@@ -1126,7 +1127,7 @@ if(WITH_POPPLER)
		endif()

		function(add_pdfoutput_test name)
		set(oneValueArgs FUZZ_PERCENTAGE RASTER_DPI)
		set(oneValueArgs FUZZ_PERCENTAGE RASTER_DPI SUPERSAMPLING)
		cmake_parse_arguments(ARG "" "${oneValueArgs}" "" ${ARGN})

		if(NOT DEFINED ARG_FUZZ_PERCENTAGE)
		@@ -1136,6 +1137,9 @@ function(add_pdfoutput_test name)
		if(DEFINED ARG_RASTER_DPI)
		set(RASTER_DPI "RASTER_DPI" "${ARG_RASTER_DPI}")
		endif()
		if(DEFINED ARG_SUPERSAMPLING)
		set(SUPERSAMPLING "SUPERSAMPLING" "${ARG_SUPERSAMPLING}")
		endif()

		set(SOURCE_SVG "${CMAKE_CURRENT_SOURCE_DIR}/testcases/pdfoutput/${name}.svg")
		execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/get-pages.py ${SOURCE_SVG}
		@@ -1157,6 +1161,7 @@ function(add_pdfoutput_test name)
		REFERENCE_FILENAME pdfoutput/expected/${name}-${NUM}.png
		FUZZ_PERCENTAGE ${ARG_FUZZ_PERCENTAGE}
		${RASTER_DPI}
		${SUPERSAMPLING}
		)
		endforeach()
		add_cli_test_cln(cli_pdfoutput-${name} cli_pdfoutput-${name}-clean
		@@ -1173,11 +1178,11 @@ if(WITH_CAPYPDF)
		add_pdfoutput_test(06-test-markers)
		add_pdfoutput_test(07-test-shapes FUZZ_PERCENTAGE 0.2)
		add_pdfoutput_test(08-clones FUZZ_PERCENTAGE 1)
		add_pdfoutput_test(09-text-layout FUZZ_PERCENTAGE 3)
		add_pdfoutput_test(09-text-layout FUZZ_PERCENTAGE 0.2 SUPERSAMPLING 3)
		add_pdfoutput_test(10-text-paint)
		add_pdfoutput_test(11-text-decoration)
		add_pdfoutput_test(12-rasters FUZZ_PERCENTAGE 1)
		add_pdfoutput_test(13-clips FUZZ_PERCENTAGE 3)
		add_pdfoutput_test(13-clips SUPERSAMPLING 3)
		add_pdfoutput_test(14-filters FUZZ_PERCENTAGE 0.2)
		add_pdfoutput_test(15-many-items)
		endif()

+10 −5

原始行号	差异行号	差异行
		@@ -17,6 +17,7 @@ TEST_SCRIPT=$5
		get_outputs "$6"
		FUZZ=$7
		DPI=$8
		SUPERSAMPLING=$9

		export LC_NUMERIC=C

		@@ -49,13 +50,17 @@ if [ -n "${REFERENCE_FILENAME}" ]; then
		OUTFILE_SUFFIX="[${OUTPUT_PAGE}]" # Use ImageMagick's bracket operator
		fi

		DPI_OPTION=""
		if [ -n "$DPI" ]; then
		DPI_OPTION="-density $DPI"
		if [ -z "$DPI" ]; then
		DPI=72
		fi

		if [ -z "$SUPERSAMPLING" ]; then
		SUPERSAMPLING=1
		fi

		if [[ $(identify -format "%m" "${OUTPUT_FILENAME}") != "PNG" ]] then
		if ! convert $DPI_OPTION ${delegate1}${OUTPUT_FILENAME}${OUTFILE_SUFFIX} ${CONVERSION_OPTIONS} ${PNG_FILENAME}; then
		echo -density "%[fx:$DPI*$SUPERSAMPLING]" ${delegate1}${OUTPUT_FILENAME}${OUTFILE_SUFFIX} ${CONVERSION_OPTIONS} -resize "%[fx:100/$SUPERSAMPLING]%" ${PNG_FILENAME}
		if ! magick -density "%[fx:$DPI*$SUPERSAMPLING]" ${delegate1}${OUTPUT_FILENAME}${OUTFILE_SUFFIX} ${CONVERSION_OPTIONS} -resize "%[fx:100/$SUPERSAMPLING]%" ${PNG_FILENAME}; then
		echo "Warning: Failed to convert test file '${OUTPUT_FILENAME}' to PNG format. Skipping comparison test."
		exit 42
		fi
		@@ -63,7 +68,7 @@ if [ -n "${REFERENCE_FILENAME}" ]; then
		cp "${OUTPUT_FILENAME}" "${PNG_FILENAME}"
		fi
		if [[ $(identify -format "%m" "${REFERENCE_FILENAME}") != "PNG" ]] then
		if ! convert $DPI_OPTION ${delegate2}${REFERENCE_FILENAME} ${CONVERSION_OPTIONS} ${PNG_REFERENCE}; then
		if ! magick -density "%[fx:$DPI*$SUPERSAMPLING]" ${delegate2}${REFERENCE_FILENAME} ${CONVERSION_OPTIONS} -resize "%[fx:100/$SUPERSAMPLING]%" ${PNG_REFERENCE}; then
		echo "Warning: Failed to convert reference file '${REFERENCE_FILENAME}' to PNG format. Skipping comparison test."
		exit 42
		fi

+12 −15

原始行号	差异行号	差异行
		@@ -18,12 +18,15 @@
		type="text/css"
		id="style1">
		text,
		tspan.cjk,
		text.cjk {
		font-family: Noto Sans;
		}
		tspan.arabic,
		text.arabic {
		font-family: 'Noto Sans Arabic';
		}
		tspan.hebrew,
		text.hebrew {
		font-family: 'Noto Sans Hebrew';
		}
		@@ -251,24 +254,16 @@
		style="font-size:15px"
		id="tspan130">Can we do Arabic?</tspan>
		</tspan><tspan
		x="42.5"
		y="251.81549"
		id="tspan132">
		</tspan><tspan
		x="42.5"
		y="262.1655"
		id="tspan134"><tspan
		style="direction:rtl"
		id="tspan133">
		</tspan></tspan><tspan
		x="334.86133"
		y="272.51549"
		class="arabic"
		id="tspan136"><tspan
		dx="0 0 0 0 0 -1.378809 0 0 0 0 0 0 -1.378809 0 0 0 0 0 0 0 -1.378809 0 0 -1.378809 0 0 0 0 0 -1.3787785 0 0 0 0 0 0 -1.3787785 0 0 -1.378809 0 0 -1.378809 0 0 0 0 0 -1.378809 0 -2.6190186 2.618988 0 0 0 -1.378809 0 0 0 0 -1.378809 0 0 -1.378809 0 0 0 0 -1.378809"
		style="direction:rtl"
		id="tspan135">واصل دراسته واكملها في الحرم المكي، ثم في جامعة الإمام محمد بن سعود في </tspan></tspan><tspan
		x="164.02188"
		y="282.86549"
		class="arabic"
		id="tspan142"><tspan
		style="direction:rtl"
		id="tspan137">المملكة </tspan><tspan
		@@ -285,6 +280,7 @@
		id="tspan141">وعلوم الآلة، وتعمق في أصول </tspan></tspan><tspan
		x="157.08139"
		y="293.2155"
		class="arabic"
		id="tspan149"><tspan
		style="direction:rtl"
		id="tspan143">الدين </tspan><tspan
		@@ -304,6 +300,7 @@
		id="tspan148">العلمية </tspan></tspan><tspan
		x="154.76915"
		y="303.56551"
		class="arabic"
		id="tspan156"><tspan
		style="direction:rtl"
		id="tspan150">أستاذًا </tspan><tspan
		@@ -324,6 +321,7 @@
		id="tspan155">حيث </tspan></tspan><tspan
		x="154.76917"
		y="313.91551"
		class="arabic"
		id="tspan200"><tspan
		dx="0 0 0 0 -2.0325336 0 -4.6620026 4.6619987 -2.0325336"
		style="direction:rtl"
		@@ -345,6 +343,7 @@
		id="tspan199"> </tspan></tspan><tspan
		x="111.52233"
		y="324.26552"
		class="arabic"
		id="tspan210"><tspan
		dx="0 0 0 0 0 0 -8.6001606"
		style="direction:rtl"
		@@ -371,6 +370,7 @@
		id="tspan209">سجلها </tspan></tspan><tspan
		x="163.37578"
		y="334.61552"
		class="arabic"
		id="tspan217"><tspan
		style="direction:rtl"
		id="tspan211">له </tspan><tspan
		@@ -390,6 +390,7 @@
		id="tspan216">الرسمي </tspan></tspan><tspan
		x="331.94003"
		y="344.96553"
		class="arabic"
		id="tspan224"><tspan
		style="direction:rtl"
		id="tspan218">في الثقافة </tspan><tspan
		@@ -405,10 +406,6 @@
		dx="279.32405"
		style="direction:rtl"
		id="tspan223">.</tspan>
		</tspan><tspan
		x="42.5"
		y="355.31554"
		id="tspan225">
		</tspan></text>
		<circle
		style="shape-margin:12.4022;fill:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill"
		@@ -421,7 +418,7 @@
		style="shape-margin:5;fill:#000000;fill-opacity:1;stroke-width:1.10885;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill"
		id="circle11"
		cx="709.21136"
		cy="77.645622"
		cy="74.47062"
		r="6.8565106"
		inkscape:label="Excluded Shape 2" />
		</g>

+15.0 KB (24.1 KB)

+5.2 KB (9.6 KB)

加载中

推荐订阅源

PBS activity