Changeset 24608 for trunk/gdal/frmts/gif

Timestamp:

Jun 24, 2012, 2:55:29 PM (12 years ago)

Author:

Even Rouault

Message:

Add compatibility with giflib 5.0

Location:

trunk/gdal/frmts/gif

Files:

• biggifdataset.cpp (modified) (1 diff)
• gifdataset.cpp (modified) (11 diffs)

trunk/gdal/frmts/gif/biggifdataset.cpp

@@ -372 +372 @@
 
     nLastLineRead = -1;
+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
+    int nError;
+    hGifFile = DGifOpen( fp, VSIGIFReadFunc, &nError );
+#else
     hGifFile = DGifOpen( fp, VSIGIFReadFunc );
+#endif
     if( hGifFile == NULL )
     {

trunk/gdal/frmts/gif/gifdataset.cpp

@@ -37 +37 @@
 void    GDALRegister_GIF(void);
 
+#if !(defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5)
+
 // This prototype seems to have been messed up!
 GifFileType * EGifOpen(void* userData, OutputFunc writeFunc);
+
+// Define alias compatible with giflib >= 5.0.0
+#define GifMakeMapObject MakeMapObject
+#define GifFreeMapObject FreeMapObject
+
+#endif // defined(GIFLIB_MAJOR) && GIFLIB_MAJOR < 5
+
 CPL_C_END
 
@@ -323 +332 @@
         return NULL;
 
+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
+    int nError;
+    hGifFile = DGifOpen( fp, VSIGIFReadFunc, &nError );
+#else
     hGifFile = DGifOpen( fp, VSIGIFReadFunc );
+#endif
     if( hGifFile == NULL )
     {
@@ -381 +395 @@
 
     VSIFSeekL( fp, 0, SEEK_SET);
+
+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
+    hGifFile = DGifOpen( fp, VSIGIFReadFunc, &nError );
+#else
     hGifFile = DGifOpen( fp, VSIGIFReadFunc );
+#endif
     if( hGifFile == NULL )
     {
@@ -474 +493 @@
 /************************************************************************/
 
-static void GDALPrintGifError(const char* pszMsg)
+static void GDALPrintGifError(GifFileType *hGifFile, const char* pszMsg)
 {
 /* GIFLIB_MAJOR is only defined in libgif >= 4.2.0 */
@@ -481 +500 @@
         ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4)
     /* Static string actually, hence the const char* cast */
+
+#if GIFLIB_MAJOR >= 5
+    const char* pszGIFLIBError = (const char*) GifErrorString(hGifFile->Error);
+#else
     const char* pszGIFLIBError = (const char*) GifErrorString();
+#endif
     if (pszGIFLIBError == NULL)
         pszGIFLIBError = "Unknown error";
@@ -558 +582 @@
     }
 
+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
+    int nError;
+    hGifFile = EGifOpen( fp, VSIGIFWriteFunc, &nError );
+#else
     hGifFile = EGifOpen( fp, VSIGIFWriteFunc );
+#endif
     if( hGifFile == NULL )
     {
@@ -578 +607 @@
     if( poBand->GetColorTable() == NULL )
     {
-        psGifCT = MakeMapObject( 256, NULL );
+        psGifCT = GifMakeMapObject( 256, NULL );
         for( iColor = 0; iColor < 256; iColor++ )
         {
@@ -594 +623 @@
             nFullCount = nFullCount * 2;
 
-        psGifCT = MakeMapObject( nFullCount, NULL );
+        psGifCT = GifMakeMapObject( nFullCount, NULL );
         for( iColor = 0; iColor < poCT->GetColorEntryCount(); iColor++ )
         {
@@ -618 +647 @@
                           psGifCT->ColorCount, 255, psGifCT) == GIF_ERROR)
     {
-        FreeMapObject(psGifCT);
-        GDALPrintGifError("Error writing gif file.");
+        GifFreeMapObject(psGifCT);
+        GDALPrintGifError(hGifFile, "Error writing gif file.");
         EGifCloseFile(hGifFile);
         VSIFCloseL( fp );
@@ -625 +654 @@
     }
     
-    FreeMapObject(psGifCT);
+    GifFreeMapObject(psGifCT);
     psGifCT = NULL;
 
@@ -643 +672 @@
     if (EGifPutImageDesc(hGifFile, 0, 0, nXSize, nYSize, bInterlace, NULL) == GIF_ERROR )
     {
-        GDALPrintGifError("Error writing gif file.");
+        GDALPrintGifError(hGifFile, "Error writing gif file.");
         EGifCloseFile(hGifFile);
         VSIFCloseL( fp );