[Git][freetype/freetype-demos][master] 2 commits: * Makefile (FTCOMMON_OBJ): Add `graph` dependency, include `rsvg-port`.

[Alexei Podtelezhnikov (@apodtele)]

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

Commits:

• 44f64424
  by Alexei Podtelezhnikov at 2022-08-29T11:37:25-04:00

  * Makefile (FTCOMMON_OBJ): Add `graph` dependency, include `rsvg-port`.
  

• 8aac6a23
  by shugaley at 2022-08-29T11:49:01-04:00

  * src/ftpngout.c (FTDemo_Display_Print): Declare `code` volatile.
  
  Fixes #18.
  

2 changed files:

• Makefile
• src/ftpngout.c

Changes:

Makefile

---

...	...	@@ -374,25 +374,10 @@ else
374	374	$(OBJ_DIR_2)/mlgetopt.$(SO): $(SRC_DIR)/mlgetopt.c
375	375	COMMON_OBJ := $(OBJ_DIR_2)/common.$(SO) \
376	376	$(OBJ_DIR_2)/strbuf.$(SO) \
377		- $(OBJ_DIR_2)/rsvg-port.$(SO) \
378	377	$(OBJ_DIR_2)/output.$(SO) \
379	378	$(OBJ_DIR_2)/md5.$(SO) \
380	379	$(OBJ_DIR_2)/mlgetopt.$(SO)
381	380
382		- $(OBJ_DIR_2)/ftcommon.$(SO): $(SRC_DIR)/ftcommon.c $(SRC_DIR)/ftcommon.h
383		- $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
384		- $T$(subst /,$(COMPILER_SEP),$@ $<)
385		-
386		- $(OBJ_DIR_2)/ftpngout.$(SO): $(SRC_DIR)/ftpngout.c $(SRC_DIR)/ftcommon.h
387		- $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
388		- $T$(subst /,$(COMPILER_SEP),$@ $<)
389		-
390		- $(OBJ_DIR_2)/rsvg-port.$(SO): $(SRC_DIR)/rsvg-port.c $(SRC_DIR)/rsvg-port.h
391		- $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
392		-
393		- FTCOMMON_OBJ := $(OBJ_DIR_2)/ftcommon.$(SO) \
394		- $(OBJ_DIR_2)/ftpngout.$(SO)
395		-
396	381	$(OBJ_DIR_2)/ftdump.$(SO): $(SRC_DIR)/ftdump.c
397	382	$(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
398	383
...	...	@@ -471,6 +456,23 @@ else
471	456	$(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
472	457	$T$(subst /,$(COMPILER_SEP),$@ $<)
473	458
	459	+ $(OBJ_DIR_2)/ftcommon.$(SO): $(SRC_DIR)/ftcommon.c \
	460	+ $(SRC_DIR)/ftcommon.h \
	461	+ $(GRAPH_LIB)
	462	+ $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
	463	+ $T$(subst /,$(COMPILER_SEP),$@ $<)
	464	+
	465	+ $(OBJ_DIR_2)/ftpngout.$(SO): $(SRC_DIR)/ftpngout.c $(SRC_DIR)/ftcommon.h
	466	+ $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
	467	+ $T$(subst /,$(COMPILER_SEP),$@ $<)
	468	+
	469	+ $(OBJ_DIR_2)/rsvg-port.$(SO): $(SRC_DIR)/rsvg-port.c $(SRC_DIR)/rsvg-port.h
	470	+ $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
	471	+
	472	+ FTCOMMON_OBJ := $(OBJ_DIR_2)/ftcommon.$(SO) \
	473	+ $(OBJ_DIR_2)/ftpngout.$(SO) \
	474	+ $(OBJ_DIR_2)/rsvg-port.$(SO)
	475	+
474	476
475	477	####################################################################
476	478	#

src/ftpngout.c

---

...	...	@@ -26,14 +26,14 @@
26	26	int width = bit->width;
27	27	int height = bit->rows;
28	28	int color_type;
29		-
30		- int code = 1;
31		- FILE *fp = NULL;
	29	+ FILE* fp = NULL;
32	30
33	31	png_structp png_ptr = NULL;
34	32	png_infop info_ptr = NULL;
35	33	png_bytep row = NULL;
36	34
	35	+ volatile int code = 1;
	36	+
37	37
38	38	/* Set color_type */
39	39	switch ( bit-> mode )

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