patch from Dimitri fixing crashes when decoding the invalid GIFs

[wxWidgets.git] / src / common / cmndata.cpp

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 7d997f1bde38f82c84a4821a7cc3309432246f20..4118da299e59e794e095fe96959ad4522b3d986a 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -186,44 +186,46 @@ wxPrintData::wxPrintData()
     PMPrintSession macPrintSession = kPMNoReference;
     OSStatus       err;
     
-       err = ::UMAPrOpen(&macPrintSession) ;
-       if ( err == noErr )
-       {  
-               err = PMCreatePageFormat(&m_macPageFormat);
-               
-               //  Note that PMPageFormat is not session-specific, but calling
-               //  PMSessionDefaultPageFormat assigns values specific to the printer
-               //  associated with the current printing session.
-               if ((err == noErr) && (m_macPageFormat != kPMNoPageFormat))
-               {
-               err = PMSessionDefaultPageFormat(macPrintSession, m_macPageFormat);
-               }
-
-               err = PMCreatePrintSettings(&m_macPrintSettings);
-
-               //  Note that PMPrintSettings is not session-specific, but calling
-               //  PMSessionDefaultPrintSettings assigns values specific to the printer
-               //  associated with the current printing session.
-               if ((err == noErr) && (m_macPrintSettings != kPMNoPrintSettings))
-               {
-               err = PMSessionDefaultPrintSettings(macPrintSession, m_macPrintSettings);
-               }
-       }
-       ::UMAPrClose(&macPrintSession) ;
+    err = ::UMAPrOpen(&macPrintSession) ;
+    if ( err == noErr )
+    {  
+        err = PMCreatePageFormat((PMPageFormat *)&m_macPageFormat);
+        
+        //  Note that PMPageFormat is not session-specific, but calling
+        //  PMSessionDefaultPageFormat assigns values specific to the printer
+        //  associated with the current printing session.
+        if ((err == noErr) && (m_macPageFormat != kPMNoPageFormat))
+        {
+            err = PMSessionDefaultPageFormat((PMPrintSession)macPrintSession,
+                                             (PMPageFormat)m_macPageFormat);
+        }
+        
+        err = PMCreatePrintSettings((PMPrintSettings *)&m_macPrintSettings);
+        
+        //  Note that PMPrintSettings is not session-specific, but calling
+        //  PMSessionDefaultPrintSettings assigns values specific to the printer
+        //  associated with the current printing session.
+        if ((err == noErr) && (m_macPrintSettings != kPMNoPrintSettings))
+        {
+            err = PMSessionDefaultPrintSettings((PMPrintSession)macPrintSession,
+                                                (PMPrintSettings)m_macPrintSettings);
+        }
+    }
+    ::UMAPrClose(&macPrintSession) ;
   #endif
 #else
-    m_macPrintInfo = (THPrint) NewHandleClear( sizeof( TPrint ) );
-    (**m_macPrintInfo).iPrVersion = 0;                    // something invalid
+    m_macPrintSettings = (THPrint) NewHandleClear( sizeof( TPrint ) );
+    (**(THPrint)m_macPrintSettings).iPrVersion = 0;                    // something invalid
 
-    (**m_macPrintInfo).prInfo.iHRes = 72;
-    (**m_macPrintInfo).prInfo.iVRes = 72;
+    (**(THPrint)m_macPrintSettings).prInfo.iHRes = 72;
+    (**(THPrint)m_macPrintSettings).prInfo.iVRes = 72;
     Rect r1 = { 0, 0, 8*72 - 2 * 18, 11*72 - 2 * 36 };
-    (**m_macPrintInfo).prInfo.rPage = r1;// must have its top left & (0,0)
+    (**(THPrint)m_macPrintSettings).prInfo.rPage = r1;// must have its top left & (0,0)
 
     Rect r2 = { -18, -36, 8*72 - 18, 11*72 - 36  };
-    (**m_macPrintInfo).rPaper = r2;
-    (**m_macPrintInfo).prStl.iPageV = 11 * 120 ;                // 11 inches in 120th of an inch
-    (**m_macPrintInfo).prStl.iPageH = 8 * 120 ;                // 8 inches in 120th of an inch
+    (**(THPrint)m_macPrintSettings).rPaper = r2;
+    (**(THPrint)m_macPrintSettings).prStl.iPageV = 11 * 120 ;                // 11 inches in 120th of an inch
+    (**(THPrint)m_macPrintSettings).prStl.iPageH = 8 * 120 ;                // 8 inches in 120th of an inch
 #endif
 #endif
     m_printOrientation = wxPORTRAIT;
@@ -261,7 +263,7 @@ wxPrintData::wxPrintData(const wxPrintData& printData)
     m_macPageFormat    = kPMNoPageFormat;
     m_macPrintSettings = kPMNoPrintSettings;
 #else
-    m_macPrintInfo = NULL;
+    m_macPrintSettings = NULL;
 #endif
 #endif
     (*this) = printData;
@@ -299,7 +301,7 @@ wxPrintData::~wxPrintData()
     }
     
 #else
-    wxASSERT( m_macPrintInfo );
+    wxASSERT( m_macPrintSettings );
     // we should perhaps delete
 #endif
 #endif
@@ -768,7 +770,7 @@ void wxPrintData::ConvertToNative()
 {
 #if TARGET_CARBON
 #else
-    (**m_macPrintInfo).prJob.iCopies = m_printNoCopies;
+    (**(THPrint)m_macPrintSettings).prJob.iCopies = m_printNoCopies;
 #endif
 }
 
@@ -776,7 +778,7 @@ void wxPrintData::ConvertFromNative()
 {
 #if TARGET_CARBON
 #else
-    m_printNoCopies = (**m_macPrintInfo).prJob.iCopies;
+    m_printNoCopies = (**(THPrint)m_macPrintSettings).prJob.iCopies;
 #endif
 }
 #endif
