support both big- and little-endian TIFF files. don't crash in close_input_file() if current_input_handler is NULL. REL_0_32

Tue, 25 Mar 2003 09:38:08 +0000

author
eric
date
Tue, 25 Mar 2003 09:38:08 +0000
changeset 156
745483d15215
parent 155
cbc23650d9ca
child 157
160d624271cc

support both big- and little-endian TIFF files. don't crash in close_input_file() if current_input_handler is NULL.

Makefile file | annotate | diff | revisions
tumble_input.c file | annotate | diff | revisions
     1.1 diff -r cbc23650d9ca -r 745483d15215 Makefile
     1.2 --- a/Makefile	Tue Mar 25 09:36:56 2003 +0000
     1.3 +++ b/Makefile	Tue Mar 25 09:38:08 2003 +0000
     1.4 @@ -1,6 +1,6 @@
     1.5  # tumble: build a PDF file from image files
     1.6  # Makefile
     1.7 -# $Id: Makefile,v 1.38 2003/03/20 00:20:52 eric Exp $
     1.8 +# $Id: Makefile,v 1.39 2003/03/25 01:38:08 eric Exp $
     1.9  # Copyright 2001, 2002, 2003 Eric Smith <eric@brouhaha.com>
    1.10  #
    1.11  # This program is free software; you can redistribute it and/or modify
    1.12 @@ -57,7 +57,7 @@
    1.13  # let me know why so I can improve this Makefile.
    1.14  # -----------------------------------------------------------------------------
    1.15  
    1.16 -VERSION = 0.31
    1.17 +VERSION = 0.32
    1.18  
    1.19  PACKAGE = tumble
    1.20  
     2.1 diff -r cbc23650d9ca -r 745483d15215 tumble_input.c
     2.2 --- a/tumble_input.c	Tue Mar 25 09:36:56 2003 +0000
     2.3 +++ b/tumble_input.c	Tue Mar 25 09:38:08 2003 +0000
     2.4 @@ -2,7 +2,7 @@
     2.5   * tumble: build a PDF file from image files
     2.6   *
     2.7   * Input handler dispatch
     2.8 - * $Id: tumble_input.c,v 1.3 2003/03/20 06:55:27 eric Exp $
     2.9 + * $Id: tumble_input.c,v 1.4 2003/03/25 01:38:08 eric Exp $
    2.10   * Copyright 2001, 2002, 2003 Eric Smith <eric@brouhaha.com>
    2.11   *
    2.12   * This program is free software; you can redistribute it and/or modify
    2.13 @@ -110,9 +110,13 @@
    2.14  
    2.15  bool close_input_file (void)
    2.16  {
    2.17 -  bool result;
    2.18 +  bool result = 1;
    2.19  
    2.20 -  result = current_input_handler->close_input_file ();
    2.21 +  if (current_input_handler)
    2.22 +    {
    2.23 +      result = current_input_handler->close_input_file ();
    2.24 +      current_input_handler = NULL;
    2.25 +    }
    2.26    if (in_filename)
    2.27      free (in_filename);
    2.28    if (in)
    2.29 @@ -127,6 +131,8 @@
    2.30  
    2.31  bool last_input_page (void)
    2.32  {
    2.33 +  if (! current_input_handler)
    2.34 +    return (0);
    2.35    return (current_input_handler->last_input_page ());
    2.36  }
    2.37  
    2.38 @@ -135,6 +141,8 @@
    2.39  		     input_attributes_t input_attributes,
    2.40  		     image_info_t *image_info)
    2.41  {
    2.42 +  if (! current_input_handler)
    2.43 +    return (0);
    2.44    return (current_input_handler->get_image_info (image,
    2.45  						 input_attributes,
    2.46  						 image_info));
    2.47 @@ -145,6 +153,8 @@
    2.48  		    image_info_t *image_info,
    2.49  		    pdf_page_handle page)
    2.50  {
    2.51 +  if (! current_input_handler)
    2.52 +    return (0);
    2.53    return (current_input_handler->process_image (image,
    2.54  						input_attributes,
    2.55  						image_info,