Reverse messed up commit

git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2222 9d0c8265-081b-0410-96cb-a4ca84ce46f8

1 files changed, 9 insertions, 13 deletions

diff --git a/converter/other/exif.h b/converter/other/exif.h
index 57eb745b..490e08ed 100644
--- a/converter/other/exif.h
+++ b/converter/other/exif.h
@@ -1,9 +1,6 @@
 #ifndef EXIF_H_INCLUDED
 #define EXIF_H_INCLUDED
 
-#include <stdio.h>
-#include "netpbm/pm_c_util.h"
-
 #define MAX_COMMENT 2000
 
 #if MSVCRT
@@ -38,24 +35,23 @@ typedef struct {
     int   CompressionLevel;
     char  Comments[MAX_COMMENT];
 
-    const unsigned char * ThumbnailPointer;  /* Pointer at the thumbnail */
+    unsigned char * ThumbnailPointer;  /* Pointer at the thumbnail */
     unsigned ThumbnailSize;     /* Size of thumbnail. */
 
-    const char * DatePointer;
-} exif_ImageInfo;
+    char * DatePointer;
+}ImageInfo_t;
 
 
 /* Prototypes for exif.c functions. */
 
 void 
-exif_parse(const unsigned char * const exifSection, 
-           unsigned int          const length,
-           exif_ImageInfo *      const imageInfoP, 
-           bool                  const wantTagTrace,
-           const char **         const errorP);
+process_EXIF(unsigned char * const ExifSection, 
+             unsigned int    const length,
+             ImageInfo_t *   const ImageInfoP, 
+             int             const ShowTags,
+             const char **   const errorP);
 
 void 
-exif_showImageInfo(const exif_ImageInfo * const imageInfoP,
-                   FILE *                 const fileP);
+ShowImageInfo(ImageInfo_t * const ImageInfoP);
 
 #endif