@@ -786,8 +788,8 @@ void wxPrintData::operator=(const wxPrintData& data)
 #ifdef __WXMAC__
 #if TARGET_CARBON
 #else
-    m_macPrintInfo = data.m_macPrintInfo;
-    HandToHand( (Handle*) &m_macPrintInfo );
+    m_macPrintSettings = data.m_macPrintSettings;
+    HandToHand( (Handle*) &m_macPrintSettings );
 #endif
 #endif
     m_printNoCopies = data.m_printNoCopies;
@@ -1088,8 +1090,8 @@ void wxPrintDialogData::ConvertToNative()
 {
 #if TARGET_CARBON
 #else
-    (**m_printData.m_macPrintInfo).prJob.iFstPage = m_printFromPage;
-    (**m_printData.m_macPrintInfo).prJob.iLstPage = m_printToPage;
+    (**(THPrint)m_printData.m_macPrintSettings).prJob.iFstPage = m_printFromPage;
+    (**(THPrint)m_printData.m_macPrintSettings).prJob.iLstPage = m_printToPage;
     m_printData.ConvertToNative();
 #endif
 }
@@ -1099,8 +1101,8 @@ void wxPrintDialogData::ConvertFromNative()
 #if TARGET_CARBON
 #else
     m_printData.ConvertFromNative();
-    m_printFromPage = (**m_printData.m_macPrintInfo).prJob.iFstPage;
-    m_printToPage = (**m_printData.m_macPrintInfo).prJob.iLstPage;
+    m_printFromPage = (**(THPrint)m_printData.m_macPrintSettings).prJob.iFstPage;
+    m_printToPage = (**(THPrint)m_printData.m_macPrintSettings).prJob.iLstPage;
 #endif
 }
 #endif
@@ -1413,16 +1415,16 @@ void wxPageSetupDialogData::ConvertToNative()
     // on mac the paper rect has a negative top left corner, because the page rect (printable area) is at 0,0
 #if TARGET_CARBON
 #else
-    (**m_printData.m_macPrintInfo).rPaper.left = int( ((double) m_minMarginTopLeft.x)*mm2pt );
-    (**m_printData.m_macPrintInfo).rPaper.top = int( ((double) m_minMarginTopLeft.y)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).rPaper.left = int( ((double) m_minMarginTopLeft.x)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).rPaper.top = int( ((double) m_minMarginTopLeft.y)*mm2pt );
 
-    (**m_printData.m_macPrintInfo).rPaper.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x)*mm2pt );
-    (**m_printData.m_macPrintInfo).rPaper.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).rPaper.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y)*mm2pt );
 
-    (**m_printData.m_macPrintInfo).prInfo.rPage.left = 0;
-    (**m_printData.m_macPrintInfo).prInfo.rPage.top = 0;
-    (**m_printData.m_macPrintInfo).prInfo.rPage.right =  int( ((double) m_paperSize.x - m_minMarginTopLeft.x - m_minMarginBottomRight.x)*mm2pt );
-    (**m_printData.m_macPrintInfo).prInfo.rPage.bottom =  int( ((double) m_paperSize.y - m_minMarginTopLeft.y - m_minMarginBottomRight.y)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.left = 0;
+    (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.top = 0;
+    (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.right =  int( ((double) m_paperSize.x - m_minMarginTopLeft.x - m_minMarginBottomRight.x)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.bottom =  int( ((double) m_paperSize.y - m_minMarginTopLeft.y - m_minMarginBottomRight.y)*mm2pt );
 #endif
 }
 
@@ -1432,14 +1434,14 @@ void wxPageSetupDialogData::ConvertFromNative()
 
 #if TARGET_CARBON
 #else
-    m_paperSize.x = ((double) (**m_printData.m_macPrintInfo).rPaper.right - (**m_printData.m_macPrintInfo).rPaper.left ) * pt2mm;
-    m_paperSize.y = ((double) (**m_printData.m_macPrintInfo).rPaper.bottom - (**m_printData.m_macPrintInfo).rPaper.top ) * pt2mm;
+    m_paperSize.x = ((double) (**(THPrint)m_printData.m_macPrintSettings).rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).rPaper.left ) * pt2mm;
+    m_paperSize.y = ((double) (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPaper.top ) * pt2mm;
 
-    m_minMarginTopLeft.x = ((double) -(**m_printData.m_macPrintInfo).rPaper.left ) * pt2mm;
-    m_minMarginTopLeft.y = ((double) -(**m_printData.m_macPrintInfo).rPaper.top ) * pt2mm;
+    m_minMarginTopLeft.x = ((double) -(**(THPrint)m_printData.m_macPrintSettings).rPaper.left ) * pt2mm;
+    m_minMarginTopLeft.y = ((double) -(**(THPrint)m_printData.m_macPrintSettings).rPaper.top ) * pt2mm;
 
-    m_minMarginBottomRight.x = ((double) (**m_printData.m_macPrintInfo).rPaper.right - (**m_printData.m_macPrintInfo).prInfo.rPage.right ) * pt2mm;
-    m_minMarginBottomRight.y = ((double)(**m_printData.m_macPrintInfo).rPaper.bottom - (**m_printData.m_macPrintInfo).prInfo.rPage.bottom ) * pt2mm;
+    m_minMarginBottomRight.x = ((double) (**(THPrint)m_printData.m_macPrintSettings).rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.right ) * pt2mm;
+    m_minMarginBottomRight.y = ((double)(**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.bottom ) * pt2mm;
 #endif
     // adjust minimal values
     //TODO add custom fields in dialog for margins