Upgrade from 1.2.x to 1.3.1-1 now that the upstream finally contains new

code (rather than simply updates to auto- configuration glue):

Notified by:	Steve Wills

via

PR:	ports/171812

The changes are minor, thus shared-library bump.

Fix several of the warnings, which GNU compiler missed, but clang uncovered
(which broke the build because of -Werror):

Notified by:	Andreas Nilsson, Thomas Zander

2 files changed, 81 insertions, 0 deletions

diff --git a/graphics/libfpx/files/patch-fpxlib b/graphics/libfpx/files/patch-fpxlib
new file mode 100644
index 000000000000..380417066d90
--- /dev/null
+++ b/graphics/libfpx/files/patch-fpxlib
@@ -0,0 +1,63 @@
+ReadPage() must've been returning int at some point. It is returning
+FPXStatus for, at least, 5 years now, but gcc never warned about us
+checking invalid values. Thanks to clang for finding this redundancy.
+--- fpx/fpxlib.cpp	2007-11-02 03:10:05.000000000 -0400
++++ fpx/fpxlib.cpp	2012-10-04 22:49:40.000000000 -0400
+@@ -825,5 +825,5 @@
+               FPXImageDesc* renderingBuffer)
+ {
+-  FPXStatus status = FPX_OK;
++  FPXStatus status;
+   if (!thePage)
+     status = FPX_INVALID_FPX_HANDLE;
+@@ -839,18 +839,7 @@
+     else {
+       GtheSystemToolkit->SetUsedColorSpace(image.GetBaselineColorSpace());
+-      switch (thePage->ReadPage (image.Get32BitsBuffer())) {
+-        case -2 :
+-          status = FPX_FILE_READ_ERROR;
+-          break;
+-        case -3 :
+-          status = FPX_LOW_MEMORY_ERROR;
+-          break;
+-        case 0:
+-          image.UpdateDescriptor();
+-          break;
+-      default:
+-        {
+-        }
+-      }
++      status = thePage->ReadPage(image.Get32BitsBuffer());
++      if (status == FPX_OK)
++        image.UpdateDescriptor();
+     }
+   }
+@@ -863,5 +852,5 @@
+               FPXImageDesc* renderingBuffer)
+ {
+-  FPXStatus status = FPX_OK;
++  FPXStatus status;
+   if (!thePage)
+     status = FPX_INVALID_FPX_HANDLE;
+@@ -877,18 +866,7 @@
+     else {
+       GtheSystemToolkit->SetUsedColorSpace(line.GetBaselineColorSpace());
+-      switch (thePage->ReadPageLine (lineNumber, line.Get32BitsBuffer())) {
+-        case -2 :
+-          status = FPX_FILE_READ_ERROR;
+-          break;
+-        case -3 :
+-          status = FPX_LOW_MEMORY_ERROR;
+-          break;
+-        case 0:
+-          line.UpdateDescriptor();
+-          break;
+-      default:
+-        {
+-        }
+-      }
++      status = thePage->ReadPageLine (lineNumber, line.Get32BitsBuffer());
++      if (status == FPX_OK)
++        line.UpdateDescriptor();
+     }
+   }
diff --git a/graphics/libfpx/files/patch-ph_image b/graphics/libfpx/files/patch-ph_image
new file mode 100644
index 000000000000..d6a63d80c822
--- /dev/null
+++ b/graphics/libfpx/files/patch-ph_image
@@ -0,0 +1,18 @@
+--- ri_image/ph_image.h	2007-11-02 03:10:05.000000000 -0400
++++ ri_image/ph_image.h	2012-10-04 22:38:52.000000000 -0400
+@@ -173,5 +173,5 @@
+         virtual FPXStatus CreateInitResolutionLevelList();                    // Make a sub image list in read or write mode
+         virtual FPXStatus CreateEmptyResolutionLevelList();                   // Make a sub image list in create mode
+-    virtual PResolutionLevel* CreateEmptyResolutionLevel(int width, int height, long* quelImage); // Make a sub image in create mode 
++    virtual PResolutionLevel* CreateEmptyResolutionLevel(int width, int height, int* quelImage); // Make a sub image in create mode 
+     virtual PResolutionLevel* CreateInitResolutionLevel(int* offset, long id);           // Make a sub image in read or write mode 
+ 
+--- ri_image/ph_image.cpp	2007-11-02 03:10:05.000000000 -0400
++++ ri_image/ph_image.cpp	2012-10-04 22:38:31.000000000 -0400
+@@ -1127,5 +1127,5 @@
+ //  ----------------------------------------------------------------------------
+ // Make a sub resolution level in create mode
+-PResolutionLevel* PHierarchicalImage::CreateEmptyResolutionLevel(int , int , long int*)
++PResolutionLevel* PHierarchicalImage::CreateEmptyResolutionLevel(int , int , int*)
+ {
+   return NULL;