Commit 61acac28 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Add patch from Lorenzo Marcantonio. Fix some warning issues, and zlib issue...

Add patch from Lorenzo Marcantonio. Fix some warning issues, and zlib issue under Windows (zlib sources added)
parent ebcb6d3b
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ set(INC_AFTER

add_subdirectory(bitmaps_png)
add_subdirectory(common)
add_subdirectory(zlib)
add_subdirectory(3d-viewer)
add_subdirectory(cvpcb)
add_subdirectory(eeschema)
+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ include_directories(
    ../3d-viewer
    ../pcbnew
    ../polygon
    ../zlib
    ${INC_AFTER}
    )

@@ -42,6 +43,7 @@ set(COMMON_SRCS
    common_plot_functions.cpp
    common_plotHPGL_functions.cpp
    common_plotPS_functions.cpp
    common_plotPDF_functions.cpp
    common_plotGERBER_functions.cpp
    common_plotDXF_functions.cpp
    confirm.cpp
+6 −6
Original line number Diff line number Diff line
@@ -252,8 +252,8 @@ void BITMAP_BASE::Rotate( bool aRotateCCW )


void BITMAP_BASE::PlotImage( PLOTTER*       aPlotter,
                             wxPoint  aPos,
                             int      aDefaultColor,
                             const wxPoint& aPos,
                             EDA_COLOR_T    aDefaultColor,
                             int            aDefaultPensize )
{
    if( m_image == NULL )
@@ -261,8 +261,8 @@ void BITMAP_BASE::PlotImage( PLOTTER* aPlotter,

    // These 2 lines are useful only fot plotters that cannot plot a bitmap
    // and plot arectangle instead of.
    aPlotter->set_color( aDefaultColor );
    aPlotter->set_current_line_width( aDefaultPensize );
    aPlotter->SetColor( aDefaultColor );
    aPlotter->SetCurrentLineWidth( aDefaultPensize );

    aPlotter->PlotImage( *m_image, aPos, GetScalingFactor() );
}
+305 −216

File changed.

Preview size limit exceeded, changes collapsed.

+480 −188

File changed.

Preview size limit exceeded, changes collapsed.

Loading