graphics/discwrapper clang6 fix

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

graphics/discwrapper clang6 fix

Ingo Schwarze
Hi,

initialize to the correct data type.
Makes it build, and the program still
saves and opens project files for me.

Yours,
  Ingo


Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/discwrapper/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 26 Jul 2017 22:45:23 -0000 1.9
+++ Makefile 16 Apr 2018 15:36:39 -0000
@@ -3,7 +3,7 @@
 COMMENT= disc cover designer
 
 DISTNAME= discwrapper-1.2.2
-REVISION = 1
+REVISION = 2
 CATEGORIES= graphics
 
 HOMEPAGE= http://discwrapper.sourceforge.net/
Index: patches/patch-src_MouseHandling_cpp
===================================================================
RCS file: patches/patch-src_MouseHandling_cpp
diff -N patches/patch-src_MouseHandling_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_MouseHandling_cpp 16 Apr 2018 15:36:39 -0000
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+clang6 fix: <wx/defs.h> says typedef int wxCoord;
+
+Index: src/MouseHandling.cpp
+--- src/MouseHandling.cpp.orig
++++ src/MouseHandling.cpp
+@@ -88,7 +88,7 @@ void DiscWrapperFrame::OnLeftDown(wxMouseEvent& event)
+             dc.SetFont(Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont());           // Apply Font and Color then draw text with the chosen coordinates and angle
+             dc.SetTextForeground(Database->Page[Cpage].labels[SelectedItem].Colour.GetColour());
+             wxFont Xfont = Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont();
+-            wxCoord wi, he, xc = NULL;
++            wxCoord wi, he, xc = 0;
+             dc.GetMultiLineTextExtent(Database->Page[Cpage].labels[SelectedItem].L, & wi, & he, &xc, &Xfont);
+             if ( wi == 0 )
+                 wi = he = 100;
+@@ -423,7 +423,7 @@ void DiscWrapperFrame::OnLeftDown(wxMouseEvent& event)
+             dc.SetFont(Database->Page[Cpage].labels[i].Font.GetChosenFont());           // Apply Font and Color then draw text with the chosen coordinates and angle
+             dc.SetTextForeground(Database->Page[Cpage].labels[i].Colour.GetColour());
+             wxFont Xfont = Database->Page[Cpage].labels[i].Font.GetChosenFont();
+-            wxCoord w, h, xc = NULL;
++            wxCoord w, h, xc = 0;
+             dc.GetMultiLineTextExtent(Database->Page[Cpage].labels[i].L, & w, & h, &xc, &Xfont);
+             if ( w == 0 )
+                 w = h = 100 ;
+@@ -652,7 +652,7 @@ void DiscWrapperFrame::OnDragging(wxMouseEvent& event)
+             dc.SetFont(Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont());           // Apply Font and Color then draw text with the chosen coordinates and angle
+             dc.SetTextForeground(Database->Page[Cpage].labels[SelectedItem].Colour.GetColour());
+             wxFont Xfont = Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont();
+-            wxCoord wi, he, xc = NULL;
++            wxCoord wi, he, xc = 0;
+             dc.GetMultiLineTextExtent(Database->Page[Cpage].labels[SelectedItem].L, & wi, & he, &xc, &Xfont);
+             if ( wi == 0 )
+                 wi = he = 100;
+@@ -1664,7 +1664,7 @@ void DiscWrapperFrame::OnLeftDouble(wxMouseEvent& even
+         dc.SetFont(Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont());           // Apply Font and Color then draw text with the chosen coordinates and angle
+         dc.SetTextForeground(Database->Page[Cpage].labels[SelectedItem].Colour.GetColour());
+         wxFont Xfont = Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont();
+-        wxCoord wi, he, xc = NULL;
++        wxCoord wi, he, xc = 0;
+         dc.GetMultiLineTextExtent(Database->Page[Cpage].labels[SelectedItem].L, & wi, & he, &xc, &Xfont);
+         if ( wi == 0 )
+             wi = he = 100;
Index: patches/patch-src_PreviewOutput_cpp
===================================================================
RCS file: patches/patch-src_PreviewOutput_cpp
diff -N patches/patch-src_PreviewOutput_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_PreviewOutput_cpp 16 Apr 2018 15:36:39 -0000
@@ -0,0 +1,70 @@
+$OpenBSD$
+
+clang6 fix: <wx/defs.h> says typedef int wxCoord;
+
+Index: src/PreviewOutput.cpp
+--- src/PreviewOutput.cpp.orig
++++ src/PreviewOutput.cpp
+@@ -324,7 +324,7 @@ void DiscWrapperFrame::DrawDC()    // The Drawing stuf
+         pdc.SetFont(Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont());           // Apply Font && Color then draw text with the chosen coordinates && angle
+         pdc.SetTextForeground(Database->Page[Cpage].labels[SelectedItem].Colour.GetColour());
+         wxFont Xfont = Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont();
+-        wxCoord wi, he, xc = NULL;
++        wxCoord wi, he, xc = 0;
+         pdc.GetMultiLineTextExtent(Database->Page[Cpage].labels[SelectedItem].L, & wi, & he, &xc, &Xfont);
+         if ( wi == 0 )
+             wi = he = 100 ;
+@@ -894,7 +894,7 @@ void DiscWrapperFrame::DrawLabels(wxDC &dc, int Cpage,
+         dc.SetFont(Database->Page[Cpage].labels[i].Font.GetChosenFont());           // Apply Font && Color then draw text with the chosen coordinates && angle
+         dc.SetTextForeground(Database->Page[Cpage].labels[i].Colour.GetColour());
+         wxFont Xfont = Database->Page[Cpage].labels[i].Font.GetChosenFont();
+-        wxCoord w, oh, h, xc = NULL;
++        wxCoord w, oh, h, xc = 0;
+         dc.GetMultiLineTextExtent(Database->Page[Cpage].labels[i].L, & w, & oh, &xc, &Xfont);
+
+         if ( ( (Database->Page[Cpage].labels[i].L == _("<Title>")) || (Database->Page[Cpage].labels[i].L == _("<Date>")) ) && !preview )
+@@ -919,7 +919,7 @@ void DiscWrapperFrame::DrawLabels(wxDC &dc, int Cpage,
+                     ih = ig+1;
+
+                     wxFont Xfont = Database->Page[Cpage].labels[i].Font.GetChosenFont();
+-                    xc = NULL;
++                    xc = 0;
+                     dc.GetMultiLineTextExtent(DrawL, & w, & oh, &xc, &Xfont);
+
+                     if ( Database->Page[Cpage].labels[i].Align == 0 )
+@@ -949,7 +949,7 @@ void DiscWrapperFrame::DrawLabels(wxDC &dc, int Cpage,
+                 ih = ig+1;
+
+                 wxFont Xfont = Database->Page[Cpage].labels[i].Font.GetChosenFont();
+-                xc = NULL;
++                xc = 0;
+                 dc.GetMultiLineTextExtent(DrawL, & w, & oh, &xc, &Xfont);
+
+                 if ( DrawY <= 416 )
+@@ -964,7 +964,7 @@ void DiscWrapperFrame::DrawLabels(wxDC &dc, int Cpage,
+                     double Radius = 0;
+
+                     wxFont Tfont = Database->Page[Cpage].labels[i].Font.GetChosenFont();
+-                    wxCoord cw, ch, cxc = NULL;
++                    wxCoord cw, ch, cxc = 0;
+
+                     for ( j = 0 ; j < DrawL.Len() ; j++ )
+                     {
+@@ -996,7 +996,7 @@ void DiscWrapperFrame::DrawLabels(wxDC &dc, int Cpage,
+                     double Radius = 0;
+
+                     wxFont Tfont = Database->Page[Cpage].labels[i].Font.GetChosenFont();
+-                    wxCoord cw, ch, cxc = NULL;
++                    wxCoord cw, ch, cxc = 0;
+
+                     for ( j = 0 ; j < DrawL.Len() ; j++ )
+                     {
+@@ -1090,7 +1090,7 @@ void DiscWrapperFrame::DrawLists(wxDC &dc, int Cpage,
+                     TempString = _("<Empty>");
+
+                 wxFont Xfont = Database->Page[Cpage].lists[i].Font.GetChosenFont();
+-                wxCoord w, h, xc = NULL;
++                wxCoord w, h, xc = 0;
+                 dc.GetMultiLineTextExtent(TempString, & w, & h, &xc, &Xfont);
+                 if ( align == 'l' )
+                     dc.DrawText( TempString, Database->Page[Cpage].lists[i].X+ColWidth, Database->Page[Cpage].lists[i].Y+((j-1)*Database->Page[Cpage].lists[i].Font.GetChosenFont().GetPointSize()*1.5));