Fix compilation of wxIconBundle in some particular minimal builds.

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

diff --git a/include/wx/convauto.h b/include/wx/convauto.h
index b3dde4c73ad16f88a8baf7c6c65eb9d1c7969e51..4de2bee9e74c4ca82affe73ebbffd99a93bcf407 100644 (file)
--- a/include/wx/convauto.h
+++ b/include/wx/convauto.h
@@ -75,6 +75,7 @@ private:
     // all currently recognized BOM values
     enum BOMType
     {
+        BOM_Unknown = -1,
         BOM_None,
         BOM_UTF32BE,
         BOM_UTF32LE,
@@ -106,8 +107,11 @@ private:
     void InitFromBOM(BOMType bomType);
 
     // create the correct conversion object for the BOM present in the
-    // beginning of the buffer; adjust the buffer to skip the BOM if found
-    void InitFromInput(const char **src, size_t *len);
+    // beginning of the buffer
+    //
+    // return false if the buffer is too short to allow us to determine if we
+    // have BOM or not
+    bool InitFromInput(const char *src, size_t len);
 
     // adjust src and len to skip over the BOM (identified by m_bomType) at the
     // start of the buffer