[gs-cvs] rev 9114 - trunk/gs/base
ken at ghostscript.com
ken at ghostscript.com
Mon Sep 22 03:56:53 PDT 2008
Author: ken
Date: 2008-09-22 03:56:52 -0700 (Mon, 22 Sep 2008)
New Revision: 9114
Modified:
trunk/gs/base/devs.mak
trunk/gs/base/gdevpdf.c
trunk/gs/base/gdevpdfd.c
trunk/gs/base/gdevpdfg.c
trunk/gs/base/gdevpdfm.c
trunk/gs/base/gdevpdfo.c
trunk/gs/base/gdevpdfu.c
trunk/gs/base/gdevpdfv.c
trunk/gs/base/gdevpdt.c
trunk/gs/base/gdevpsdi.c
trunk/gs/base/gdevpsdp.c
trunk/gs/base/gdevpsdu.c
Log:
Remove a number of no longer required includes from the source, and update the makefile to remove the dependencies.
Local regression testing shows no differences, local builds correctly generate executable.
Expected Differences:
None,
Modified: trunk/gs/base/devs.mak
===================================================================
--- trunk/gs/base/devs.mak 2008-09-19 23:31:25 UTC (rev 9113)
+++ trunk/gs/base/devs.mak 2008-09-22 10:56:52 UTC (rev 9114)
@@ -741,7 +741,7 @@
$(GLOBJ)gdevpsdi.$(OBJ) : $(GLSRC)gdevpsdi.c $(GXERR)\
$(jpeglib__h) $(math__h) $(stdio__h)\
$(gscspace_h)\
- $(scfx_h) $(sdct_h) $(sjpeg_h) $(slzwx_h) $(srlx_h) $(spngpx_h)\
+ $(scfx_h) $(slzwx_h) $(spngpx_h)\
$(strimpl_h) $(szlibx_h)\
$(gdevpsdf_h) $(gdevpsds_h) $(gxdevmem_h) $(gxcspace_h) $(gxparamx_h)\
$(sjbig2_luratech_h) $(sjpx_luratech_h)
@@ -750,7 +750,7 @@
$(GLOBJ)gdevpsdp.$(OBJ) : $(GLSRC)gdevpsdp.c $(GDEVH)\
$(string__h) $(jpeglib__h)\
$(scfx_h) $(sdct_h) $(slzwx_h) $(srlx_h) $(strimpl_h) $(szlibx_h)\
- $(gsparamx_h) $(gsutil_h) $(gdevpsdf_h) $(spprint_h)\
+ $(gsparamx_h) $(gsutil_h) $(gdevpsdf_h)\
$(sjbig2_luratech_h) $(sjpx_luratech_h)
$(GDEVLWFJB2JPXCC) $(GLO_)gdevpsdp.$(OBJ) $(C_) $(GLSRC)gdevpsdp.c
@@ -761,7 +761,7 @@
$(GLOBJ)gdevpsdu.$(OBJ) : $(GLSRC)gdevpsdu.c $(GXERR)\
$(jpeglib__h) $(memory__h) $(stdio__h)\
- $(sa85x_h) $(scfx_h) $(sdct_h) $(sjpeg_h) $(sstring_h) $(strimpl_h)\
+ $(sa85x_h) $(scfx_h) $(sdct_h) $(sjpeg_h) $(strimpl_h)\
$(gdevpsdf_h) $(spprint_h) $(gsovrc_h)
$(GLJCC) $(GLO_)gdevpsdu.$(OBJ) $(C_) $(GLSRC)gdevpsdu.c
@@ -859,7 +859,7 @@
$(GLOBJ)gdevpdf.$(OBJ) : $(GLSRC)gdevpdf.c $(GDEVH)\
$(fcntl__h) $(memory__h) $(string__h) $(time__h) $(unistd__h) $(gp_h)\
- $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h) $(gdevpdt_h) $(smd5_h) $(sarc4_h)\
+ $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h) $(smd5_h) $(sarc4_h)\
$(gdevpdfb_h)
$(GLCC) $(GLO_)gdevpdf.$(OBJ) $(C_) $(GLSRC)gdevpdf.c
@@ -891,8 +891,7 @@
$(memory__h) $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h)\
$(gsfunc0_h) $(gsstate_h) $(gxdcolor_h) $(gxpcolor_h) $(gxcolor2_h) $(gsptype2_h)\
$(gxbitmap_h) $(gxdht_h) $(gxfarith_h) $(gxfmap_h) $(gxht_h) $(gxistate_h)\
- $(gzht_h)\
- $(szlibx_h)
+ $(gzht_h)
$(GLCC) $(GLO_)gdevpdfg.$(OBJ) $(C_) $(GLSRC)gdevpdfg.c
$(GLOBJ)gdevpdfi.$(OBJ) : $(GLSRC)gdevpdfi.c $(memory__h) $(math__h)\
@@ -917,14 +916,14 @@
$(GLOBJ)gdevpdfm.$(OBJ) : $(GLSRC)gdevpdfm.c\
$(math__h) $(memory__h) $(string__h) $(gx_h)\
- $(gdevpdfo_h) $(gdevpdfx_h) $(gserrors_h) $(gsutil_h) $(scanchar_h)\
+ $(gdevpdfo_h) $(gdevpdfx_h) $(gserrors_h) $(gsutil_h)\
$(szlibx_h) $(slzwx_h)
$(GLCC) $(GLO_)gdevpdfm.$(OBJ) $(C_) $(GLSRC)gdevpdfm.c
$(GLOBJ)gdevpdfo.$(OBJ) : $(GLSRC)gdevpdfo.c $(memory__h) $(string__h)\
$(gx_h)\
$(gdevpdfo_h) $(gdevpdfx_h) $(gserrors_h) $(gsparam_h) $(gsutil_h)\
- $(sa85x_h) $(slzwx_h) $(sarc4_h) $(sstring_h) $(strimpl_h) $(szlibx_h)
+ $(sa85x_h) $(sarc4_h) $(strimpl_h)
$(GLCC) $(GLO_)gdevpdfo.$(OBJ) $(C_) $(GLSRC)gdevpdfo.c
$(GLOBJ)gdevpdfp.$(OBJ) : $(GLSRC)gdevpdfp.c $(memory__h) $(string__h) $(gx_h)\
@@ -946,7 +945,7 @@
$(jpeglib__h) $(memory__h) $(string__h)\
$(gdevpdfo_h) $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdtd_h) $(gscdefs_h)\
$(gsdsrc_h) $(gsfunc_h) $(gsfunc3_h)\
- $(sa85x_h) $(scanchar_h) $(scfx_h) $(sdct_h) $(slzwx_h) $(spngpx_h)\
+ $(sa85x_h) $(scfx_h) $(sdct_h) $(slzwx_h) $(spngpx_h)\
$(srlx_h) $(sarc4_h) $(smd5_h) $(sstring_h) $(strimpl_h) $(szlibx_h)\
$(sjbig2_luratech_h) $(sjpx_luratech_h)
$(GDEVLWFJB2JPXCC) $(GLO_)gdevpdfu.$(OBJ) $(C_) $(GLSRC)gdevpdfu.c
@@ -954,8 +953,7 @@
$(GLOBJ)gdevpdfv.$(OBJ) : $(GLSRC)gdevpdfv.c $(GXERR) $(math__h) $(string__h)\
$(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h)\
$(gscindex_h) $(gscoord_h) $(gsiparm3_h) $(gsmatrix_h) $(gsptype2_h)\
- $(gxcolor2_h) $(gxdcolor_h) $(gxpcolor_h) $(gxshade_h)\
- $(szlibx_h)
+ $(gxcolor2_h) $(gxdcolor_h) $(gxpcolor_h) $(gxshade_h)
$(GLCC) $(GLO_)gdevpdfv.$(OBJ) $(C_) $(GLSRC)gdevpdfv.c
$(GLOBJ)ConvertUTF.$(OBJ) : $(GLSRC)ConvertUTF.c $(ConvertUTF_h)
@@ -1011,7 +1009,7 @@
$(ADDMOD) $(DD)pdxtext -include $(GLD)fcopy $(GLD)psf
$(GLOBJ)gdevpdt.$(OBJ) : $(GLSRC)gdevpdt.c $(gx_h) $(gxpath_h) $(memory__h)\
- $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdtf_h) $(gdevpdti_h) $(gdevpdts_h) $(gdevpdtx_h) $(gdevpdt_h)
+ $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdtf_h) $(gdevpdti_h) $(gdevpdtx_h) $(gdevpdt_h)
$(GLCC) $(GLO_)gdevpdt.$(OBJ) $(C_) $(GLSRC)gdevpdt.c
$(GLOBJ)gdevpdtb.$(OBJ) : $(GLSRC)gdevpdtb.c $(memory__h) $(ctype__h) $(string__h)\
Modified: trunk/gs/base/gdevpdf.c
===================================================================
--- trunk/gs/base/gdevpdf.c 2008-09-19 23:31:25 UTC (rev 9113)
+++ trunk/gs/base/gdevpdf.c 2008-09-22 10:56:52 UTC (rev 9114)
@@ -25,7 +25,6 @@
#include "gdevpdfx.h"
#include "gdevpdfg.h" /* only for pdf_reset_graphics */
#include "gdevpdfo.h"
-#include "gdevpdt.h"
#include "smd5.h"
#include "sarc4.h"
Modified: trunk/gs/base/gdevpdfd.c
===================================================================
--- trunk/gs/base/gdevpdfd.c 2008-09-19 23:31:25 UTC (rev 9113)
+++ trunk/gs/base/gdevpdfd.c 2008-09-22 10:56:52 UTC (rev 9114)
@@ -243,6 +243,11 @@
code = gx_cpath_enum_init(&cenum, (gx_clip_path *)pcpath);
if (code < 0)
return code;
+ /* This flags a warning in Coverity, uninitialised variable cenum.first_visit */
+ /* This is because gx_cpath_enum_init doesn't initialise first_visit, but the */
+ /* variable can be used in enum_next. However, this is not truly used this */
+ /* way. The enum_init sets the 'state' to 'scan', and the first thing that happens */
+ /* in enum_next when state is 'scan' is to set first_visit. */
while ((code = gx_cpath_enum_next(&cenum, vs0)) > 0) {
pe_op = gx_path_enum_next(&penum, vs1);
if (pe_op < 0)
@@ -1431,8 +1436,12 @@
params.flatness = pis->flatness;
params.fill_zero_width = false;
gx_path_init_local(&path, pis->memory);
- gx_path_add_rectangle(&path, rect->p.x, rect->p.y, rect->q.x, rect->q.y);
+ code = gx_path_add_rectangle(&path, rect->p.x, rect->p.y, rect->q.x, rect->q.y);
+ if (code < 0)
+ return code;
code = gdev_pdf_fill_path(dev, pis, &path, ¶ms, pdcolor, pcpath);
+ if (code < 0)
+ return code;
gx_path_free(&path, "gdev_pdf_fill_rectangle_hl_color");
return code;
Modified: trunk/gs/base/gdevpdfg.c
===================================================================
--- trunk/gs/base/gdevpdfg.c 2008-09-19 23:31:25 UTC (rev 9113)
+++ trunk/gs/base/gdevpdfg.c 2008-09-22 10:56:52 UTC (rev 9114)
@@ -33,7 +33,6 @@
#include "gdevpdfx.h"
#include "gdevpdfg.h"
#include "gdevpdfo.h"
-#include "szlibx.h"
/* ---------------- Miscellaneous ---------------- */
@@ -853,7 +852,10 @@
data_source_init_bytes(¶ms.DataSource, (const byte *)values,
sizeof(*values) * num_bits);
if (code >= 0 &&
- (code = gs_function_Sd_init(&pfn, ¶ms, mem)) >= 0
+ /* Warning from COverity that params.array_size is uninitialised. Correct */
+ /* but immeidiately after copying the data Sd_init sets the copied value */
+ /* to zero, so it is not actually used uninitialised. */
+ (code = gs_function_Sd_init(&pfn, ¶ms, mem)) >= 0
) {
code = pdf_write_function(pdev, pfn, pid);
gs_function_free(pfn, false, mem);
Modified: trunk/gs/base/gdevpdfm.c
===================================================================
--- trunk/gs/base/gdevpdfm.c 2008-09-19 23:31:25 UTC (rev 9113)
+++ trunk/gs/base/gdevpdfm.c 2008-09-22 10:56:52 UTC (rev 9114)
@@ -21,7 +21,6 @@
#include "gsutil.h" /* for bytes_compare */
#include "gdevpdfx.h"
#include "gdevpdfo.h"
-#include "scanchar.h"
#include "szlibx.h"
#include "slzwx.h"
Modified: trunk/gs/base/gdevpdfo.c
===================================================================
--- trunk/gs/base/gdevpdfo.c 2008-09-19 23:31:25 UTC (rev 9113)
+++ trunk/gs/base/gdevpdfo.c 2008-09-22 10:56:52 UTC (rev 9114)
@@ -23,10 +23,7 @@
#include "gdevpdfo.h"
#include "strimpl.h"
#include "sa85x.h"
-#include "slzwx.h"
#include "sarc4.h"
-#include "sstring.h"
-#include "szlibx.h"
#define CHECK(expr)\
BEGIN if ((code = (expr)) < 0) return code; END
Modified: trunk/gs/base/gdevpdfu.c
===================================================================
--- trunk/gs/base/gdevpdfu.c 2008-09-19 23:31:25 UTC (rev 9113)
+++ trunk/gs/base/gdevpdfu.c 2008-09-22 10:56:52 UTC (rev 9114)
@@ -26,7 +26,6 @@
#include "gdevpdfo.h"
#include "gdevpdfg.h"
#include "gdevpdtd.h"
-#include "scanchar.h"
#include "strimpl.h"
#include "sa85x.h"
#include "scfx.h"
Modified: trunk/gs/base/gdevpdfv.c
===================================================================
--- trunk/gs/base/gdevpdfv.c 2008-09-19 23:31:25 UTC (rev 9113)
+++ trunk/gs/base/gdevpdfv.c 2008-09-22 10:56:52 UTC (rev 9114)
@@ -29,7 +29,6 @@
#include "gdevpdfx.h"
#include "gdevpdfg.h"
#include "gdevpdfo.h"
-#include "szlibx.h"
/* Import the PatternType 2 Pattern device color type. */
extern const gx_device_color_type_t gx_dc_pattern2;
Modified: trunk/gs/base/gdevpdt.c
===================================================================
--- trunk/gs/base/gdevpdt.c 2008-09-19 23:31:25 UTC (rev 9113)
+++ trunk/gs/base/gdevpdt.c 2008-09-22 10:56:52 UTC (rev 9114)
@@ -19,7 +19,6 @@
#include "gdevpdtx.h"
#include "gdevpdtf.h"
#include "gdevpdti.h"
-#include "gdevpdts.h"
/* GC descriptors */
private_st_pdf_text_data();
Modified: trunk/gs/base/gdevpsdi.c
===================================================================
--- trunk/gs/base/gdevpsdi.c 2008-09-19 23:31:25 UTC (rev 9113)
+++ trunk/gs/base/gdevpsdi.c 2008-09-22 10:56:52 UTC (rev 9114)
@@ -26,11 +26,8 @@
#include "gsparamx.h"
#include "strimpl.h"
#include "scfx.h"
-#include "sdct.h"
-#include "sjpeg.h"
#include "slzwx.h"
#include "spngpx.h"
-#include "srlx.h"
#include "szlibx.h"
#ifdef USE_LDF_JB2
#include "sjbig2_luratech.h"
Modified: trunk/gs/base/gdevpsdp.c
===================================================================
--- trunk/gs/base/gdevpsdp.c 2008-09-19 23:31:25 UTC (rev 9113)
+++ trunk/gs/base/gdevpsdp.c 2008-09-22 10:56:52 UTC (rev 9114)
@@ -25,7 +25,6 @@
#include "scfx.h"
#include "sdct.h"
#include "slzwx.h"
-#include "spprint.h"
#include "srlx.h"
#include "szlibx.h"
#ifdef USE_LDF_JB2
Modified: trunk/gs/base/gdevpsdu.c
===================================================================
--- trunk/gs/base/gdevpsdu.c 2008-09-19 23:31:25 UTC (rev 9113)
+++ trunk/gs/base/gdevpsdu.c 2008-09-22 10:56:52 UTC (rev 9114)
@@ -25,7 +25,6 @@
#include "sdct.h"
#include "sjpeg.h"
#include "spprint.h"
-#include "sstring.h"
#include "gsovrc.h"
/* Structure descriptors */
More information about the gs-cvs
mailing list