fix a bug in the test which was corrupting 1 byte beyond wxImage buffer

[wxWidgets.git] / utils / wxrc / wxrc.cpp

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index 3894c54a92a668e440260f54d29bd6181f7bfc21..fef806dec4516408526bfb93e25d5d81dca59d6c 100644 (file)
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -581,7 +581,8 @@ static wxString FileToCppArray(wxString filename, int num)
     wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
 
     const size_t lng = wx_truncate_cast(size_t, offset);
     wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
 
     const size_t lng = wx_truncate_cast(size_t, offset);

-    wxASSERT_MSG( lng == offset, wxT("Huge file not supported") );
+    wxASSERT_MSG( wx_static_cast(wxFileOffset, lng) == offset,
+                  wxT("Huge file not supported") );

 
     snum.Printf(_T("%i"), num);
     output.Printf(_T("static size_t xml_res_size_") + snum + _T(" = %i;\n"), lng);
 
     snum.Printf(_T("%i"), num);
     output.Printf(_T("static size_t xml_res_size_") + snum + _T(" = %i;\n"), lng);


@@ -734,7 +735,8 @@ static wxString FileToPythonArray(wxString filename, int num)
     wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
 
     const size_t lng = wx_truncate_cast(size_t, offset);
     wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
 
     const size_t lng = wx_truncate_cast(size_t, offset);

-    wxASSERT_MSG( offset == lng, wxT("Huge file not supported") );
+    wxASSERT_MSG( wx_static_cast(wxFileOffset, lng) == offset,
+                  wxT("Huge file not supported") );

 
     snum.Printf(_T("%i"), num);
     output = "    xml_res_file_" + snum + " = '''\\\n";
 
     snum.Printf(_T("%i"), num);
     output = "    xml_res_file_" + snum + " = '''\\\n";