fixes to handling of 0 and negative splitter position when splitting it initially

[wxWidgets.git] / include / wx / gifdecod.h

diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index 09a8927f9959d9482b726be0221f61bff045371e..e40152cfa12ae3fd6d15bd98b4e20fe43a5f8929 100644 (file)
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -24,10 +24,26 @@
 
 
 // --------------------------------------------------------------------------
 
 
 // --------------------------------------------------------------------------

-// constants
+// Constants

 // --------------------------------------------------------------------------
 
 // --------------------------------------------------------------------------
 

-// disposal method
+// Error codes:
+//  Note that the error code wxGIF_TRUNCATED means that the image itself
+//  is most probably OK, but the decoder didn't reach the end of the data
+//  stream; this means that if it was not reading directly from file,
+//  the stream will not be correctly positioned. the
+//
+enum
+{
+    wxGIF_OK = 0,                   /* everything was OK */
+    wxGIF_INVFORMAT,                /* error in gif header */
+    wxGIF_MEMERR,                   /* error allocating memory */
+    wxGIF_TRUNCATED                 /* file appears to be truncated */
+};
+
+// Disposal method
+//  Experimental; subject to change.
+//

 enum
 {
     wxGIF_D_UNSPECIFIED = -1,       /* not specified */
 enum
 {
     wxGIF_D_UNSPECIFIED = -1,       /* not specified */


@@ -36,13 +52,6 @@ enum
     wxGIF_D_TOPREVIOUS = 2          /* restore to previous image */
 };
 
     wxGIF_D_TOPREVIOUS = 2          /* restore to previous image */
 };
 

-// error codes
-enum
-{
-    wxGIF_OK = 0,                   /* everything was OK */
-    wxGIF_INVFORMAT = 1,            /* error in gif header */
-    wxGIF_MEMERR = 2                /* error allocating memory */
-};

 
 #define MAX_BLOCK_SIZE 256          /* max. block size */
 
 
 #define MAX_BLOCK_SIZE 256          /* max. block size */
 


@@ -55,6 +64,9 @@ enum
 class GIFImage
 {
 public:
 class GIFImage
 {
 public:

+    // def ctor
+    GIFImage();
+

     unsigned int w;                 /* width */
     unsigned int h;                 /* height */
     unsigned int left;              /* x coord (in logical screen) */
     unsigned int w;                 /* width */
     unsigned int h;                 /* height */
     unsigned int left;              /* x coord (in logical screen) */


@@ -99,7 +111,7 @@ private:
     int getcode(int bits, int abfin);
     int dgif(GIFImage *img, int interl, int bits);
 
     int getcode(int bits, int abfin);
     int dgif(GIFImage *img, int interl, int bits);
 

-protected:
+public:

     // get data of current frame
     int GetFrameIndex() const;
     unsigned char* GetData() const;
     // get data of current frame
     int GetFrameIndex() const;
     unsigned char* GetData() const;