"proper fix for handling non-idraw PostScript"

Patch:    ivtools-020716-johnston-057
For:      ivtools-1.0.4
Author:   [email protected]
Subject:  proper fix for handling non-idraw PostScript
Requires: 

This is an intermediate patch to ivtools-1.0.4.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

	patch -p0 <ThisFile

Summary of Changes:

- a proper fix for handling non-idraw PostScript.  An improper fix was
introduced in ivtools-1.0.3 that made all idraw format files get
filtered through pstoedit (if you had it).

Index: OverlayUnidraw/ovimport.c
diff -c OverlayUnidraw/ovimport.c:1.8 OverlayUnidraw/ovimport.c:1.9
*** OverlayUnidraw/ovimport.c:1.8	Fri Jun 28 12:46:35 2002
--- src/OverlayUnidraw/ovimport.c	Tue Jul 16 11:36:28 2002
***************
*** 973,986 ****
        if (ftype==UnknownFile) ftype = OvImportCmd::PostScriptFile;
      }
  
-     /* other PostScript files */
-     if (!*creator && strncmp(line, "%!PS", 4)==0) {
-       ftype = OvImportCmd::PostScriptFile;
-       strcpy(creator, "PostScript");
-     }
-     
      /* fullup idraw format */
      if (!*creator && line[0] == '%' && line[1] == '!' ) {
        do {
  	if (sscanf(line, "%%%%Creator: %s", creator)) {
  	  break;
--- 973,981 ----
        if (ftype==UnknownFile) ftype = OvImportCmd::PostScriptFile;
      }
  
      /* fullup idraw format */
      if (!*creator && line[0] == '%' && line[1] == '!' ) {
+       ftype = OvImportCmd::PostScriptFile;
        do {
  	if (sscanf(line, "%%%%Creator: %s", creator)) {
  	  break;
***************
*** 990,998 ****
  	}
        } while (in.getline(line, linesz) != NULL);
        chcnt = 0;
!       if (*creator && ftype==UnknownFile) ftype = OvImportCmd::PostScriptFile;
      }
-     
      
      if (!*creator) {
        char *ptr = line;
--- 985,992 ----
  	}
        } while (in.getline(line, linesz) != NULL);
        chcnt = 0;
!       if (!*creator) strcpy(creator, "PostScript");
      }
      
      if (!*creator) {
        char *ptr = line;
*** /dev/null	 Tue Jul 16 11:36:54 PDT 2002
--- patches/ivtools-020716-johnston-057
*************** patches/ivtools-020716-johnston-057
*** 0 ****
--- 1 ----
+ ivtools-020716-johnston-057


-------------------------------------------------------
This sf.net email is sponsored by: Jabber - The world's fastest growing 
real-time communications platform! Don't just IM. Build it in! 
http://www.jabber.com/osdn/xim