[gs-commits] ghostpdl branch, pdfi, updated. jbig2dec-0.14-2563-g1a1bcfc

The ghostpdl branch, pdfi has been updated
       via  1a1bcfc1df89b57dfd2e339b7672dd91b60fd6d3 (commit)
       via  dd1bfc15712cc8cfeedfcd5c8e89acb53d52327c (commit)
       via  d7118262b44939688c9143c278b8c76c6c620171 (commit)
       via  31c4abe348de980ff7922e28f05cc3f788fab29a (commit)
       via  1a5a05cf164f6657e3cc52f6fa31524ed190b981 (commit)
       via  9a26c1ee0ef8db26ba79f6804a4f09e1c88cb234 (commit)
       via  9d8f69e1e37475775917e71ba9bf82b7a2098942 (commit)
       via  09d9c492f135ceeb6d95323c1b340b1fc03f15ad (commit)
       via  d79e80b43f388d1e9dd53d86466e04bdb2e6be25 (commit)
       via  b74cf2eff085b9270d26818e9064450ac4da41f9 (commit)
       via  763a96187a286432e3c90b564a2031278e3688d0 (commit)
       via  1759596a7499d27e3d289bbff4c45f9206ad4798 (commit)
      from  ad96b0e2ee0ee50530ceb217ae57894791d11052 (commit)

----------------------------------------------------------------------
commit 1a1bcfc1df89b57dfd2e339b7672dd91b60fd6d3
Merge: dd1bfc1 d711826
Author: Ken Sharp <[email protected]>
Date:   Wed Nov 20 14:19:16 2019 +0000

    Merge branch 'master' into pdfi


----------------------------------------------------------------------
commit dd1bfc15712cc8cfeedfcd5c8e89acb53d52327c
Author: Ken Sharp <[email protected]>
Date:   Wed Nov 20 14:18:01 2019 +0000

    fix some compiler warnings
    
    remove a couple of unused 'font' variables
    
    initialise 'code' in one place to see if it shuts the compiler up. There
    are several instances of this where the indicated line is immediately
    after assigning a value to code, so the compiler obviously is not
    reliable about this.

diff --git a/pdf/pdf_font.c b/pdf/pdf_font.c
index b98d9be..d0e3dbe 100644
--- a/pdf/pdf_font.c
+++ b/pdf/pdf_font.c
@@ -35,16 +35,10 @@ int pdfi_d0(pdf_context *ctx)
 {
     int code = 0, gsave_level = 0;
     double width[2];
-    pdf_font *font;
 
     if (ctx->inside_CharProc == false)
         ctx->pdf_warnings |= W_PDF_NOTINCHARPROC;
 
-    if (ctx->pgs->font != NULL && ctx->pgs->font->client_data != NULL)
-        font = (pdf_font *)ctx->pgs->font->client_data;
-    else
-        font = NULL;
-
     if (pdfi_count_stack(ctx) < 2) {
         code = gs_note_error(gs_error_stackunderflow);
         goto d0_error;
@@ -116,16 +110,11 @@ int pdfi_d1(pdf_context *ctx)
 {
     int code = 0, i, gsave_level;
     double wbox[6];
-    pdf_font *font;
 
     if (ctx->inside_CharProc == false)
         ctx->pdf_warnings |= W_PDF_NOTINCHARPROC;
 
     ctx->CharProc_is_d1 = true;
-    if (ctx->pgs->font != NULL && ctx->pgs->font->client_data != NULL)
-        font = (pdf_font *)ctx->pgs->font->client_data;
-    else
-        font = NULL;
 
     if (pdfi_count_stack(ctx) < 2) {
         code = gs_note_error(gs_error_stackunderflow);
diff --git a/pdf/pdf_func.c b/pdf/pdf_func.c
index 9a8fef3..5e92ee0 100644
--- a/pdf/pdf_func.c
+++ b/pdf/pdf_func.c
@@ -695,7 +695,7 @@ int pdfi_build_halftone_function(pdf_context *ctx, gs_function_t ** ppfn, byte *
 {
     gs_function_PtCr_params_t params;
     pdf_stream *function_stream = NULL;
-    int code;
+    int code=0;
     byte *ops = NULL;
     unsigned int size;
     float *pfloat;


Summary of changes:
 base/gp_unifs.c            |    8 +-
 base/gsiorom.c             |    2 +
 base/gsovrc.c              |    6 +-
 base/scfe.c                |    2 +
 configure.ac               |    2 +-
 devices/devs.mak           |   24 -
 devices/gdevgprf.c         | 1332 --------------------------------------------
 devices/vector/gdevpdfu.c  |    4 +-
 devices/vector/gdevtxtw.c  |   16 +-
 jbig2dec/jbig2.c           |   11 +-
 jbig2dec/jbig2_segment.c   |    2 +-
 pcl/pl/plvalue.c           |    8 +
 pdf/pdf_font.c             |   11 -
 pdf/pdf_func.c             |    2 +-
 windows/ghostscript.vcproj |    4 -
 15 files changed, 41 insertions(+), 1393 deletions(-)
 delete mode 100644 devices/gdevgprf.c