[Git][freetype/freetype-demos][master] [ftstring] Fix error reporting.

[Alexei Podtelezhnikov (@apodtele)]

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType Demo Programs

Commits:

• 11362b40
  by Alexei Podtelezhnikov at 2023-01-09T22:34:20-05:00

  [ftstring] Fix error reporting.
  
  * src/ftstring.c (Render_*): Do not return or overwrite errors.
  (main): Updated accordingly.
  

1 changed file:

• src/ftstring.c

Changes:

src/ftstring.c

---

...	...	@@ -775,10 +775,11 @@
775	775	}
776	776
777	777
778		- static FT_Error
	778	+ static void
779	779	Render_String( void )
780	780	{
781		- int x, y = display->bitmap->rows - 4;
	781	+ int x, y = display->bitmap->rows - 4;
	782	+ FT_Size size;
782	783
783	784
784	785	x = 4;
...	...	@@ -790,16 +791,21 @@
790	791	x = display->bitmap->width / 2;
791	792	FTDemo_Draw_Glyph( handle, display, dinkus, &x, &y );
792	793
	794	+ /* check the sizing error */
	795	+ error = FTDemo_Get_Size( handle, &size );
	796	+ if ( error )
	797	+ return;
	798	+
793	799	FTDemo_String_Draw( handle, display,
794	800	&status.sc,
795	801	FT_MulFix( display->bitmap->width, status.sc.center),
796	802	display->bitmap->rows / 2 );
797	803
798		- return FT_Err_Ok;
	804	+ return;
799	805	}
800	806
801	807
802		- static FT_Error
	808	+ static void
803	809	Render_Text( void )
804	810	{
805	811	int x = FT_MulFix( display->bitmap->width, status.sc.center);
...	...	@@ -815,7 +821,7 @@
815	821
816	822	error = FTDemo_Get_Size( handle, &size );
817	823	if ( error )
818		- return error;
	824	+ return;
819	825
820	826	step_y = ( size->metrics.height >> 6 ) + 1;
821	827	y = 40 + ( size->metrics.ascender >> 6 );
...	...	@@ -830,11 +836,11 @@
830	836	offset %= handle->string_length;
831	837	}
832	838
833		- return FT_Err_Ok;
	839	+ return;
834	840	}
835	841
836	842
837		- static FT_Error
	843	+ static void
838	844	Render_Waterfall( void )
839	845	{
840	846	int pt_size = status.ptsize, step, pt_height;
...	...	@@ -880,11 +886,11 @@
880	886	FTDemo_Set_Current_Charsize( handle, status.ptsize, status.res );
881	887	FTDemo_String_Load( handle, &status.sc );
882	888
883		- return FT_Err_Ok;
	889	+ return;
884	890	}
885	891
886	892
887		- static FT_Error
	893	+ static void
888	894	Render_KernCmp( void )
889	895	{
890	896	FT_Size size;
...	...	@@ -895,7 +901,9 @@
895	901
896	902	x = 55;
897	903
898		- FTDemo_Get_Size( handle, &size );
	904	+ error = FTDemo_Get_Size( handle, &size );
	905	+ if ( error )
	906	+ return;
899	907	height = size->metrics.y_ppem;
900	908	if ( height < CELLSTRING_HEIGHT )
901	909	height = CELLSTRING_HEIGHT;
...	...	@@ -929,7 +937,7 @@
929	937	"both", display->fore_color );
930	938	FTDemo_String_Draw( handle, display, &sc, x, y );
931	939
932		- return FT_Err_Ok;
	940	+ return;
933	941	}
934	942
935	943
...	...	@@ -993,19 +1001,19 @@
993	1001	switch ( status.render_mode )
994	1002	{
995	1003	case RENDER_MODE_STRING:
996		- error = Render_String();
	1004	+ Render_String();
997	1005	break;
998	1006
999	1007	case RENDER_MODE_TEXT:
1000		- error = Render_Text();
	1008	+ Render_Text();
1001	1009	break;
1002	1010
1003	1011	case RENDER_MODE_WATERFALL:
1004		- error = Render_Waterfall();
	1012	+ Render_Waterfall();
1005	1013	break;
1006	1014
1007	1015	case RENDER_MODE_KERNCMP:
1008		- error = Render_KernCmp();
	1016	+ Render_KernCmp();
1009	1017	break;
1010	1018	}
1011	1019

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. Manage all notifications · Help