summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/gpmisc.c6
-rw-r--r--base/gsdparam.c4
-rw-r--r--base/gxcht.c10
-rw-r--r--base/gxcmap.c14
-rw-r--r--base/lib.mak6
-rw-r--r--base/mkromfs.c5
-rw-r--r--base/ttobjs.c23
7 files changed, 37 insertions, 31 deletions
diff --git a/base/gpmisc.c b/base/gpmisc.c
index 3d878acce..38d6d60e2 100644
--- a/base/gpmisc.c
+++ b/base/gpmisc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2021 Artifex Software, Inc.
+/* Copyright (C) 2001-2023 Artifex Software, Inc.
All Rights Reserved.
This software is provided AS-IS with no warranty, either express or
@@ -839,7 +839,7 @@ do_open_scratch_file(const gs_memory_t *mem,
gp_file *
gp_open_scratch_file(const gs_memory_t *mem,
const char *prefix,
- char *fname,
+ char fname[gp_file_name_sizeof],
const char *mode)
{
return do_open_scratch_file(mem, prefix, fname, mode, 0);
@@ -848,7 +848,7 @@ gp_open_scratch_file(const gs_memory_t *mem,
gp_file *
gp_open_scratch_file_rm(const gs_memory_t *mem,
const char *prefix,
- char *fname,
+ char fname[gp_file_name_sizeof],
const char *mode)
{
return do_open_scratch_file(mem, prefix, fname, mode, 1);
diff --git a/base/gsdparam.c b/base/gsdparam.c
index 1fd0df148..64d19c54d 100644
--- a/base/gsdparam.c
+++ b/base/gsdparam.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2022 Artifex Software, Inc.
+/* Copyright (C) 2001-2023 Artifex Software, Inc.
All Rights Reserved.
This software is provided AS-IS with no warranty, either express or
@@ -26,6 +26,8 @@
#include "gxfixed.h"
#include "gsicc_manage.h"
#include "gdevnup.h" /* to install N-up subclass device */
+#include "gp_utf8.h"
+
extern gx_device_nup gs_nup_device;
/* Define whether we accept PageSize as a synonym for MediaSize. */
diff --git a/base/gxcht.c b/base/gxcht.c
index 8db030465..2de5924b6 100644
--- a/base/gxcht.c
+++ b/base/gxcht.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2021 Artifex Software, Inc.
+/* Copyright (C) 2001-2023 Artifex Software, Inc.
All Rights Reserved.
This software is provided AS-IS with no warranty, either express or
@@ -538,9 +538,9 @@ static SET_HT_COLORS_PROC(set_ht_colors_gt_4);
gx_color_index plane_mask, /* which planes are halftoned */\
gx_device *dev, /* in case we are mapping lazily */\
const color_values_pair_t *pvp, /* color values ditto */\
- gx_color_index colors[MAX_DCC], /* the actual colors for the tile, */\
+ gx_color_index colors[MAX_DCC_16], /* the actual colors for the tile, */\
/* actually [nplanes] */\
- const gx_const_strip_bitmap * sbits[MAX_DCC] /* the bitmaps for the planes, */\
+ const gx_const_strip_bitmap * sbits[MAX_DCC_16] /* the bitmaps for the planes, */\
/* actually [nplanes] */\
)
@@ -1153,7 +1153,7 @@ set_color_ht_le_4(byte *dest_data, uint dest_raster, int px, int py,
gx_color_index plane_mask, gx_device *ignore_dev,
const color_values_pair_t *ignore_pvp,
gx_color_index colors[MAX_DCC_16],
- const gx_const_strip_bitmap * sbits[MAX_DCC])
+ const gx_const_strip_bitmap * sbits[MAX_DCC_16])
{
/*
* Note that the planes are specified in the order RGB or CMYK, but
@@ -1344,7 +1344,7 @@ set_color_ht_gt_4(byte *dest_data, uint dest_raster, int px, int py,
gx_color_index plane_mask, gx_device *dev,
const color_values_pair_t *pvp,
gx_color_index colors[MAX_DCC_16],
- const gx_const_strip_bitmap * sbits[MAX_DCC])
+ const gx_const_strip_bitmap * sbits[MAX_DCC_16])
{
int x, y;
tile_cursor_t cursor[MAX_DCC];
diff --git a/base/gxcmap.c b/base/gxcmap.c
index 39aff3b2e..b2cad8c41 100644
--- a/base/gxcmap.c
+++ b/base/gxcmap.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2022 Artifex Software, Inc.
+/* Copyright (C) 2001-2023 Artifex Software, Inc.
All Rights Reserved.
This software is provided AS-IS with no warranty, either express or
@@ -1803,7 +1803,7 @@ gx_default_w_b_mono_encode_color(gx_device *dev, const gx_color_value cv[])
int
gx_default_w_b_mono_decode_color(gx_device * dev, gx_color_index color,
- gx_color_value pgray[1])
+ gx_color_value pgray[])
{ /* Map 0 to max_value, 1 to 0. */
pgray[0] = -(gx_color_value) color;
return 0;
@@ -1839,7 +1839,7 @@ gx_default_b_w_mono_encode_color(gx_device *dev, const gx_color_value cv[])
int
gx_default_b_w_mono_decode_color(gx_device * dev, gx_color_index color,
- gx_color_value pgray[1])
+ gx_color_value pgray[])
{ /* Map 0 to max_value, 1 to 0. */
pgray[0] = -((gx_color_value) color ^ 1);
return 0;
@@ -1904,7 +1904,7 @@ gx_default_8bit_map_gray_color(gx_device * dev, const gx_color_value cv[])
int
gx_default_8bit_map_color_gray(gx_device * dev, gx_color_index color,
- gx_color_value pgray[1])
+ gx_color_value pgray[])
{
pgray[0] = (gx_color_value)(color * gx_max_color_value / 255);
return 0;
@@ -1996,7 +1996,7 @@ cmyk_1bit_map_color_rgb(gx_device * dev, gx_color_index color,
int
cmyk_1bit_map_color_cmyk(gx_device * dev, gx_color_index color,
- gx_color_value pcv[4])
+ gx_color_value pcv[])
{
pcv[0] = (color & 8 ? 0 : gx_max_color_value);
pcv[1] = (color & 4 ? 0 : gx_max_color_value);
@@ -2052,7 +2052,7 @@ cmyk_8bit_map_color_rgb(gx_device * dev, gx_color_index color,
int
cmyk_8bit_map_color_cmyk(gx_device * dev, gx_color_index color,
- gx_color_value pcv[4])
+ gx_color_value pcv[])
{
pcv[0] = gx_color_value_from_byte((color >> 24) & 0xff);
pcv[1] = gx_color_value_from_byte((color >> 16) & 0xff);
@@ -2063,7 +2063,7 @@ cmyk_8bit_map_color_cmyk(gx_device * dev, gx_color_index color,
int
cmyk_16bit_map_color_cmyk(gx_device * dev, gx_color_index color,
- gx_color_value pcv[4])
+ gx_color_value pcv[])
{
pcv[0] = ((color >> 24) >> 24) & 0xffff;
pcv[1] = ((color >> 16) >> 16) & 0xffff;
diff --git a/base/lib.mak b/base/lib.mak
index 01979c75c..2d1fe04ee 100644
--- a/base/lib.mak
+++ b/base/lib.mak
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2022 Artifex Software, Inc.
+# Copyright (C) 2001-2023 Artifex Software, Inc.
# All Rights Reserved.
#
# This software is provided AS-IS with no warranty, either express or
@@ -649,6 +649,8 @@ gdevoflt_h=$(GLSRC)gdevoflt.h
gdevnup_h=$(GLSRC)gdevnup.h
+gp_utf8_h=$(GLSRC)gp_utf8.h
+
png__h=$(GLSRC)png_.h $(MAKEFILE)
x__h=$(GLSRC)x_.h
@@ -990,7 +992,7 @@ $(GLOBJ)gsdevmem.$(OBJ) : $(GLSRC)gsdevmem.c $(AK) $(gx_h)\
$(GLOBJ)gsdparam.$(OBJ) : $(GLSRC)gsdparam.c $(AK) $(gx_h)\
$(gserrors_h) $(memory__h) $(string__h)\
$(gsdevice_h) $(gsparam_h) $(gsparamx_h) $(gxdevice_h) $(gxfixed_h)\
- $(gsicc_manage_h) $(LIB_MAK) $(MAKEDIRS)
+ $(gsicc_manage_h) $(gdevnup_h) $(gp_utf8_h) $(LIB_MAK) $(MAKEDIRS)
$(GLCC) $(GLO_)gsdparam.$(OBJ) $(C_) $(GLSRC)gsdparam.c
$(GLOBJ)gsfname.$(OBJ) : $(GLSRC)gsfname.c $(AK) $(memory__h)\
diff --git a/base/mkromfs.c b/base/mkromfs.c
index f0f98543d..c86a6d0f8 100644
--- a/base/mkromfs.c
+++ b/base/mkromfs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2022 Artifex Software, Inc.
+/* Copyright (C) 2001-2023 Artifex Software, Inc.
All Rights Reserved.
This software is provided AS-IS with no warranty, either express or
@@ -87,7 +87,8 @@
#include <zlib.h>
int gs_log_error(int err, const char *file, int line);
-
+/* Prototype to placate compiler */
+int spgetcc(stream *s, bool b);
/*
* The rom file system is an array of pointers to nodes, terminated by a NULL
*/
diff --git a/base/ttobjs.c b/base/ttobjs.c
index 5fa95a887..f3227403d 100644
--- a/base/ttobjs.c
+++ b/base/ttobjs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2022 Artifex Software, Inc.
+/* Copyright (C) 2001-2023 Artifex Software, Inc.
All Rights Reserved.
This software is provided AS-IS with no warranty, either express or
@@ -328,18 +328,19 @@ static int free_aux(ttfMemory *mem, void *ptr)
ALLOC_ARRAY( exec->pts.contours, exec->n_contours, face->maxContours, UShort )
/* reserve contours array */
- )
- goto Fail_Memory;
+ ) {
+ goto Fail_Memory;
+ }
- SETMAX(exec->callSize, callSize);
- SETMAX(exec->stackSize, stackSize);
- SETMAX(exec->twilight.n_points, n_twilight);
- SETMAX(exec->maxGlyphSize, maxp->maxSizeOfInstructions);
- SETMAX(exec->n_contours, face->maxContours);
- SETMAX(exec->n_points, n_points);
- exec->lock++;
+ SETMAX(exec->callSize, callSize);
+ SETMAX(exec->stackSize, stackSize);
+ SETMAX(exec->twilight.n_points, n_twilight);
+ SETMAX(exec->maxGlyphSize, maxp->maxSizeOfInstructions);
+ SETMAX(exec->n_contours, face->maxContours);
+ SETMAX(exec->n_points, n_points);
+ exec->lock++;
- return TT_Err_Ok;
+ return TT_Err_Ok;
Fail_Memory:
/* Context_Destroy( exec ); Don't release buffers because the context is shared. */
View Lorry Controller Status