[Git][freetype/freetype-demos][fti-warning] [ftinspect] Eliminate compile warnings.

[Charlie Jiang (@cqjjjzr)]

Charlie Jiang pushed to branch fti-warning at FreeType / FreeType Demo Programs

Commits:

• 8ecf60d1
  by Charlie Jiang at 2022-06-28T20:20:39+08:00

  [ftinspect] Eliminate compile warnings.
  
  * src/ftinspect/engine.hpp: Use `uintptr_t` as type for `faceCounter`
  instead of `int`.
  
  * src/ftinspect/engine.cpp: Changing all casts to use `FTC_IDType` type
  (=`uintptr_t`) we defined.
  
  Fixes #10.
  

2 changed files:

• src/ftinspect/engine/engine.cpp
• src/ftinspect/engine/engine.hpp

Changes:

src/ftinspect/engine/engine.cpp

---

...	...	@@ -259,7 +259,7 @@ Engine::numberOfFaces(int fontIndex)
259	259	long numFaces = -1;
260	260
261	261	// search triplet (fontIndex, 0, 0)
262		- FTC_FaceID ftcFaceID = reinterpret_cast<void*>
	262	+ FTC_FaceID ftcFaceID = reinterpret_cast<FTC_FaceID>
263	263	(faceIDMap.value(FaceID(fontIndex,
264	264	0,
265	265	0)));
...	...	@@ -272,7 +272,7 @@ Engine::numberOfFaces(int fontIndex)
272	272	else
273	273	{
274	274	// not found; try to load triplet (fontIndex, 0, 0)
275		- ftcFaceID = reinterpret_cast<void*>(faceCounter);
	275	+ ftcFaceID = reinterpret_cast<FTC_FaceID>(faceCounter);
276	276	faceIDMap.insert(FaceID(fontIndex, 0, 0),
277	277	faceCounter++);
278	278
...	...	@@ -299,7 +299,7 @@ Engine::numberOfNamedInstances(int fontIndex,
299	299	int numNamedInstances = -1;
300	300
301	301	// search triplet (fontIndex, faceIndex, 0)
302		- FTC_FaceID ftcFaceID = reinterpret_cast<void*>
	302	+ FTC_FaceID ftcFaceID = reinterpret_cast<FTC_FaceID>
303	303	(faceIDMap.value(FaceID(fontIndex,
304	304	faceIndex,
305	305	0)));
...	...	@@ -312,7 +312,7 @@ Engine::numberOfNamedInstances(int fontIndex,
312	312	else
313	313	{
314	314	// not found; try to load triplet (fontIndex, faceIndex, 0)
315		- ftcFaceID = reinterpret_cast<void*>(faceCounter);
	315	+ ftcFaceID = reinterpret_cast<FTC_FaceID>(faceCounter);
316	316	faceIDMap.insert(FaceID(fontIndex, faceIndex, 0),
317	317	faceCounter++);
318	318
...	...	@@ -340,7 +340,7 @@ Engine::loadFont(int fontIndex,
340	340	update();
341	341
342	342	// search triplet (fontIndex, faceIndex, namedInstanceIndex)
343		- scaler.face_id = reinterpret_cast<void*>
	343	+ scaler.face_id = reinterpret_cast<FTC_FaceID>
344	344	(faceIDMap.value(FaceID(fontIndex,
345	345	faceIndex,
346	346	namedInstanceIndex)));
...	...	@@ -354,7 +354,7 @@ Engine::loadFont(int fontIndex,
354	354	{
355	355	// not found; try to load triplet
356	356	// (fontIndex, faceIndex, namedInstanceIndex)
357		- scaler.face_id = reinterpret_cast<void*>(faceCounter);
	357	+ scaler.face_id = reinterpret_cast<FTC_FaceID>(faceCounter);
358	358	faceIDMap.insert(FaceID(fontIndex,
359	359	faceIndex,
360	360	namedInstanceIndex),
...	...	@@ -400,7 +400,7 @@ Engine::removeFont(int fontIndex)
400	400	{
401	401	// we iterate over all triplets that contain the given font index
402	402	// and remove them
403		- QMap<FaceID, int>::iterator iter
	403	+ QMap<FaceID, FTC_IDType>::iterator iter
404	404	= faceIDMap.lowerBound(FaceID(fontIndex, 0, 0));
405	405
406	406	for (;;)
...	...	@@ -412,7 +412,7 @@ Engine::removeFont(int fontIndex)
412	412	if (faceID.fontIndex != fontIndex)
413	413	break;
414	414
415		- FTC_FaceID ftcFaceID = reinterpret_cast<void*>(iter.value());
	415	+ FTC_FaceID ftcFaceID = reinterpret_cast<FTC_FaceID>(iter.value());
416	416	FTC_Manager_RemoveFaceID(cacheManager, ftcFaceID);
417	417
418	418	iter = faceIDMap.erase(iter);

src/ftinspect/engine/engine.hpp

---

...	...	@@ -76,8 +76,9 @@ public:
76	76	private:
77	77	MainGUI* gui;
78	78
79		- int faceCounter; // a running number used to initialize `faceIDMap'
80		- QMap<FaceID, int> faceIDMap;
	79	+ using FTC_IDType = uintptr_t;
	80	+ FTC_IDType faceCounter; // a running number used to initialize `faceIDMap'
	81	+ QMap<FaceID, FTC_IDType> faceIDMap;
81	82
82	83	QString curFamilyName;
83	84	QString curStyleName;

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.