libcupsfilters: Correction after EXIF resolution readout support cherry-pick

In the code cherry-picked from cups-filters 2.x correct some renamings
for the libcupsfilters 2.x API back to the names of the 1.x API.

diff --git a/cupsfilters/image-private.h b/cupsfilters/image-private.h
index 18ea46d98c3ed2d7c871f3c9342dc2fa420181bd..e1e01189ab7f956556f95ef8cd6855a79448bb6b 100644 (file)
--- a/cupsfilters/image-private.h
+++ b/cupsfilters/image-private.h
@@ -214,7 +214,7 @@ extern void         _cupsRasterAddError(const char *f, ...);
 extern void            _cupsRasterClearError(void);
 
 #ifdef HAVE_EXIF
-int            _cupsImageReadEXIF(cf_image_t *img, FILE *fp);
+int            _cupsImageReadEXIF(cups_image_t *img, FILE *fp);
 #endif
 
 #endif /* !_CUPS_IMAGE_PRIVATE_H_ */

diff --git a/cupsfilters/image.c b/cupsfilters/image.c
index fc91999ec77dbcd7391e17e2610bfe214f7f7eda..b99bfd896645d7489fab05ecd973c53ab69f393c 100644 (file)
--- a/cupsfilters/image.c
+++ b/cupsfilters/image.c
@@ -903,7 +903,7 @@ static unsigned char *find_bytes(FILE *fp, long int *size)
   return buf;
 }
 
-int _cupsImageReadEXIF(cf_image_t *img, FILE *fp)
+int _cupsImageReadEXIF(cups_image_t *img, FILE *fp)
 {
 
   if (fp == NULL)