[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master 33b27c1 18/22: Split out PNG writing routines.
|
From: |
Werner Lemberg |
|
Subject: |
[freetype2-demos] master 33b27c1 18/22: Split out PNG writing routines. |
|
Date: |
Fri, 5 Mar 2021 11:18:40 -0500 (EST) |
branch: master
commit 33b27c1e9b9cb8a15043542fff61e675b8e457ba
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>
Split out PNG writing routines.
* src/ftcommon.c (FTDemo_Display_Print): Move from here...
* src/ftpngout.c (FTDemo_Display_Print): ... to here.
* Makefile: Updated accordingly.
---
ChangeLog | 8 +++
Makefile | 8 ++-
src/ftcommon.c | 139 --------------------------------------------------
src/ftpngout.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 172 insertions(+), 141 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7ffd8b4..9978374 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2021-02-18 Alexei Podtelezhnikov <apodtele@gmail.com>
+ Split out PNG writing routines.
+
+ * src/ftcommon.c (FTDemo_Display_Print): Move from here...
+ * src/ftpngout.c (FTDemo_Display_Print): ... to here.
+ * Makefile: Updated accordingly.
+
+2021-02-18 Alexei Podtelezhnikov <apodtele@gmail.com>
+
* src/ftcommon.c (FTDemo_String_Draw): Control pen position better.
2021-02-18 Alexei Podtelezhnikov <apodtele@gmail.com>
diff --git a/Makefile b/Makefile
index 72a320b..810142f 100644
--- a/Makefile
+++ b/Makefile
@@ -342,12 +342,16 @@ else
$(OBJ_DIR_2)/output.$(SO) \
$(OBJ_DIR_2)/mlgetopt.$(SO)
+ $(OBJ_DIR_2)/ftcommon.$(SO): $(SRC_DIR)/ftcommon.c $(SRC_DIR)/ftcommon.h
+ $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
+ $T$(subst /,$(COMPILER_SEP),$@ $<)
- FTCOMMON_OBJ := $(OBJ_DIR_2)/ftcommon.$(SO)
- $(FTCOMMON_OBJ): $(SRC_DIR)/ftcommon.c $(SRC_DIR)/ftcommon.h
+ $(OBJ_DIR_2)/ftpngout.$(SO): $(SRC_DIR)/ftpngout.c $(SRC_DIR)/ftcommon.h
$(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
$T$(subst /,$(COMPILER_SEP),$@ $<)
+ FTCOMMON_OBJ := $(OBJ_DIR_2)/ftcommon.$(SO) \
+ $(OBJ_DIR_2)/ftpngout.$(SO)
$(OBJ_DIR_2)/ftlint.$(SO): $(SRC_DIR)/ftlint.c
$(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
diff --git a/src/ftcommon.c b/src/ftcommon.c
index 31ccf7b..d24236c 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -43,10 +43,6 @@
#include <string.h>
#include <stdarg.h>
-#ifdef FT_CONFIG_OPTION_USE_PNG
-#include <png.h>
-#endif
-
#ifdef _WIN32
#define strcasecmp _stricmp
@@ -233,141 +229,6 @@
}
- int
- FTDemo_Display_Print( FTDemo_Display* display,
- const char* filename,
- FT_String* ver_str )
- {
-
-#ifdef FT_CONFIG_OPTION_USE_PNG
-
- grBitmap* bit = display->bitmap;
- int width = bit->width;
- int height = bit->rows;
- int color_type;
-
- int code = 1;
- FILE *fp = NULL;
-
- png_structp png_ptr = NULL;
- png_infop info_ptr = NULL;
- png_bytep row = NULL;
-
-
- /* Set color_type */
- switch ( bit-> mode )
- {
- case gr_pixel_mode_gray:
- color_type = PNG_COLOR_TYPE_GRAY;
- break;
- case gr_pixel_mode_rgb24:
- case gr_pixel_mode_rgb32:
- color_type = PNG_COLOR_TYPE_RGB;
- break;
- default:
- fprintf( stderr, "Unsupported color type\n" );
- goto Exit0;
- }
-
- /* Open file for writing (binary mode) */
- fp = fopen( filename, "wb" );
- if ( fp == NULL )
- {
- fprintf( stderr, "Could not open file %s for writing\n", filename );
- goto Exit0;
- }
-
- /* Initialize write structure */
- png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL
);
- if ( png_ptr == NULL )
- {
- fprintf( stderr, "Could not allocate write struct\n" );
- goto Exit1;
- }
-
- /* Initialize info structure */
- info_ptr = png_create_info_struct( png_ptr );
- if ( info_ptr == NULL )
- {
- fprintf( stderr, "Could not allocate info struct\n" );
- goto Exit2;
- }
-
- /* Set up exception handling */
- if ( setjmp( png_jmpbuf( png_ptr ) ) )
- {
- fprintf( stderr, "Error during png creation\n" );
- goto Exit2;
- }
-
- png_init_io( png_ptr, fp );
-
- /* Write header (8 bit colour depth) */
- png_set_IHDR( png_ptr, info_ptr, width, height,
- 8, color_type, PNG_INTERLACE_NONE,
- PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE );
-
- /* Record version string */
- if ( ver_str != NULL )
- {
- png_text text;
-
-
- text.compression = PNG_TEXT_COMPRESSION_NONE;
- text.key = (char *)"Software";
- text.text = ver_str;
-
- png_set_text( png_ptr, info_ptr, &text, 1 );
- }
-
- /* Set gamma */
- png_set_gAMA( png_ptr, info_ptr, 1.0 / display->gamma );
-
- png_write_info( png_ptr, info_ptr );
-
- if ( bit->mode == gr_pixel_mode_rgb32 )
- {
- const int x = 1;
-
-
- if ( *(char*)&x ) /* little endian */
- {
- png_set_filler( png_ptr, 0, PNG_FILLER_AFTER );
- png_set_bgr( png_ptr );
- }
- else
- png_set_filler( png_ptr, 0, PNG_FILLER_BEFORE );
- }
-
- /* Write image rows */
- row = bit->buffer;
- if ( bit->pitch < 0 )
- row -= ( bit->rows - 1 ) * bit->pitch;
- while ( height-- )
- {
- png_write_row( png_ptr, row );
- row += bit->pitch;
- }
-
- /* End write */
- png_write_end( png_ptr, NULL );
- code = 0;
-
- Exit2:
- png_destroy_write_struct( &png_ptr, &info_ptr );
- Exit1:
- fclose( fp );
- Exit0:
- return code;
-
-#else
-
- return 0;
-
-#endif /* !FT_CONFIG_OPTION_USE_PNG */
- }
-
-
/*************************************************************************/
/*************************************************************************/
/***** *****/
diff --git a/src/ftpngout.c b/src/ftpngout.c
new file mode 100644
index 0000000..ee79f59
--- /dev/null
+++ b/src/ftpngout.c
@@ -0,0 +1,158 @@
+/****************************************************************************/
+/* */
+/* The FreeType project -- a free and portable quality TrueType renderer. */
+/* */
+/* Copyright (C) 2019-2021 by */
+/* D. Turner, R.Wilhelm, and W. Lemberg */
+/* */
+/* */
+/* ftpngout.c - PNG printing routines for FreeType demo programs. */
+/* */
+/****************************************************************************/
+
+#include "ftcommon.h"
+
+
+#ifdef FT_CONFIG_OPTION_USE_PNG
+
+#include <png.h>
+
+ int
+ FTDemo_Display_Print( FTDemo_Display* display,
+ const char* filename,
+ FT_String* ver_str )
+ {
+ grBitmap* bit = display->bitmap;
+ int width = bit->width;
+ int height = bit->rows;
+ int color_type;
+
+ int code = 1;
+ FILE *fp = NULL;
+
+ png_structp png_ptr = NULL;
+ png_infop info_ptr = NULL;
+ png_bytep row = NULL;
+
+
+ /* Set color_type */
+ switch ( bit-> mode )
+ {
+ case gr_pixel_mode_gray:
+ color_type = PNG_COLOR_TYPE_GRAY;
+ break;
+ case gr_pixel_mode_rgb24:
+ case gr_pixel_mode_rgb32:
+ color_type = PNG_COLOR_TYPE_RGB;
+ break;
+ default:
+ fprintf( stderr, "Unsupported color type\n" );
+ goto Exit0;
+ }
+
+ /* Open file for writing (binary mode) */
+ fp = fopen( filename, "wb" );
+ if ( fp == NULL )
+ {
+ fprintf( stderr, "Could not open file %s for writing\n", filename );
+ goto Exit0;
+ }
+
+ /* Initialize write structure */
+ png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL
);
+ if ( png_ptr == NULL )
+ {
+ fprintf( stderr, "Could not allocate write struct\n" );
+ goto Exit1;
+ }
+
+ /* Initialize info structure */
+ info_ptr = png_create_info_struct( png_ptr );
+ if ( info_ptr == NULL )
+ {
+ fprintf( stderr, "Could not allocate info struct\n" );
+ goto Exit2;
+ }
+
+ /* Set up exception handling */
+ if ( setjmp( png_jmpbuf( png_ptr ) ) )
+ {
+ fprintf( stderr, "Error during png creation\n" );
+ goto Exit2;
+ }
+
+ png_init_io( png_ptr, fp );
+
+ /* Write header (8 bit colour depth) */
+ png_set_IHDR( png_ptr, info_ptr, width, height,
+ 8, color_type, PNG_INTERLACE_NONE,
+ PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE );
+
+ /* Record version string */
+ if ( ver_str != NULL )
+ {
+ png_text text;
+
+
+ text.compression = PNG_TEXT_COMPRESSION_NONE;
+ text.key = (char *)"Software";
+ text.text = ver_str;
+
+ png_set_text( png_ptr, info_ptr, &text, 1 );
+ }
+
+ /* Set gamma */
+ png_set_gAMA( png_ptr, info_ptr, 1.0 / display->gamma );
+
+ png_write_info( png_ptr, info_ptr );
+
+ if ( bit->mode == gr_pixel_mode_rgb32 )
+ {
+ const int x = 1;
+
+
+ if ( *(char*)&x ) /* little endian */
+ {
+ png_set_filler( png_ptr, 0, PNG_FILLER_AFTER );
+ png_set_bgr( png_ptr );
+ }
+ else
+ png_set_filler( png_ptr, 0, PNG_FILLER_BEFORE );
+ }
+
+ /* Write image rows */
+ row = bit->buffer;
+ if ( bit->pitch < 0 )
+ row -= ( bit->rows - 1 ) * bit->pitch;
+ while ( height-- )
+ {
+ png_write_row( png_ptr, row );
+ row += bit->pitch;
+ }
+
+ /* End write */
+ png_write_end( png_ptr, NULL );
+ code = 0;
+
+ Exit2:
+ png_destroy_write_struct( &png_ptr, &info_ptr );
+ Exit1:
+ fclose( fp );
+ Exit0:
+ return code;
+ }
+
+#else
+
+ int
+ FTDemo_Display_Print( FTDemo_Display* display,
+ const char* filename,
+ FT_String* ver_str )
+ {
+ return 0;
+ }
+
+#endif /* !FT_CONFIG_OPTION_USE_PNG */
+
+
+/* End */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master 33b27c1 18/22: Split out PNG writing routines.,
Werner Lemberg <=