Initialize a non-empty PNG ICC profile name

[kmilos]

Fixes #2354

[kevinbackhouse]

Fix looks good. Do we have a test image for this? (I don't see one attached to #2354 either.)

[kevinbackhouse]

I think conan must have made a backwards-incompatible change that's broken our build. I got the same failures in #2353.

[kmilos]

Fix looks good.

I might add the possibility to set the name though (API only, not CLI), as mentioned in the issue...

Do we have a test image for this?

We do have one test that seems to produce an empty profile name:

exiv2/tests/bash_tests/testcases.py

Lines 1013 to 1094 in d2253c9

	def stdin_test(self):
	return # temporarily disable
	# Test driver for stdin
	try:
	import lxml
	except ModuleNotFoundError:
	print('Skipped. Because it misses module lxml. Please install: `pip install lxml`')
	return
	out = BT.Output()
	a = 'exiv2-bug1229.jpg' # jpg with 2 APP1/xap segments
	b = 'girl.jpg'
	BT.copyTestFile(a)
	def get_xmpData(img):
	e = BT.Executer('exiv2 -pX {img}', vars(), decode_output=False)
	return e.stdout.replace(b'\n', b'\r\n', 16) # Ignore the difference in newline
	BT.copyTestFile(a, b)
	out += BT.Executer('exiv2 -pS {b}', vars())
	out += BT.Executer('exiv2 -dX {b}', vars()) # remove first
	out += BT.Executer('exiv2 -pS {b}', vars())
	e = BT.Executer('exiv2 -pX {a}', vars(), decode_output=False)
	with open('out2', 'wb') as f:
	f.write(e.stdout)
	out += BT.Executer('exiv2 -iXX- {b}', vars(), stdin=get_xmpData(a))
	out += BT.Executer('exiv2 -pS {b}', vars())
	BT.copyTestFile(a, b)
	out += BT.Executer('exiv2 -dX {b}', vars())
	out += BT.Executer('exiv2 -dX {b}', vars())
	out += BT.Executer('exiv2 -pS {b}', vars())
	out += BT.Executer('exiv2 -iXX- {b}', vars(), stdin=get_xmpData(a))
	out += BT.Executer('exiv2 -pS {b}', vars())
	for f in ['Reagan.jpg', 'Reagan.tiff', 'ReaganSmallPng.png']:
	BT.copyTestFile(f)
	out += BT.Executer('exiv2 -iXX- {f}', vars(), stdin=get_xmpData(a))
	e = BT.Executer('exiv2 -pX {f}', vars())
	out += """
	<?xml version="1.0"?>
	<?xpacket begin='\ufeff' id='W5M0MpCehiHzreSzNTczkc9d'?>
	{}
	<?xpacket end='w'?>
	""".strip('\n').format(BT.pretty_xml(e.stdout))
	for f in ['Reagan.jpg', 'ReaganSmallPng.png']:
	BT.copyTestFile(f)
	BT.copyTestFile(a, b)
	out += BT.Executer('exiv2 -pS {b}', vars())
	e = BT.Executer('exiv2 -ea- {f}', vars(), decode_output=False)
	out += BT.Executer('exiv2 -ia- {b}', vars(), stdin=e.stdout)
	out += BT.Executer('exiv2 -pS {b}', vars())
	BT.copyTestFile('Reagan.tiff') # 1272 ReaganLargeTiff.tiff
	for img in ['Reagan.jpg', 'ReaganSmallPng.png', 'exiv2-bug1199.webp']:
	BT.copyTestFile(img)
	e = BT.Executer('exiv2 -eC- Reagan.tiff', decode_output=False)
	# Ignore the difference in the path separator
	stdout = e.stdout
	for pair in [
	(b'\x03/\x9e', b'\x03\\\x9e'),
	(b'\x0c/\x0c', b'\x0c\\\x0c'),
	(b'V/V' , b'V\\V' ),
	(b'\xe5/5' , b'\xe5\\5' ),
	(b'5/\x86' , b'5\\\x86' ),
	(b'\x86/\xd6', b'\x86\\\xd6'),
	(b'\xac/\xac', b'\xac\\\xac'),
	(b'\xd7/\xd7', b'\xd7\\\xd7'),
	]:
	stdout = stdout.replace(pair[0], pair[1])
	out += BT.Executer('exiv2 -iC- {img}', vars(), stdin=stdout)
	out += BT.Executer('exiv2 -pS {img}', vars())
	if img == 'ReaganSmallPng.png':
	with open('out2', 'wb') as f:
	f.write(e.stdout)
	BT.reportTest('stdin-test', out)

But it should have failed now, no? Needs looking into...

[kmilos]

Ah, the stdin_test above is disabled 🤦

When I enable it, it does fail for many other reasons, but in the generated test/tmp/stdin-test.out I see the corrected

    9337 | iCCP  |    2604 | ICC Profile..x...wTS.....7.&.. | 0x876f2b5d

instead of the current, empty, test/data/test_reference_files/stdin-test.out reference:

    9337 | iCCP  |    2598 | ..x...wTS.....7.P.....khR.H..H | 0x915a222e

[kmilos]

Actually, specialization of both setICCProfile() and clearICCProfile() is mandatory now that I thought about it more...