From 61acac28e1e6f029405e3100eeeca95ef100659b Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 3 May 2012 20:37:56 +0200 Subject: [PATCH] Add patch from Lorenzo Marcantonio. Fix some warning issues, and zlib issue under Windows (zlib sources added) --- CMakeLists.txt | 1 + common/CMakeLists.txt | 2 + common/class_bitmap_base.cpp | 12 +- common/class_plotter.cpp | 623 +++--- common/common_plotDXF_functions.cpp | 768 +++++--- common/common_plotGERBER_functions.cpp | 453 ++--- common/common_plotHPGL_functions.cpp | 401 ++-- common/common_plotPS_functions.cpp | 1350 ++++++++----- common/common_plot_functions.cpp | 236 +-- common/drawtxt.cpp | 16 +- eeschema/CMakeLists.txt | 3 + eeschema/class_libentry.cpp | 4 +- .../dialogs/dialog_plot_schematic_DXF.cpp | 18 +- .../dialogs/dialog_plot_schematic_HPGL.cpp | 24 +- eeschema/dialogs/dialog_plot_schematic_PS.cpp | 19 +- eeschema/lib_arc.cpp | 1550 +++++++-------- eeschema/lib_bezier.cpp | 4 +- eeschema/lib_circle.cpp | 710 +++---- eeschema/lib_pin.cpp | 68 +- eeschema/lib_polyline.cpp | 4 +- eeschema/lib_rectangle.cpp | 8 +- eeschema/lib_text.cpp | 2 +- eeschema/menubar.cpp | 6 + eeschema/sch_bus_entry.cpp | 8 +- eeschema/sch_field.cpp | 4 +- eeschema/sch_junction.cpp | 4 +- eeschema/sch_line.cpp | 12 +- eeschema/sch_no_connect.cpp | 13 +- eeschema/sch_screen.cpp | 2 +- eeschema/sch_sheet.cpp | 24 +- eeschema/sch_text.cpp | 8 +- eeschema/schframe.cpp | 1 + include/class_bitmap_base.h | 3 +- include/convert_to_biu.h | 135 +- include/id.h | 1 + include/plot_common.h | 889 +++++---- include/wxEeschemaStruct.h | 1 + pcbnew/CMakeLists.txt | 1 + pcbnew/export_gencad.cpp | 2 +- pcbnew/gen_drill_report_files.cpp | 100 +- pcbnew/gen_modules_placefile.cpp | 24 +- pcbnew/gendrill.cpp | 4 +- pcbnew/pcb_plot_params.cpp | 4 +- pcbnew/pcbnew.h | 2 - pcbnew/plot_rtn.cpp | 100 +- pcbnew/plotdxf.cpp | 10 +- pcbnew/plotgerb.cpp | 12 +- pcbnew/plothpgl.cpp | 23 +- pcbnew/plotps.cpp | 26 +- zlib/CMakeLists.txt | 15 + zlib/ChangeLog | 855 ++++++++ zlib/README | 125 ++ zlib/adler32.c | 149 ++ zlib/algorithm.txt | 209 ++ zlib/compress.c | 79 + zlib/crc32.c | 423 ++++ zlib/crc32.h | 441 +++++ zlib/deflate.c | 1736 +++++++++++++++++ zlib/deflate.h | 331 ++++ zlib/gzio.c | 1032 ++++++++++ zlib/infback.c | 623 ++++++ zlib/inffast.c | 318 +++ zlib/inffast.h | 11 + zlib/inffixed.h | 94 + zlib/inflate.c | 1368 +++++++++++++ zlib/inflate.h | 115 ++ zlib/inftrees.c | 329 ++++ zlib/inftrees.h | 55 + zlib/trees.c | 1219 ++++++++++++ zlib/trees.h | 128 ++ zlib/uncompr.c | 61 + zlib/zconf.h | 332 ++++ zlib/zlib.3 | 159 ++ zlib/zlib.h | 1357 +++++++++++++ zlib/zutil.c | 318 +++ zlib/zutil.h | 269 +++ 76 files changed, 16464 insertions(+), 3382 deletions(-) create mode 100644 zlib/CMakeLists.txt create mode 100644 zlib/ChangeLog create mode 100644 zlib/README create mode 100644 zlib/adler32.c create mode 100644 zlib/algorithm.txt create mode 100644 zlib/compress.c create mode 100644 zlib/crc32.c create mode 100644 zlib/crc32.h create mode 100644 zlib/deflate.c create mode 100644 zlib/deflate.h create mode 100644 zlib/gzio.c create mode 100644 zlib/infback.c create mode 100644 zlib/inffast.c create mode 100644 zlib/inffast.h create mode 100644 zlib/inffixed.h create mode 100644 zlib/inflate.c create mode 100644 zlib/inflate.h create mode 100644 zlib/inftrees.c create mode 100644 zlib/inftrees.h create mode 100644 zlib/trees.c create mode 100644 zlib/trees.h create mode 100644 zlib/uncompr.c create mode 100644 zlib/zconf.h create mode 100644 zlib/zlib.3 create mode 100644 zlib/zlib.h create mode 100644 zlib/zutil.c create mode 100644 zlib/zutil.h diff --git a/CMakeLists.txt b/CMakeLists.txt index d89804dab9..496c130109 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 4841471478..d18e3fa886 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -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 diff --git a/common/class_bitmap_base.cpp b/common/class_bitmap_base.cpp index bab646a730..19b286f352 100644 --- a/common/class_bitmap_base.cpp +++ b/common/class_bitmap_base.cpp @@ -251,18 +251,18 @@ void BITMAP_BASE::Rotate( bool aRotateCCW ) } -void BITMAP_BASE::PlotImage( PLOTTER* aPlotter, - wxPoint aPos, - int aDefaultColor, - int aDefaultPensize ) +void BITMAP_BASE::PlotImage( PLOTTER* aPlotter, + const wxPoint& aPos, + EDA_COLOR_T aDefaultColor, + int aDefaultPensize ) { if( m_image == NULL ) return; // 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() ); } diff --git a/common/class_plotter.cpp b/common/class_plotter.cpp index 4fd290249e..94af3c0179 100644 --- a/common/class_plotter.cpp +++ b/common/class_plotter.cpp @@ -1,13 +1,17 @@ -/****************************************** -* class_plotter.cpp -* the class PLOTTER handle basic functions to plot schematic and boards -* with different plot formats. -* currently formats are:* -* HPGL -* POSTSCRIPT -* GERBER -* DXF -******************************************/ +/** + * @file class_plotter.cpp + * @brief KiCad: Base of all the plot routines + * the class PLOTTER handle basic functions to plot schematic and boards + * with different plot formats. + * + * There are currently engines for: + * HPGL + * POSTSCRIPT + * GERBER + * DXF + * an SVG 'plot' is also provided along with the 'print' function by wx, but + * is not handled here. + */ #include @@ -21,112 +25,152 @@ #include #include -PLOTTER::PLOTTER( PlotFormat aPlotType ) +PLOTTER::PLOTTER( ) { - m_PlotType = aPlotType; - plot_scale = 1; - default_pen_width = 0; - current_pen_width = -1; /* To-be-set marker */ - pen_state = 'Z'; /* End-of-path idle */ - plotMirror = 0; /* Mirror flag */ - output_file = 0; - color_mode = false; /* Start as a BW plot */ - negative_mode = false; + plotScale = 1; + defaultPenWidth = 0; + currentPenWidth = -1; // To-be-set marker + penState = 'Z'; // End-of-path idle + plotMirror = 0; // Mirror flag + outputFile = 0; + colorMode = false; // Starts as a BW plot + negativeMode = false; } -/* Modifies coordinates pos.x and pos.y trace according to the orientation, - * scale factor, and offsets trace +/** + * Modifies coordinates according to the orientation, + * scale factor, and offsets trace. Also convert from a wxPoint to DPOINT, + * since some output engines needs floating point coordinates. */ -void PLOTTER::user_to_device_coordinates( wxPoint& pos ) +DPOINT PLOTTER::userToDeviceCoordinates( const wxPoint& pos ) { - pos.x = (int) ( (pos.x - plot_offset.x) * plot_scale * device_scale ); + double x = (pos.x - plotOffset.x) * plotScale * iuPerDeviceUnit; + double y; if( plotMirror ) - pos.y = (int) ( ( pos.y - plot_offset.y ) * plot_scale * device_scale ); + y = ( pos.y - plotOffset.y ) * plotScale * iuPerDeviceUnit ; else - pos.y = (int) ( ( paper_size.y - ( pos.y - plot_offset.y ) - * plot_scale ) * device_scale ); + y = ( paperSize.y - ( pos.y - plotOffset.y ) + * plotScale ) * iuPerDeviceUnit ; + return DPOINT( x, y ); +} + +/** + * Modifies size according to the plotter scale factors + * (wxSize version, returns a DPOINT) + */ +DPOINT PLOTTER::userToDeviceSize( const wxSize& size ) +{ + return DPOINT( size.x * plotScale * iuPerDeviceUnit, + size.y * plotScale * iuPerDeviceUnit ); +} + +/** + * Modifies size according to the plotter scale factors + * (simple double version) + */ +double PLOTTER::userToDeviceSize( double size ) +{ + return size * plotScale * iuPerDeviceUnit; } -/* Generic arc rendered as a polyline */ -void PLOTTER::arc( wxPoint centre, int StAngle, int EndAngle, int radius, +/** + * Generic fallback: arc rendered as a polyline + */ +void PLOTTER::Arc( const wxPoint& centre, int StAngle, int EndAngle, int radius, FILL_T fill, int width ) { wxPoint start, end; - const int delta = 50; /* increment (in 0.1 degrees) to draw circles */ + const int delta = 50; // increment (in 0.1 degrees) to draw circles double alpha; if( StAngle > EndAngle ) EXCHG( StAngle, EndAngle ); - set_current_line_width( width ); + SetCurrentLineWidth( width ); /* Please NOTE the different sign due to Y-axis flip */ - alpha = StAngle / 1800.0 * M_PI; + alpha = DEG2RAD( StAngle / 10.0 ); start.x = centre.x + (int) ( radius * cos( -alpha ) ); start.y = centre.y + (int) ( radius * sin( -alpha ) ); - move_to( start ); + MoveTo( start ); for( int ii = StAngle + delta; ii < EndAngle; ii += delta ) { - alpha = ii / 1800.0 * M_PI; + alpha = DEG2RAD( ii / 10.0 ); end.x = centre.x + (int) ( radius * cos( -alpha ) ); end.y = centre.y + (int) ( radius * sin( -alpha ) ); - line_to( end ); + LineTo( end ); } - alpha = EndAngle / 1800.0 * M_PI; + alpha = DEG2RAD( EndAngle / 10.0 ); end.x = centre.x + (int) ( radius * cos( -alpha ) ); end.y = centre.y + (int) ( radius * sin( -alpha ) ); - finish_to( end ); + FinishTo( end ); +} + +/** + * Fallback: if it doesn't handle bitmaps, we plot a rectangle + */ +void PLOTTER::PlotImage(const wxImage & aImage, const wxPoint& aPos, + double aScaleFactor ) +{ + wxSize size( aImage.GetWidth() * aScaleFactor, + aImage.GetHeight() * aScaleFactor ); + + wxPoint start = aPos; + start.x -= size.x / 2; + start.y -= size.y / 2; + + wxPoint end = start; + end.x += size.x; + end.y += size.y; + + Rect( start, end, NO_FILL ); } -/* Modifies size size.x and size.y trace according to the scale factor. */ -void PLOTTER::user_to_device_size( wxSize& size ) +/** + * Plot a square centered on the position. Building block for markers + */ +void PLOTTER::markerSquare( const wxPoint& position, int radius ) { - size.x = (int) ( size.x * plot_scale * device_scale ); - size.y = (int) ( size.y * plot_scale * device_scale ); -} - - -double PLOTTER::user_to_device_size( double size ) -{ - return size * plot_scale * device_scale; -} - - -void PLOTTER::center_square( const wxPoint& position, int diametre, FILL_T fill ) -{ - int radius = KiROUND( diametre / 2.8284 ); - static std::vector< wxPoint > corner_list; - corner_list.clear(); + double r = KiROUND( radius / 1.4142 ); + std::vector< wxPoint > corner_list; wxPoint corner; - corner.x = position.x + radius; - corner.y = position.y + radius; + corner.x = position.x + r; + corner.y = position.y + r; corner_list.push_back( corner ); - corner.x = position.x + radius; - corner.y = position.y - radius; + corner.x = position.x + r; + corner.y = position.y - r; corner_list.push_back( corner ); - corner.x = position.x - radius; - corner.y = position.y - radius; + corner.x = position.x - r; + corner.y = position.y - r; corner_list.push_back( corner ); - corner.x = position.x - radius; - corner.y = position.y + radius; + corner.x = position.x - r; + corner.y = position.y + r; corner_list.push_back( corner ); - corner.x = position.x + radius; - corner.y = position.y + radius; + corner.x = position.x + r; + corner.y = position.y + r; corner_list.push_back( corner ); - PlotPoly( corner_list, fill ); + PlotPoly( corner_list, NO_FILL ); } - -void PLOTTER::center_lozenge( const wxPoint& position, int diametre, FILL_T fill ) +/** + * Plot a circle centered on the position. Building block for markers + */ +void PLOTTER::markerCircle( const wxPoint& position, int radius ) { - int radius = diametre / 2; - static std::vector< wxPoint > corner_list; - corner_list.clear(); + Circle( position, radius * 2, NO_FILL ); +} + +/** + * Plot a lozenge centered on the position. Building block for markers + */ +void PLOTTER::markerLozenge( const wxPoint& position, int radius ) +{ + std::vector< wxPoint > corner_list; wxPoint corner; corner.x = position.x; corner.y = position.y + radius; @@ -144,115 +188,163 @@ void PLOTTER::center_lozenge( const wxPoint& position, int diametre, FILL_T fill corner.y = position.y + radius; corner_list.push_back( corner ); - PlotPoly( corner_list, fill ); + PlotPoly( corner_list, NO_FILL ); } +/** + * Plot a - bar centered on the position. Building block for markers + */ +void PLOTTER::markerHBar( const wxPoint& pos, int radius ) +{ + MoveTo( wxPoint( pos.x - radius, pos.y ) ); + FinishTo( wxPoint( pos.x + radius, pos.y ) ); +} -/* Draw a pattern shape number aShapeId, to coord x0, y0. +/** + * Plot a / bar centered on the position. Building block for markers + */ +void PLOTTER::markerSlash( const wxPoint& pos, int radius ) +{ + MoveTo( wxPoint( pos.x - radius, pos.y - radius ) ); + FinishTo( wxPoint( pos.x + radius, pos.y + radius ) ); +} + +/** + * Plot a \ bar centered on the position. Building block for markers + */ +void PLOTTER::markerBackSlash( const wxPoint& pos, int radius ) +{ + MoveTo( wxPoint( pos.x + radius, pos.y - radius ) ); + FinishTo( wxPoint( pos.x - radius, pos.y + radius ) ); +} + +/** + * Plot a | bar centered on the position. Building block for markers + */ +void PLOTTER::markerVBar( const wxPoint& pos, int radius ) +{ + MoveTo( wxPoint( pos.x, pos.y - radius ) ); + FinishTo( wxPoint( pos.x, pos.y + radius ) ); +} + +/** + * Draw a pattern shape number aShapeId, to coord x0, y0. * x0, y0 = coordinates tables * Diameter diameter = (coord table) hole * AShapeId = index (used to generate forms characters) */ -void PLOTTER::marker( const wxPoint& position, int diametre, int aShapeId ) +void PLOTTER::Marker( const wxPoint& position, int diametre, unsigned aShapeId ) { int radius = diametre / 2; - - int x0, y0; - - x0 = position.x; y0 = position.y; - - switch( aShapeId ) + /* Marker are composed by a series of 'parts' superimposed; not every + combination make sense, obviously. Since they are used in order I + tried to keep the uglier/more complex constructions at the end. + Also I avoided the |/ |\ -/ -\ construction because they're *very* + ugly... if needed they could be added anyway... I'd like to see + a board with more than 58 drilling/slotting tools! + If Visual C++ supported the 0b literals they would be optimally + and easily encoded as an integer array. We have to do with octal */ + static const unsigned char marker_patterns[MARKER_COUNT] = { + // Bit order: O Square Lozenge - | \ / + // First choice: simple shapes + 0003, // X + 0100, // O + 0014, // + + 0040, // Sq + 0020, // Lz + // Two simple shapes + 0103, // X O + 0017, // X + + 0043, // X Sq + 0023, // X Lz + 0114, // O + + 0140, // O Sq + 0120, // O Lz + 0054, // + Sq + 0034, // + Lz + 0060, // Sq Lz + // Three simple shapes + 0117, // X O + + 0143, // X O Sq + 0123, // X O Lz + 0057, // X + Sq + 0037, // X + Lz + 0063, // X Sq Lz + 0154, // O + Sq + 0134, // O + Lz + 0074, // + Sq Lz + // Four simple shapes + 0174, // O Sq Lz + + 0163, // X O Sq Lz + 0157, // X O Sq + + 0137, // X O Lz + + 0077, // X Sq Lz + + // This draws *everything * + 0177, // X O Sq Lz + + // Here we use the single bars... so the cross is forbidden + 0110, // O - + 0104, // O | + 0101, // O / + 0050, // Sq - + 0044, // Sq | + 0041, // Sq / + 0030, // Lz - + 0024, // Lz | + 0021, // Lz / + 0150, // O Sq - + 0144, // O Sq | + 0141, // O Sq / + 0130, // O Lz - + 0124, // O Lz | + 0121, // O Lz / + 0070, // Sq Lz - + 0064, // Sq Lz | + 0061, // Sq Lz / + 0170, // O Sq Lz - + 0164, // O Sq Lz | + 0161, // O Sq Lz / + // Last resort: the backlash component (easy to confound) + 0102, // \ O + 0042, // \ Sq + 0022, // \ Lz + 0142, // \ O Sq + 0122, // \ O Lz + 0062, // \ Sq Lz + 0162 // \ O Sq Lz + }; + if( aShapeId >= MARKER_COUNT ) { - case 0: /* vias : X shape */ - move_to( wxPoint( x0 - radius, y0 - radius ) ); - line_to( wxPoint( x0 + radius, y0 + radius ) ); - move_to( wxPoint( x0 + radius, y0 - radius ) ); - finish_to( wxPoint( x0 - radius, y0 + radius ) ); - break; - - case 1: /* Circle */ - circle( position, diametre, NO_FILL ); - break; - - case 2: /* + shape */ - move_to( wxPoint( x0, y0 - radius ) ); - line_to( wxPoint( x0, y0 + radius ) ); - move_to( wxPoint( x0 + radius, y0 ) ); - finish_to( wxPoint( x0 - radius, y0 ) ); - break; - - case 3: /* X shape in circle */ - circle( position, diametre, NO_FILL ); - move_to( wxPoint( x0 - radius, y0 - radius ) ); - line_to( wxPoint( x0 + radius, y0 + radius ) ); - move_to( wxPoint( x0 + radius, y0 - radius ) ); - finish_to( wxPoint( x0 - radius, y0 + radius ) ); - break; - - case 4: /* circle with bar - shape */ - circle( position, diametre, NO_FILL ); - move_to( wxPoint( x0 - radius, y0 ) ); - finish_to( wxPoint( x0 + radius, y0 ) ); - break; - - case 5: /* circle with bar | shape */ - circle( position, diametre, NO_FILL ); - move_to( wxPoint( x0, y0 - radius ) ); - finish_to( wxPoint( x0, y0 + radius ) ); - break; - - case 6: /* square */ - center_square( position, diametre, NO_FILL ); - break; - - case 7: /* diamond */ - center_lozenge( position, diametre, NO_FILL ); - break; - - case 8: /* square with an X*/ - center_square( position, diametre, NO_FILL ); - move_to( wxPoint( x0 - radius, y0 - radius ) ); - line_to( wxPoint( x0 + radius, y0 + radius ) ); - move_to( wxPoint( x0 + radius, y0 - radius ) ); - finish_to( wxPoint( x0 - radius, y0 + radius ) ); - break; - - case 9: /* diamond with a +*/ - center_lozenge( position, diametre, NO_FILL ); - move_to( wxPoint( x0, y0 - radius ) ); - line_to( wxPoint( x0, y0 + radius ) ); - move_to( wxPoint( x0 + radius, y0 ) ); - finish_to( wxPoint( x0 - radius, y0 ) ); - break; - - case 10: /* square with a '/' */ - center_square( position, diametre, NO_FILL ); - move_to( wxPoint( x0 - radius, y0 - radius ) ); - finish_to( wxPoint( x0 + radius, y0 + radius ) ); - break; - - case 11: /* square with a |*/ - center_lozenge( position, diametre, NO_FILL ); - move_to( wxPoint( x0, y0 - radius ) ); - finish_to( wxPoint( x0, y0 + radius ) ); - break; - - case 12: /* square with a -*/ - center_lozenge( position, diametre, NO_FILL ); - move_to( wxPoint( x0 - radius, y0 ) ); - finish_to( wxPoint( x0 + radius, y0 ) ); - break; - - default: - circle( position, diametre, NO_FILL ); - break; + // Fallback shape + markerCircle( position, radius ); + } + else + { + // Decode the pattern and draw the corresponding parts + unsigned char pat = marker_patterns[aShapeId]; + if( pat & 0001 ) + markerSlash( position, radius ); + if( pat & 0002 ) + markerBackSlash( position, radius ); + if( pat & 0004 ) + markerVBar( position, radius ); + if( pat & 0010 ) + markerHBar( position, radius ); + if( pat & 0020 ) + markerLozenge( position, radius ); + if( pat & 0040 ) + markerSquare( position, radius ); + if( pat & 0100 ) + markerCircle( position, radius ); } + } -/* Convert a thick segment and plot it as an oval */ -void PLOTTER::segment_as_oval( wxPoint start, wxPoint end, int width, - EDA_DRAW_MODE_T tracemode ) +/** + * Convert a thick segment and plot it as an oval + */ +void PLOTTER::segmentAsOval( const wxPoint& start, const wxPoint& end, int width, + EDA_DRAW_MODE_T tracemode ) { wxPoint center( (start.x + end.x) / 2, (start.y + end.y) / 2 ); wxSize size( end.x - start.x, end.y - start.y ); @@ -263,22 +355,22 @@ void PLOTTER::segment_as_oval( wxPoint start, wxPoint end, int width, else if( size.x == 0 ) orient = 900; else - orient = -(int) ( atan2( (double) size.y, - (double) size.x ) * 1800.0 / M_PI ); + orient = -(int) ( RAD2DEG( atan2( size.y, size.x ) ) * 10.0 ); size.x = (int) sqrt( ( (double) size.x * size.x ) + ( (double) size.y * size.y ) ) + width; size.y = width; - flash_pad_oval( center, size, orient, tracemode ); + FlashPadOval( center, size, orient, tracemode ); } -void PLOTTER::sketch_oval( wxPoint pos, wxSize size, int orient, - int width ) +void PLOTTER::sketchOval( const wxPoint& pos, const wxSize& aSize, int orient, + int width ) { - set_current_line_width( width ); - width = current_pen_width; + SetCurrentLineWidth( width ); + width = currentPenWidth; int radius, deltaxy, cx, cy; + wxSize size( aSize ); if( size.x > size.y ) { @@ -293,31 +385,31 @@ void PLOTTER::sketch_oval( wxPoint pos, wxSize size, int orient, cx = -radius; cy = -deltaxy / 2; RotatePoint( &cx, &cy, orient ); - move_to( wxPoint( cx + pos.x, cy + pos.y ) ); + MoveTo( wxPoint( cx + pos.x, cy + pos.y ) ); cx = -radius; cy = deltaxy / 2; RotatePoint( &cx, &cy, orient ); - finish_to( wxPoint( cx + pos.x, cy + pos.y ) ); + FinishTo( wxPoint( cx + pos.x, cy + pos.y ) ); cx = radius; cy = -deltaxy / 2; RotatePoint( &cx, &cy, orient ); - move_to( wxPoint( cx + pos.x, cy + pos.y ) ); + MoveTo( wxPoint( cx + pos.x, cy + pos.y ) ); cx = radius; cy = deltaxy / 2; RotatePoint( &cx, &cy, orient ); - finish_to( wxPoint( cx + pos.x, cy + pos.y ) ); + FinishTo( wxPoint( cx + pos.x, cy + pos.y ) ); cx = 0; cy = deltaxy / 2; RotatePoint( &cx, &cy, orient ); - arc( wxPoint( cx + pos.x, cy + pos.y ), + Arc( wxPoint( cx + pos.x, cy + pos.y ), orient + 1800, orient + 3600, radius, NO_FILL ); cx = 0; cy = -deltaxy / 2; RotatePoint( &cx, &cy, orient ); - arc( wxPoint( cx + pos.x, cy + pos.y ), + Arc( wxPoint( cx + pos.x, cy + pos.y ), orient, orient + 1800, radius, NO_FILL ); } @@ -325,98 +417,98 @@ void PLOTTER::sketch_oval( wxPoint pos, wxSize size, int orient, /* Plot 1 segment like a track segment */ -void PLOTTER::thick_segment( wxPoint start, wxPoint end, int width, - EDA_DRAW_MODE_T tracemode ) -{ - switch( tracemode ) - { - case FILLED: - case LINE: - set_current_line_width( tracemode==FILLED ? width : -1 ); - move_to( start ); - finish_to( end ); - break; - - case SKETCH: - set_current_line_width( -1 ); - segment_as_oval( start, end, width, tracemode ); - break; - } -} - - -void PLOTTER::thick_arc( wxPoint centre, int StAngle, int EndAngle, int radius, - int width, EDA_DRAW_MODE_T tracemode ) -{ - switch( tracemode ) - { - case LINE: - set_current_line_width( -1 ); - arc( centre, StAngle, EndAngle, radius, NO_FILL, -1 ); - break; - - case FILLED: - arc( centre, StAngle, EndAngle, radius, NO_FILL, width ); - break; - - case SKETCH: - set_current_line_width( -1 ); - arc( centre, StAngle, EndAngle, - radius - ( width - current_pen_width ) / 2, NO_FILL, -1 ); - arc( centre, StAngle, EndAngle, - radius + ( width - current_pen_width ) / 2, NO_FILL, -1 ); - break; - } -} - - -void PLOTTER::thick_rect( wxPoint p1, wxPoint p2, int width, - EDA_DRAW_MODE_T tracemode ) -{ - switch( tracemode ) - { - case LINE: - rect( p1, p2, NO_FILL, -1 ); - break; - - case FILLED: - rect( p1, p2, NO_FILL, width ); - break; - - case SKETCH: - set_current_line_width( -1 ); - p1.x -= (width - current_pen_width) / 2; - p1.y -= (width - current_pen_width) / 2; - p2.x += (width - current_pen_width) / 2; - p2.y += (width - current_pen_width) / 2; - rect( p1, p2, NO_FILL, -1 ); - p1.x += (width - current_pen_width); - p1.y += (width - current_pen_width); - p2.x -= (width - current_pen_width); - p2.y -= (width - current_pen_width); - rect( p1, p2, NO_FILL, -1 ); - break; - } -} - - -void PLOTTER::thick_circle( wxPoint pos, int diametre, int width, +void PLOTTER::ThickSegment( const wxPoint& start, const wxPoint& end, int width, EDA_DRAW_MODE_T tracemode ) { switch( tracemode ) { - case LINE: - circle( pos, diametre, NO_FILL, -1 ); - break; - case FILLED: - circle( pos, diametre, NO_FILL, width ); + case LINE: + SetCurrentLineWidth( tracemode==FILLED ? width : -1 ); + MoveTo( start ); + FinishTo( end ); break; case SKETCH: - set_current_line_width( -1 ); - circle( pos, diametre - width + current_pen_width, NO_FILL, -1 ); - circle( pos, diametre + width - current_pen_width, NO_FILL, -1 ); + SetCurrentLineWidth( -1 ); + segmentAsOval( start, end, width, tracemode ); + break; + } +} + + +void PLOTTER::ThickArc( const wxPoint& centre, int StAngle, int EndAngle, int radius, + int width, EDA_DRAW_MODE_T tracemode ) +{ + switch( tracemode ) + { + case LINE: + SetCurrentLineWidth( -1 ); + Arc( centre, StAngle, EndAngle, radius, NO_FILL, -1 ); + break; + + case FILLED: + Arc( centre, StAngle, EndAngle, radius, NO_FILL, width ); + break; + + case SKETCH: + SetCurrentLineWidth( -1 ); + Arc( centre, StAngle, EndAngle, + radius - ( width - currentPenWidth ) / 2, NO_FILL, -1 ); + Arc( centre, StAngle, EndAngle, + radius + ( width - currentPenWidth ) / 2, NO_FILL, -1 ); + break; + } +} + + +void PLOTTER::ThickRect( const wxPoint& p1, const wxPoint& p2, int width, + EDA_DRAW_MODE_T tracemode ) +{ + switch( tracemode ) + { + case LINE: + Rect( p1, p2, NO_FILL, -1 ); + break; + + case FILLED: + Rect( p1, p2, NO_FILL, width ); + break; + + case SKETCH: + SetCurrentLineWidth( -1 ); + wxPoint offsetp1( p1.x - (width - currentPenWidth) / 2, + p1.y - (width - currentPenWidth) / 2 ); + wxPoint offsetp2( p2.x + (width - currentPenWidth) / 2, + p2.y + (width - currentPenWidth) / 2 ); + Rect( offsetp1, offsetp2, NO_FILL, -1 ); + offsetp1.x += (width - currentPenWidth); + offsetp1.y += (width - currentPenWidth); + offsetp2.x -= (width - currentPenWidth); + offsetp2.y -= (width - currentPenWidth); + Rect( offsetp1, offsetp2, NO_FILL, -1 ); + break; + } +} + + +void PLOTTER::ThickCircle( const wxPoint& pos, int diametre, int width, + EDA_DRAW_MODE_T tracemode ) +{ + switch( tracemode ) + { + case LINE: + Circle( pos, diametre, NO_FILL, -1 ); + break; + + case FILLED: + Circle( pos, diametre, NO_FILL, width ); + break; + + case SKETCH: + SetCurrentLineWidth( -1 ); + Circle( pos, diametre - width + currentPenWidth, NO_FILL, -1 ); + Circle( pos, diametre + width - currentPenWidth, NO_FILL, -1 ); break; } } @@ -424,10 +516,7 @@ void PLOTTER::thick_circle( wxPoint pos, int diametre, int width, void PLOTTER::SetPageSettings( const PAGE_INFO& aPageSettings ) { - wxASSERT( !output_file ); + wxASSERT( !outputFile ); pageInfo = aPageSettings; - - // PAGE_INFO is in mils, plotter works with deci-mils - paper_size = pageInfo.GetSizeMils() * 10; } diff --git a/common/common_plotDXF_functions.cpp b/common/common_plotDXF_functions.cpp index e455db7cdf..c4eb45e82a 100644 --- a/common/common_plotDXF_functions.cpp +++ b/common/common_plotDXF_functions.cpp @@ -12,252 +12,394 @@ #include #include - -/* Set the plot offset for the current plotting +/** + * Oblique angle for DXF native text + * (I don't remember if 15 degrees is the ISO value... it looks nice anyway) */ -void DXF_PLOTTER::set_viewport( wxPoint aOffset, double aScale, bool aMirror ) +static const double DXF_OBLIQUE_ANGLE = 15; + +/** + * Set the scale/position for the DXF plot + * The DXF engine doesn't support line widths and mirroring. The output + * coordinate system is in the first quadrant (in mm) + */ +void DXF_PLOTTER::SetViewport( const wxPoint& aOffset, double aIusPerDecimil, + double aScale, bool aMirror ) { - wxASSERT( !output_file ); - plot_offset = aOffset; - plot_scale = aScale; - device_scale = 1; - set_default_line_width( 0 ); /* No line width on DXF */ - plotMirror = false; /* No mirroring on DXF */ - current_color = BLACK; + wxASSERT( !outputFile ); + plotOffset = aOffset; + plotScale = aScale; + // XXX Need to think about this: what is the 'native' unit used for DXF? + iuPerDeviceUnit = 1.0 / aIusPerDecimil; // Gives a DXF in decimils + iuPerDeviceUnit *= 0.00254; // DXF in mm (I like it best) + // Compute the paper size in IUs + paperSize = pageInfo.GetSizeMils(); + paperSize.x *= 10.0 * aIusPerDecimil; + paperSize.y *= 10.0 * aIusPerDecimil; + SetDefaultLineWidth( 0 ); // No line width on DXF + plotMirror = false; // No mirroring on DXF + currentColor = BLACK; } - -bool DXF_PLOTTER::start_plot( FILE* fout ) +/** + * Opens the DXF plot with a skeleton header + */ +bool DXF_PLOTTER::StartPlot( FILE* fout ) { - wxASSERT( !output_file ); - output_file = fout; - /* DXF HEADER - Boilerplate */ - fputs( "0\nSECTION\n2\nHEADER\n9\n$ANGBASE\n50\n0.0\n9\n$ANGDIR\n70\n0\n0\nENDSEC\n0\nSECTION\n2\nTABLES\n0\nTABLE\n2\nLTYPE\n70\n1\n0\nLTYPE\n2\nCONTINUOUS\n70\n0\n3\nSolid line\n72\n65\n73\n0\n40\n0.0\n0\nENDTAB\n", - output_file ); - /* Layer table - one layer per color */ - fprintf( output_file, "0\nTABLE\n2\nLAYER\n70\n%d\n", NBCOLOR ); - for( int i = 0; i= 0 && color_mode ) - || ( color == BLACK ) - || ( color == WHITE ) ) - { - current_color = color; - } -} - - -void DXF_PLOTTER::rect( wxPoint p1, wxPoint p2, FILL_T fill, int width ) -{ - wxASSERT( output_file ); - move_to( p1 ); - line_to( wxPoint( p1.x, p2.y ) ); - line_to( wxPoint( p2.x, p2.y ) ); - line_to( wxPoint( p2.x, p1.y ) ); - finish_to( wxPoint( p1.x, p1.y ) ); -} - - -void DXF_PLOTTER::circle( wxPoint centre, int diameter, FILL_T fill, int width ) -{ - wxASSERT( output_file ); - double radius = user_to_device_size( diameter / 2 ); - user_to_device_coordinates( centre ); - if( radius > 0 ) - { - wxString cname = ColorRefs[current_color].m_Name; - if (!fill) { - fprintf( output_file, "0\nCIRCLE\n8\n%s\n10\n%d.0\n20\n%d.0\n40\n%g\n", - TO_UTF8( cname ), - centre.x, centre.y, radius ); - } - if (fill == FILLED_SHAPE) { - int r = (int)(radius*0.5); - fprintf( output_file, "0\nPOLYLINE\n"); - fprintf( output_file, "8\n%s\n66\n1\n70\n1\n", TO_UTF8( cname )); - fprintf( output_file, "40\n%g\n41\n%g\n", radius,radius); - fprintf( output_file, "0\nVERTEX\n8\n%s\n", TO_UTF8( cname )); - fprintf( output_file, "10\n%d.0\n 20\n%d.0\n42\n1.0\n", centre.x-r,centre.y); - fprintf( output_file, "0\nVERTEX\n8\n%s\n", TO_UTF8( cname )); - fprintf( output_file, "10\n%d.0\n 20\n%d.0\n42\n1.0\n", centre.x+r,centre.y); - fprintf( output_file, "0\nSEQEND\n"); - } - } -} - - -/* Draw a polygon (closed if filled) in DXF format - * nb = number of coord (coord 1 = 2 elements: X and Y table) - * aFill: if != 0 filled polygon - */ -void DXF_PLOTTER::PlotPoly( std::vector< wxPoint >& aCornerList, FILL_T aFill, int aWidth) -{ - if( aCornerList.size() <= 1 ) - return; - - move_to( aCornerList[0] ); - for( unsigned ii = 1; ii < aCornerList.size(); ii++ ) - line_to( aCornerList[ii] ); - - /* Close polygon. */ - if( aFill ) - { - unsigned ii = aCornerList.size() - 1; - if( aCornerList[ii] != aCornerList[0] ) - line_to( aCornerList[0] ); - } - pen_finish(); -} - -/* - * Function PlotImage - * Only Postscript plotters can plot bitmaps - * for plotters that cannot plot a bitmap, a rectangle is plotted - * For DXF_PLOTTER, currently: draws a rectangle - * param aImage = the bitmap - * param aPos = position of the center of the bitmap - * param aScaleFactor = the scale factor to apply to the bitmap size - * (this is not the plot scale factor) - */ -void DXF_PLOTTER::PlotImage( wxImage & aImage, wxPoint aPos, double aScaleFactor ) -{ - wxSize size; - size.x = aImage.GetWidth(); - size.y = aImage.GetHeight(); - - size.x = KiROUND( size.x * aScaleFactor ); - size.y = KiROUND( size.y * aScaleFactor ); - - wxPoint start = aPos; - start.x -= size.x / 2; - start.y -= size.y / 2; - - wxPoint end = start; - end.x += size.x; - end.y += size.y; - - rect( start, end, NO_FILL ); - -} - - - -/* - * Move the pen up (pen = 'U') or down (feather = 'D') at position x, y - * Unit to unit DRAWING - * If pen = 'Z' without lifting pen displacement - */ -void DXF_PLOTTER::pen_to( wxPoint pos, char plume ) -{ - wxASSERT( output_file ); - if( plume == 'Z' ) - { - return; - } - user_to_device_coordinates( pos ); - - if( pen_lastpos != pos && plume == 'D' ) - { - /* DXF LINE */ - wxString cname = ColorRefs[current_color].m_Name; - fprintf( output_file, "0\nLINE\n8\n%s\n10\n%d.0\n20\n%d.0\n11\n%d.0\n21\n%d.0\n", - TO_UTF8( cname ), - pen_lastpos.x, pen_lastpos.y, pos.x, pos.y ); - } - pen_lastpos = pos; -} - - -void DXF_PLOTTER::set_dash( bool dashed ) -{ - /* NOP for now */ -} - - /** - * Function thick_segment - * Plot a filled segment (track) - * @param aStart = starting point - * @param aEnd = ending point - * @param aWidth = segment width (thickness) - * @param aPlotMode = FILLED, SKETCH .. + * The DXF exporter handles 'colors' as layers... */ -void DXF_PLOTTER::thick_segment( wxPoint aStart, wxPoint aEnd, int aWidth, - EDA_DRAW_MODE_T aPlotMode ) +void DXF_PLOTTER::SetColor( EDA_COLOR_T color ) { - if( aPlotMode == LINE ) /* just a line is Ok */ + wxASSERT( outputFile ); + if( ( color >= 0 && colorMode ) + || ( color == BLACK ) + || ( color == WHITE ) ) { - move_to( aStart ); - finish_to( aEnd ); + currentColor = color; } - else +} + +/** + * DXF rectangle: fill not supported + */ +void DXF_PLOTTER::Rect( const wxPoint& p1, const wxPoint& p2, FILL_T fill, int width ) +{ + wxASSERT( outputFile ); + MoveTo( p1 ); + LineTo( wxPoint( p1.x, p2.y ) ); + LineTo( wxPoint( p2.x, p2.y ) ); + LineTo( wxPoint( p2.x, p1.y ) ); + FinishTo( wxPoint( p1.x, p1.y ) ); +} + + +/** + * DXF circle: full functionality; it even does 'fills' drawing a + * circle with a dual-arc polyline wide as the radius. + * + * I could use this trick to do other filled primitives + */ +void DXF_PLOTTER::Circle( const wxPoint& centre, int diameter, FILL_T fill, int width ) +{ + wxASSERT( outputFile ); + double radius = userToDeviceSize( diameter / 2 ); + DPOINT centre_dev = userToDeviceCoordinates( centre ); + if( radius > 0 ) { - segment_as_oval( aStart, aEnd, aWidth, aPlotMode ); + wxString cname = ColorRefs[currentColor].m_Name; + if (!fill) + { + fprintf( outputFile, "0\nCIRCLE\n8\n%s\n10\n%g\n20\n%g\n40\n%g\n", + TO_UTF8( cname ), + centre_dev.x, centre_dev.y, radius ); + } + if (fill == FILLED_SHAPE) + { + double r = radius*0.5; + fprintf( outputFile, "0\nPOLYLINE\n"); + fprintf( outputFile, "8\n%s\n66\n1\n70\n1\n", TO_UTF8( cname )); + fprintf( outputFile, "40\n%g\n41\n%g\n", radius, radius); + fprintf( outputFile, "0\nVERTEX\n8\n%s\n", TO_UTF8( cname )); + fprintf( outputFile, "10\n%g\n 20\n%g\n42\n1.0\n", + centre_dev.x-r, centre_dev.y ); + fprintf( outputFile, "0\nVERTEX\n8\n%s\n", TO_UTF8( cname )); + fprintf( outputFile, "10\n%g\n 20\n%g\n42\n1.0\n", + centre_dev.x+r, centre_dev.y ); + fprintf( outputFile, "0\nSEQEND\n"); + } } } -/* Plot an arc in DXF format. - * center = center coord - * StAngle, EndAngle = angle of beginning and end - * Radius = radius of the arc +/** + * DXF polygon: doesn't fill it but at least it close the filled ones */ -void DXF_PLOTTER::arc( wxPoint centre, int StAngle, int EndAngle, int radius, +void DXF_PLOTTER::PlotPoly( const std::vector< wxPoint >& aCornerList, + FILL_T aFill, int aWidth) +{ + if( aCornerList.size() <= 1 ) + return; + + MoveTo( aCornerList[0] ); + for( unsigned ii = 1; ii < aCornerList.size(); ii++ ) + LineTo( aCornerList[ii] ); + + // Close polygon if 'fill' requested + if( aFill ) + { + unsigned ii = aCornerList.size() - 1; + if( aCornerList[ii] != aCornerList[0] ) + LineTo( aCornerList[0] ); + } + PenFinish(); +} + + +void DXF_PLOTTER::PenTo( const wxPoint& pos, char plume ) +{ + wxASSERT( outputFile ); + if( plume == 'Z' ) + { + return; + } + DPOINT pos_dev = userToDeviceCoordinates( pos ); + DPOINT pen_lastpos_dev = userToDeviceCoordinates( penLastpos ); + + if( penLastpos != pos && plume == 'D' ) + { + // DXF LINE + wxString cname = ColorRefs[currentColor].m_Name; + fprintf( outputFile, "0\nLINE\n8\n%s\n10\n%g\n20\n%g\n11\n%g\n21\n%g\n", + TO_UTF8( cname ), + pen_lastpos_dev.x, pen_lastpos_dev.y, pos_dev.x, pos_dev.y ); + } + penLastpos = pos; +} + + +/** + * Dashed lines are not (yet) supported by DXF_PLOTTER + */ +void DXF_PLOTTER::SetDash( bool dashed ) +{ + // NOP for now +} + + +void DXF_PLOTTER::ThickSegment( const wxPoint& aStart, const wxPoint& aEnd, int aWidth, + EDA_DRAW_MODE_T aPlotMode ) +{ + if( aPlotMode == LINE ) // In line mode, just a line is OK + { + MoveTo( aStart ); + FinishTo( aEnd ); + } + else + { + segmentAsOval( aStart, aEnd, aWidth, aPlotMode ); + } +} + +/** Plot an arc in DXF format + * Filling is not supported + */ +void DXF_PLOTTER::Arc( const wxPoint& centre, int StAngle, int EndAngle, int radius, FILL_T fill, int width ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); if( radius <= 0 ) return; - user_to_device_coordinates( centre ); - radius = KiROUND( user_to_device_size( radius ) ); + DPOINT centre_dev = userToDeviceCoordinates( centre ); + double radius_dev = userToDeviceSize( radius ); - /* DXF ARC */ - wxString cname = ColorRefs[current_color].m_Name; - fprintf( output_file, - "0\nARC\n8\n%s\n10\n%d.0\n20\n%d.0\n40\n%d.0\n50\n%d.0\n51\n%d.0\n", + // Emit a DXF ARC entity + wxString cname = ColorRefs[currentColor].m_Name; + fprintf( outputFile, + "0\nARC\n8\n%s\n10\n%g\n20\n%g\n40\n%g\n50\n%g\n51\n%g\n", TO_UTF8( cname ), - centre.x, centre.y, radius, - StAngle / 10, EndAngle / 10 ); + centre_dev.x, centre_dev.y, radius_dev, + StAngle / 10.0, EndAngle / 10.0 ); } - -/* Plot oval pad at position. */ -void DXF_PLOTTER::flash_pad_oval( wxPoint pos, wxSize size, int orient, - EDA_DRAW_MODE_T trace_mode ) +/** + * DXF oval pad: always done in sketch mode + */ +void DXF_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, int orient, + EDA_DRAW_MODE_T trace_mode ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); + wxSize size( aSize ); /* The chip is reduced to an oval tablet with size.y > size.x * (Oval vertical orientation 0) */ @@ -268,37 +410,41 @@ void DXF_PLOTTER::flash_pad_oval( wxPoint pos, wxSize size, int orient, if( orient >= 3600 ) orient -= 3600; } - sketch_oval( pos, size, orient, -1 ); + sketchOval( pos, size, orient, -1 ); } -/* Plot round pad or via. */ -void DXF_PLOTTER::flash_pad_circle( wxPoint pos, int diametre, +/** + * DXF round pad: always done in sketch mode; it could be filled but it isn't + * pretty if other kinds of pad aren't... + */ +void DXF_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre, EDA_DRAW_MODE_T trace_mode ) { - wxASSERT( output_file ); - circle( pos, diametre, NO_FILL ); + wxASSERT( outputFile ); + Circle( pos, diametre, NO_FILL ); } -/* - * Plot rectangular pad vertical or horizontal (rectangular Pad) +/** + * DXF rectangular pad: alwayd done in sketch mode */ -void DXF_PLOTTER::flash_pad_rect( wxPoint pos, wxSize padsize, - int orient, EDA_DRAW_MODE_T trace_mode ) +void DXF_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& padsize, + int orient, EDA_DRAW_MODE_T trace_mode ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); wxSize size; int ox, oy, fx, fy; - size.x = padsize.x / 2; size.y = padsize.y / 2; + size.x = padsize.x / 2; + size.y = padsize.y / 2; if( size.x < 0 ) size.x = 0; if( size.y < 0 ) size.y = 0; - /* If a dimension is zero, the trace is reduced to 1 line. */ + // If a dimension is zero, the trace is reduced to 1 line if( size.x == 0 ) { ox = pos.x; @@ -307,8 +453,8 @@ void DXF_PLOTTER::flash_pad_rect( wxPoint pos, wxSize padsize, fx = pos.x; fy = pos.y + size.y; RotatePoint( &fx, &fy, pos.x, pos.y, orient ); - move_to( wxPoint( ox, oy ) ); - finish_to( wxPoint( fx, fy ) ); + MoveTo( wxPoint( ox, oy ) ); + FinishTo( wxPoint( fx, fy ) ); return; } if( size.y == 0 ) @@ -319,45 +465,42 @@ void DXF_PLOTTER::flash_pad_rect( wxPoint pos, wxSize padsize, fx = pos.x + size.x; fy = pos.y; RotatePoint( &fx, &fy, pos.x, pos.y, orient ); - move_to( wxPoint( ox, oy ) ); - finish_to( wxPoint( fx, fy ) ); + MoveTo( wxPoint( ox, oy ) ); + FinishTo( wxPoint( fx, fy ) ); return; } ox = pos.x - size.x; oy = pos.y - size.y; RotatePoint( &ox, &oy, pos.x, pos.y, orient ); - move_to( wxPoint( ox, oy ) ); + MoveTo( wxPoint( ox, oy ) ); fx = pos.x - size.x; fy = pos.y + size.y; RotatePoint( &fx, &fy, pos.x, pos.y, orient ); - line_to( wxPoint( fx, fy ) ); + LineTo( wxPoint( fx, fy ) ); fx = pos.x + size.x; fy = pos.y + size.y; RotatePoint( &fx, &fy, pos.x, pos.y, orient ); - line_to( wxPoint( fx, fy ) ); + LineTo( wxPoint( fx, fy ) ); fx = pos.x + size.x; fy = pos.y - size.y; RotatePoint( &fx, &fy, pos.x, pos.y, orient ); - line_to( wxPoint( fx, fy ) ); + LineTo( wxPoint( fx, fy ) ); - finish_to( wxPoint( ox, oy ) ); + FinishTo( wxPoint( ox, oy ) ); } -/* - * Plot trapezoidal pad. - * aPadPos is pad position, aCorners the corners position of the basic shape - * Orientation aPadOrient in 0.1 degrees - * Plot mode = FILLED, SKETCH (unused) +/** + * DXF trapezoidal pad: only sketch mode is supported */ -void DXF_PLOTTER::flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], - int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ) +void DXF_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, + int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); wxPoint coord[4]; /* coord actual corners of a trapezoidal trace */ for( int ii = 0; ii < 4; ii++ ) @@ -368,9 +511,158 @@ void DXF_PLOTTER::flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], } // Plot edge: - move_to( coord[0] ); - line_to( coord[1] ); - line_to( coord[2] ); - line_to( coord[3] ); - finish_to( coord[0] ); + MoveTo( coord[0] ); + LineTo( coord[1] ); + LineTo( coord[2] ); + LineTo( coord[3] ); + FinishTo( coord[0] ); } + +void DXF_PLOTTER::Text( const wxPoint& aPos, + enum EDA_COLOR_T aColor, + const wxString& aText, + int aOrient, + const wxSize& aSize, + enum EDA_TEXT_HJUSTIFY_T aH_justify, + enum EDA_TEXT_VJUSTIFY_T aV_justify, + int aWidth, + bool aItalic, + bool aBold ) +{ + if( textAsLines ) + PLOTTER::Text( aPos, aColor, aText, aOrient, aSize, aH_justify, aV_justify, + aWidth, aItalic, aBold ); + else + { + /* Emit text as a text entity. This loses formatting and shape but it's + more useful as a CAD object */ + DPOINT origin_dev = userToDeviceCoordinates( aPos ); + if( aColor >= 0 ) + currentColor = aColor; + wxString cname = ColorRefs[currentColor].m_Name; + DPOINT size_dev = userToDeviceSize( aSize ); + int h_code = 0, v_code = 0; + switch( aH_justify ) + { + case GR_TEXT_HJUSTIFY_LEFT: + h_code = 0; + break; + case GR_TEXT_HJUSTIFY_CENTER: + h_code = 1; + break; + case GR_TEXT_HJUSTIFY_RIGHT: + h_code = 2; + break; + } + switch( aV_justify ) + { + case GR_TEXT_VJUSTIFY_TOP: + v_code = 3; + break; + case GR_TEXT_VJUSTIFY_CENTER: + v_code = 2; + break; + case GR_TEXT_VJUSTIFY_BOTTOM: + v_code = 1; + break; + } + + // Position, size, rotation and alignment + // The two alignment point usages is somewhat idiot (see the DXF ref) + // Anyway since we don't use the fit/aligned options, they're the same + fprintf( outputFile, + " 0\n" + "TEXT\n" + " 7\n" + "%s\n" // Text style + " 8\n" + "%s\n" // Layer name + " 10\n" + "%g\n" // First point X + " 11\n" + "%g\n" // Second point X + " 20\n" + "%g\n" // First point Y + " 21\n" + "%g\n" // Second point Y + " 40\n" + "%g\n" // Text height + " 41\n" + "%g\n" // Width factor + " 50\n" + "%g\n" // Rotation + " 51\n" + "%g\n" // Oblique angle + " 71\n" + "%d\n" // Mirror flags + " 72\n" + "%d\n" // H alignment + " 73\n" + "%d\n", // V alignment + aBold ? (aItalic ? "KICADBI" : "KICADB") + : (aItalic ? "KICADI" : "KICAD"), + TO_UTF8( cname ), + origin_dev.x, origin_dev.x, + origin_dev.y, origin_dev.y, + size_dev.y, fabs( size_dev.y / size_dev.x ), + aOrient / 10.0, + aItalic ? DXF_OBLIQUE_ANGLE : 0, + size_dev.x < 0 ? 2 : 0, // X mirror flag + h_code, v_code ); + + /* There are two issue in emitting the text: + - Our overline character (~) must be converted to the appropriate + control sequence %%O or %%o + - Text encoding in DXF is more or less unspecified since depends on + the DXF declared version, the acad version reading it *and* some + system variables to be put in the header handled only by newer acads + Also before R15 unicode simply is not supported (you need to use + bigfonts which are a massive PITA). Common denominator solution: + use Latin1 (and however someone could choke on it, anyway). Sorry + for the extended latin people. If somewant want to try fixing this + recent version seems to use UTF-8 (and not UCS2 like the rest of + Windows) + + XXX Actually there is a *third* issue: older DXF formats are limited + to 255 bytes records (it was later raised to 2048); since I'm lazy + and text so long is not probable I just don't implement this rule. + If someone is interested in fixing this, you have to emit the first + partial lines with group code 3 (max 250 bytes each) and then finish + with a group code 1 (less than 250 bytes). The DXF refs explains it + in no more details... + */ + + bool overlining = false; + fputs( " 1\n", outputFile ); + for( unsigned i = 0; i < aText.length(); i++ ) + { + /* Here I do a bad thing: writing the output one byte at a time! + but today I'm lazy and I have no idea on how to coerce a Unicode + wxString to spit out latin1 encoded text ... + + Atleast stdio is *supposed* to do output buffering, so there is + hope is not too slow */ + wchar_t ch = aText[i]; + if( ch > 255 ) + { + // I can't encode this... + putc( '?', outputFile ); + } + else + { + if( ch == '~' ) + { + // Handle the overline toggle + fputs( overlining ? "%%o" : "%%O", outputFile ); + overlining = !overlining; + } + else + { + putc( ch, outputFile ); + } + } + } + putc( '\n', outputFile ); + } +} + diff --git a/common/common_plotGERBER_functions.cpp b/common/common_plotGERBER_functions.cpp index 051e359e57..05a0202605 100644 --- a/common/common_plotGERBER_functions.cpp +++ b/common/common_plotGERBER_functions.cpp @@ -16,25 +16,34 @@ #include -/** - * Function set_viewport - * Set the plot offset for the current plotting - * @param aOffset = plot offset - * @param aScale = coordinate scale (scale coefficient for coordinates) - * @param aMirror - Mirror plot if true. - */ -void GERBER_PLOTTER::set_viewport( wxPoint aOffset, double aScale, bool aMirror ) +void GERBER_PLOTTER::SetViewport( const wxPoint& aOffset, double aIusPerDecimil, + double aScale, bool aMirror ) { - wxASSERT( !output_file ); + wxASSERT( !outputFile ); wxASSERT( aMirror == false ); plotMirror = false; - plot_offset = aOffset; + plotOffset = aOffset; wxASSERT( aScale == 1 ); - plot_scale = 1; - device_scale = 1; - set_default_line_width( 100 ); /* line thickness in 1 / 1000 inch */ + plotScale = 1; + iuPerDeviceUnit = 1.0 / aIusPerDecimil; + /* We don't handle the filmbox, and it's more useful to keep the + * origin at the origin */ + paperSize.x = 0; + paperSize.y = 0; + SetDefaultLineWidth( 100 * aIusPerDecimil ); // Arbitrary default } +/** + * Emit a D-Code record, using proper conversions + * to format a leading zero omitted gerber coordinate + * (for 4 decimal positions, see header generation in start_plot + */ +void GERBER_PLOTTER::emitDcode( const DPOINT& pt, int dcode ) +{ + + fprintf( outputFile, "X%dY%dD%02d*\n", + int( pt.x ), int( pt.y ), dcode ); +} /** * Function start_plot @@ -42,106 +51,102 @@ void GERBER_PLOTTER::set_viewport( wxPoint aOffset, double aScale, bool aMirror * initialize global variable g_Plot_PlotOutputFile * @param aFile: an opened file to write to */ -bool GERBER_PLOTTER::start_plot( FILE* aFile ) +bool GERBER_PLOTTER::StartPlot( FILE* aFile ) { - wxASSERT( !output_file ); - final_file = aFile; + wxASSERT( !outputFile ); + finalFile = aFile; // Create a temporary filename to store gerber file // note tmpfile() does not work under Vista and W7 in user mode m_workFilename = filename + wxT(".tmp"); - work_file = wxFopen( m_workFilename, wxT( "wt" )); - output_file = work_file; - wxASSERT( output_file ); + workFile = wxFopen( m_workFilename, wxT( "wt" )); + outputFile = workFile; + wxASSERT( outputFile ); - if( output_file == NULL ) + if( outputFile == NULL ) return false; wxString Title = creator + wxT( " " ) + GetBuildVersion(); - fprintf( output_file, "G04 (created by %s) date %s*\n", + fprintf( outputFile, "G04 (created by %s) date %s*\n", TO_UTF8( Title ), TO_UTF8( DateAndTime() ) ); - // Specify linear interpol (G01), unit = INCH (G70), abs format (G90): - fputs( "G01*\nG70*\nG90*\n", output_file ); - fputs( "%MOIN*%\n", output_file ); // set unites = INCHES + /* Mass parameter: unit = INCHES */ + fputs( "%MOIN*%\n", outputFile ); - /* Set gerber format to 3.4 */ + /* Set coordinate format to 3.4 absolute, leading zero omitted */ fputs( "G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*\n%FSLAX34Y34*%\n", - output_file ); + outputFile ); - fputs( "G04 APERTURE LIST*\n", output_file ); + /* Specify linear interpol (G01), unit = INCH (G70), abs format (G90) */ + fputs( "G01*\nG70*\nG90*\n", outputFile ); + fputs( "G04 APERTURE LIST*\n", outputFile ); /* Select the default aperture */ - set_current_line_width( -1 ); + SetCurrentLineWidth( -1 ); return true; } -bool GERBER_PLOTTER::end_plot() +bool GERBER_PLOTTER::EndPlot() { char line[1024]; wxString msg; - wxASSERT( output_file ); + wxASSERT( outputFile ); - /* Outfile is actually a temporary file! */ - fputs( "M02*\n", output_file ); - fflush( output_file ); + /* Outfile is actually a temporary file i.e. workFile */ + fputs( "M02*\n", outputFile ); + fflush( outputFile ); -// rewind( work_file ); // work_file == output_file !!! - fclose( work_file ); - work_file = wxFopen( m_workFilename, wxT( "rt" )); - wxASSERT( work_file ); - output_file = final_file; + fclose( workFile ); + workFile = wxFopen( m_workFilename, wxT( "rt" )); + wxASSERT( workFile ); + outputFile = finalFile; // Placement of apertures in RS274X - while( fgets( line, 1024, work_file ) ) + while( fgets( line, 1024, workFile ) ) { - fputs( line, output_file ); + fputs( line, outputFile ); if( strcmp( strtok( line, "\n\r" ), "G04 APERTURE LIST*" ) == 0 ) { - write_aperture_list(); - fputs( "G04 APERTURE END LIST*\n", output_file ); + writeApertureList(); + fputs( "G04 APERTURE END LIST*\n", outputFile ); } } - fclose( work_file ); - fclose( final_file ); + fclose( workFile ); + fclose( finalFile ); ::wxRemoveFile( m_workFilename ); - output_file = 0; + outputFile = 0; return true; } -/* Set the default line width (in 1/1000 inch) for the current plotting - */ -void GERBER_PLOTTER::set_default_line_width( int width ) +void GERBER_PLOTTER::SetDefaultLineWidth( int width ) { - default_pen_width = width; - current_aperture = apertures.end(); + defaultPenWidth = width; + currentAperture = apertures.end(); } -/* Set the Current line width (in 1/1000 inch) for the next plot - */ -void GERBER_PLOTTER::set_current_line_width( int width ) +void GERBER_PLOTTER::SetCurrentLineWidth( int width ) { int pen_width; if( width > 0 ) pen_width = width; else - pen_width = default_pen_width; + pen_width = defaultPenWidth; - select_aperture( wxSize( pen_width, pen_width ), APERTURE::Plotting ); - current_pen_width = pen_width; + selectAperture( wxSize( pen_width, pen_width ), APERTURE::Plotting ); + currentPenWidth = pen_width; } -std::vector::iterator GERBER_PLOTTER::get_aperture( const wxSize& size, - APERTURE::Aperture_Type type ) +std::vector::iterator GERBER_PLOTTER::getAperture( const wxSize& size, + APERTURE::APERTURE_TYPE type ) { int last_D_code = 9; @@ -150,9 +155,9 @@ std::vector::iterator GERBER_PLOTTER::get_aperture( const wxSize& while( tool != apertures.end() ) { - last_D_code = tool->D_code; + last_D_code = tool->DCode; - if( (tool->type == type) && (tool->size == size) ) + if( (tool->Type == type) && (tool->Size == size) ) return tool; tool++; @@ -160,76 +165,78 @@ std::vector::iterator GERBER_PLOTTER::get_aperture( const wxSize& // Allocate a new aperture APERTURE new_tool; - new_tool.size = size; - new_tool.type = type; - new_tool.D_code = last_D_code + 1; + new_tool.Size = size; + new_tool.Type = type; + new_tool.DCode = last_D_code + 1; apertures.push_back( new_tool ); return apertures.end() - 1; } -void GERBER_PLOTTER::select_aperture( const wxSize& size, - APERTURE::Aperture_Type type ) +void GERBER_PLOTTER::selectAperture( const wxSize& size, + APERTURE::APERTURE_TYPE type ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); - if( ( current_aperture == apertures.end() ) - || ( current_aperture->type != type ) - || ( current_aperture->size != size ) ) + if( ( currentAperture == apertures.end() ) + || ( currentAperture->Type != type ) + || ( currentAperture->Size != size ) ) { /* Pick an existing aperture or create a new one */ - current_aperture = get_aperture( size, type ); - fprintf( output_file, "G54D%d*\n", current_aperture->D_code ); + currentAperture = getAperture( size, type ); + fprintf( outputFile, "G54D%d*\n", currentAperture->DCode ); } } -/*Generate list of D_CODES. - * Returns the number of D_Codes generated in RS274X format. +/** + * Generate the table of D codes */ -void GERBER_PLOTTER::write_aperture_list() +void GERBER_PLOTTER::writeApertureList() { - wxASSERT( output_file ); + wxASSERT( outputFile ); char cbuf[1024]; /* Init : */ for( std::vector::iterator tool = apertures.begin(); tool != apertures.end(); tool++ ) { - const float fscale = 0.0001f * plot_scale; // For 3.4 format - char* text; + const double fscale = 0.0001f * plotScale + * iuPerDeviceUnit ; // For 3.4 format + char* text = cbuf + sprintf( cbuf, "%%ADD%d", tool->DCode ); - text = cbuf + sprintf( cbuf, "%%ADD%d", tool->D_code ); - - switch( tool->type ) + switch( tool->Type ) { case APERTURE::Circle: - sprintf( text, "C,%f*%%\n", tool->size.x * fscale ); + sprintf( text, "C,%g*%%\n", tool->Size.x * fscale ); break; case APERTURE::Rect: - sprintf( text, "R,%fX%f*%%\n", tool->size.x * fscale, - tool->size.y * fscale ); + sprintf( text, "R,%gX%g*%%\n", + tool->Size.x * fscale, + tool->Size.y * fscale ); break; case APERTURE::Plotting: - sprintf( text, "C,%f*%%\n", tool->size.x * fscale ); + sprintf( text, "C,%g*%%\n", tool->Size.x * fscale ); break; case APERTURE::Oval: - sprintf( text, "O,%fX%f*%%\n", tool->size.x * fscale, tool->size.y * fscale ); + sprintf( text, "O,%gX%g*%%\n", + tool->Size.x * fscale, + tool->Size.y * fscale ); break; } - fputs( cbuf, output_file ); + fputs( cbuf, outputFile ); } } -void GERBER_PLOTTER::pen_to( wxPoint aPos, char plume ) +void GERBER_PLOTTER::PenTo( const wxPoint& aPos, char plume ) { - wxASSERT( output_file ); - user_to_device_coordinates( aPos ); + wxASSERT( outputFile ); + DPOINT pos_dev = userToDeviceCoordinates( aPos ); switch( plume ) { @@ -237,21 +244,21 @@ void GERBER_PLOTTER::pen_to( wxPoint aPos, char plume ) break; case 'U': - fprintf( output_file, "X%5.5dY%5.5dD02*\n", aPos.x, aPos.y ); + emitDcode( pos_dev, 2 ); break; case 'D': - fprintf( output_file, "X%5.5dY%5.5dD01*\n", aPos.x, aPos.y ); + emitDcode( pos_dev, 1 ); } - pen_state = plume; + penState = plume; } -void GERBER_PLOTTER::rect( wxPoint p1, wxPoint p2, FILL_T fill, int width ) +void GERBER_PLOTTER::Rect( const wxPoint& p1, const wxPoint& p2, FILL_T fill, + int width ) { - static std::vector< wxPoint > cornerList; - cornerList.clear(); + std::vector< wxPoint > cornerList; // Build corners list cornerList.push_back( p1 ); @@ -267,141 +274,98 @@ void GERBER_PLOTTER::rect( wxPoint p1, wxPoint p2, FILL_T fill, int width ) } -/** - * Function circle - * writes a non filled circle to output file - * Plot one circle as segments (6 to 16 depending on its radius - * @param aCentre = center coordinates - * @param aDiameter = diameter of the circle - * @param aFill = plot option (NO_FILL, FILLED_SHAPE, FILLED_WITH_BG_BODYCOLOR) - * not used here: circles are always not filled the gerber. Filled circles are flashed - * @param aWidth = line width - */ -void GERBER_PLOTTER::circle( wxPoint aCentre, int aDiameter, FILL_T aFill, int aWidth ) +void GERBER_PLOTTER::Circle( const wxPoint& aCentre, int aDiameter, FILL_T aFill, + int aWidth ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); wxPoint start, end; double radius = aDiameter / 2; const int delta = 3600 / 32; /* increment (in 0.1 degrees) to draw circles */ start.x = aCentre.x + KiROUND( radius ); start.y = aCentre.y; - set_current_line_width( aWidth ); - move_to( start ); + SetCurrentLineWidth( aWidth ); + MoveTo( start ); for( int ii = delta; ii < 3600; ii += delta ) { - end.x = aCentre.x + (int) ( radius * cos( DEG2RAD( (double)ii / 10.0 ) ) ); - end.y = aCentre.y + (int) ( radius * sin( DEG2RAD( (double)ii / 10.0 ) ) ); - line_to( end ); + end.x = aCentre.x + (int) ( radius * cos( DEG2RAD( ii / 10.0 ) ) ); + end.y = aCentre.y + (int) ( radius * sin( DEG2RAD( ii / 10.0 ) ) ); + LineTo( end ); } - finish_to( start ); + FinishTo( start ); } -/* - * Function PlotPoly - * writes a filled or not filled polyline to output file - * @param aCornerList = buffer of corners coordinates - * @param aFill = plot option (NO_FILL, FILLED_SHAPE, FILLED_WITH_BG_BODYCOLOR) - * @param aWidth = Width of the line to plot. +/** + * Gerber polygon: they can (and *should*) be filled with the + * appropriate G36/G37 sequence (raster fills are deprecated) */ -void GERBER_PLOTTER::PlotPoly( std::vector< wxPoint >& aCornerList, FILL_T aFill, int aWidth ) +void GERBER_PLOTTER::PlotPoly( const std::vector< wxPoint >& aCornerList, + FILL_T aFill, int aWidth ) { if( aCornerList.size() <= 1 ) return; - set_current_line_width( aWidth ); + SetCurrentLineWidth( aWidth ); if( aFill ) - fputs( "G36*\n", output_file ); + fputs( "G36*\n", outputFile ); - move_to( aCornerList[0] ); + MoveTo( aCornerList[0] ); for( unsigned ii = 1; ii < aCornerList.size(); ii++ ) { - line_to( aCornerList[ii] ); + LineTo( aCornerList[ii] ); } if( aFill ) { - finish_to( aCornerList[0] ); - fputs( "G37*\n", output_file ); + FinishTo( aCornerList[0] ); + fputs( "G37*\n", outputFile ); } else { - pen_finish(); + PenFinish(); } } -/* - * Function PlotImage - * Only Postscript plotters can plot bitmaps - * for plotters that cannot plot a bitmap, a rectangle is plotted - * For GERBER_PLOTTER, draws a rectangle - * param aImage = the bitmap - * param aPos = position of the center of the bitmap - * param aScaleFactor = the scale factor to apply to the bitmap size - * (this is not the plot scale factor) +/** + * Filled circular flashes are stored as apertures */ -void GERBER_PLOTTER::PlotImage( wxImage & aImage, wxPoint aPos, double aScaleFactor ) +void GERBER_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre, + EDA_DRAW_MODE_T trace_mode ) { - wxSize size; - size.x = aImage.GetWidth(); - size.y = aImage.GetHeight(); - - size.x = KiROUND( size.x * aScaleFactor ); - size.y = KiROUND( size.y * aScaleFactor ); - - wxPoint start = aPos; - start.x -= size.x / 2; - start.y -= size.y / 2; - - wxPoint end = start; - end.x += size.x; - end.y += size.y; - - rect( start, end, NO_FILL ); - -} - -/* Function flash_pad_circle - * Plot a circular pad or via at the user position pos - */ -void GERBER_PLOTTER::flash_pad_circle( wxPoint pos, int diametre, EDA_DRAW_MODE_T trace_mode ) -{ - wxASSERT( output_file ); + wxASSERT( outputFile ); wxSize size( diametre, diametre ); switch( trace_mode ) { case LINE: case SKETCH: - set_current_line_width( -1 ); - circle( pos, diametre - current_pen_width, NO_FILL ); + SetCurrentLineWidth( -1 ); + Circle( pos, diametre - currentPenWidth, NO_FILL ); break; case FILLED: - user_to_device_coordinates( pos ); - select_aperture( size, APERTURE::Circle ); - fprintf( output_file, "X%5.5dY%5.5dD03*\n", pos.x, pos.y ); + DPOINT pos_dev = userToDeviceCoordinates( pos ); + selectAperture( size, APERTURE::Circle ); + emitDcode( pos_dev, 3 ); break; } } -/* Plot oval pad at position pos: - * Dimensions dx, dy, - * Orient Orient - * For a vertical or horizontal orientation, the shape is flashed - * For any orientation the shape is drawn as a segment +/** + * Filled oval flashes are handled as aperture in the 90 degree positions only */ -void GERBER_PLOTTER::flash_pad_oval( wxPoint pos, wxSize size, int orient, - EDA_DRAW_MODE_T trace_mode ) +void GERBER_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, int orient, + EDA_DRAW_MODE_T trace_mode ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); int x0, y0, x1, y1, delta; + wxSize size( aSize ); /* Plot a flashed shape. */ if( ( orient == 0 || orient == 900 || orient == 1800 || orient == 2700 ) @@ -409,10 +373,10 @@ void GERBER_PLOTTER::flash_pad_oval( wxPoint pos, wxSize size, int orient, { if( orient == 900 || orient == 2700 ) /* orientation turned 90 deg. */ EXCHG( size.x, size.y ); - - user_to_device_coordinates( pos ); - select_aperture( size, APERTURE::Oval ); - fprintf( output_file, "X%5.5dY%5.5dD03*\n", pos.x, pos.y ); + + DPOINT pos_dev = userToDeviceCoordinates( pos ); + selectAperture( size, APERTURE::Oval ); + emitDcode( pos_dev, 3 ); } else /* Plot pad as a segment. */ { @@ -428,6 +392,7 @@ void GERBER_PLOTTER::flash_pad_oval( wxPoint pos, wxSize size, int orient, if( trace_mode == FILLED ) { + /* XXX to do: use an aperture macro to declare the rotated pad */ /* The pad is reduced to an oval with dy > dx */ delta = size.y - size.x; x0 = 0; @@ -436,104 +401,100 @@ void GERBER_PLOTTER::flash_pad_oval( wxPoint pos, wxSize size, int orient, y1 = delta / 2; RotatePoint( &x0, &y0, orient ); RotatePoint( &x1, &y1, orient ); - thick_segment( wxPoint( pos.x + x0, pos.y + y0 ), + ThickSegment( wxPoint( pos.x + x0, pos.y + y0 ), wxPoint( pos.x + x1, pos.y + y1 ), size.x, trace_mode ); } else { - sketch_oval( pos, size, orient, -1 ); + sketchOval( pos, size, orient, -1 ); } } } -/* Plot rectangular pad. - * Gives its center, size, and orientation - * For a vertical or horizontal shape, the shape is an aperture (Dcode) and - * it is flashed. - * For others shape the direction is plotted as a polygon. +/** + * Filled rect flashes are handled as aperture in the 90 degree positions only */ -void GERBER_PLOTTER::flash_pad_rect( wxPoint pos, wxSize size, - int orient, EDA_DRAW_MODE_T trace_mode ) +void GERBER_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& aSize, + int orient, EDA_DRAW_MODE_T trace_mode ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); + wxSize size( aSize ); /* Plot as flashed. */ switch( orient ) { case 900: - case 2700: /* rotation of 90 degrees or 270 returns dimensions */ - EXCHG( size.x, size.y ); + case 2700: /* rotation of 90 degrees or 270 swaps dimensions */ + EXCHG( size.x, size.y ); - // Pass through + // Pass through case 0: case 1800: - switch( trace_mode ) - { - case LINE: - case SKETCH: - set_current_line_width( -1 ); - rect( wxPoint( pos.x - (size.x - current_pen_width) / 2, - pos.y - (size.y - current_pen_width) / 2 ), - wxPoint( pos.x + (size.x - current_pen_width) / 2, - pos.y + (size.y - current_pen_width) / 2 ), - NO_FILL ); - break; + switch( trace_mode ) + { + case LINE: + case SKETCH: + SetCurrentLineWidth( -1 ); + Rect( wxPoint( pos.x - (size.x - currentPenWidth) / 2, + pos.y - (size.y - currentPenWidth) / 2 ), + wxPoint( pos.x + (size.x - currentPenWidth) / 2, + pos.y + (size.y - currentPenWidth) / 2 ), + NO_FILL ); + break; - case FILLED: - user_to_device_coordinates( pos ); - select_aperture( size, APERTURE::Rect ); - fprintf( output_file, "X%5.5dY%5.5dD03*\n", pos.x, pos.y ); - break; - } + case FILLED: + DPOINT pos_dev = userToDeviceCoordinates( pos ); + selectAperture( size, APERTURE::Rect ); + emitDcode( pos_dev, 3 ); + break; + } + break; - break; + default: // plot pad shape as polygon + { + // XXX to do: use an aperture macro to declare the rotated pad + wxPoint coord[4]; + // coord[0] is assumed the lower left + // coord[1] is assumed the upper left + // coord[2] is assumed the upper right + // coord[3] is assumed the lower right - default: /* plot pad shape as polygon */ - { - wxPoint coord[4]; - // coord[0] is assumed the lower left - // coord[1] is assumed the upper left - // coord[2] is assumed the upper right - // coord[3] is assumed the lower right + /* Trace the outline. */ + coord[0].x = -size.x/2; // lower left + coord[0].y = size.y/2; + coord[1].x = -size.x/2; // upper left + coord[1].y = -size.y/2; + coord[2].x = size.x/2; // upper right + coord[2].y = -size.y/2; + coord[3].x = size.x/2; // lower right + coord[3].y = size.y/2; - /* Trace the outline. */ - coord[0].x = -size.x/2; // lower left - coord[0].y = size.y/2; - coord[1].x = -size.x/2; // upper left - coord[1].y = -size.y/2; - coord[2].x = size.x/2; // upper right - coord[2].y = -size.y/2; - coord[3].x = size.x/2; //lower right - coord[3].y = size.y/2; - - flash_pad_trapez( pos, coord, orient, trace_mode ); - } - break; + FlashPadTrapez( pos, coord, orient, trace_mode ); + } + break; } } -/* Plot trapezoidal pad. - * aPadPos is pad position, aCorners the corners positions of the basic shape - * Orientation aPadOrient in 0.1 degrees - * Plot mode = FILLED or SKETCH +/** + * Trapezoidal pad at the moment are *never* handled as aperture, since + * they require aperture macros */ - void GERBER_PLOTTER::flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], - int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ) +void GERBER_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint* aCorners, + int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ) { + // XXX to do: use an aperture macro to declare the pad // polygon corners list - static std::vector< wxPoint > cornerList; - cornerList.clear(); - + std::vector< wxPoint > cornerList; for( int ii = 0; ii < 4; ii++ ) cornerList.push_back( aCorners[ii] ); - /* Draw the polygon and fill the interior as required. */ + // Draw the polygon and fill the interior as required for( unsigned ii = 0; ii < 4; ii++ ) { RotatePoint( &cornerList[ii], aPadOrient ); @@ -543,15 +504,19 @@ void GERBER_PLOTTER::flash_pad_rect( wxPoint pos, wxSize size, // Close the polygon cornerList.push_back( cornerList[0] ); - set_current_line_width( -1 ); + SetCurrentLineWidth( -1 ); PlotPoly( cornerList, aTrace_Mode==FILLED ? FILLED_SHAPE : NO_FILL ); } - +/** + * Change the plot polarity and begin a new layer + * Used to 'scratch off' silk screen away from solder mask + */ void GERBER_PLOTTER::SetLayerPolarity( bool aPositive ) { if( aPositive ) - fprintf( output_file, "%%LPD*%%\n" ); + fprintf( outputFile, "%%LPD*%%\n" ); else - fprintf( output_file, "%%LPC*%%\n" ); + fprintf( outputFile, "%%LPC*%%\n" ); } + diff --git a/common/common_plotHPGL_functions.cpp b/common/common_plotHPGL_functions.cpp index e9c28cd988..dcb38b9b03 100644 --- a/common/common_plotHPGL_functions.cpp +++ b/common/common_plotHPGL_functions.cpp @@ -1,6 +1,10 @@ /** * @file common_plotHPGL_functions.cpp * @brief KiCad: Common plot HPGL Routines + * Filled primitive are not supported, but some could be using HPGL/2 + * Since this plot engine is mostly intended for import in external programs, + * sadly HPGL/2 isn't supported a lot... some of the primitives use overlapped + * strokes to fill the shape */ #include @@ -12,184 +16,163 @@ #include #include -// HPGL scale factor. -const double SCALE_HPGL = 0.102041; +// HPGL scale factor (1 PLU = 1/40mm IIRC) +static const double PLUsPERDECIMIL = 0.102041; -void HPGL_PLOTTER::set_viewport( wxPoint aOffset, double aScale, bool aMirror ) +void HPGL_PLOTTER::SetViewport( const wxPoint& aOffset, double aIusPerDecimil, + double aScale, bool aMirror ) { - wxASSERT( !output_file ); - plot_offset = aOffset; - plot_scale = aScale; - device_scale = SCALE_HPGL; - set_default_line_width( 100 ); // default line width in 1 / 1000 inch + wxASSERT( !outputFile ); + plotOffset = aOffset; + plotScale = aScale; + iuPerDeviceUnit = PLUsPERDECIMIL / aIusPerDecimil; + /* Compute the paper size in IUs */ + paperSize = pageInfo.GetSizeMils(); + paperSize.x *= 10.0 * aIusPerDecimil; + paperSize.y *= 10.0 * aIusPerDecimil; + SetDefaultLineWidth( 0 ); // HPGL has pen sizes instead plotMirror = aMirror; } - -bool HPGL_PLOTTER::start_plot( FILE* fout ) +/** + * At the start of the HPGL plot pen speed and number are requested + */ +bool HPGL_PLOTTER::StartPlot( FILE* fout ) { - wxASSERT( !output_file ); - output_file = fout; - fprintf( output_file, "IN;VS%d;PU;PA;SP%d;\n", pen_speed, pen_number ); + wxASSERT( !outputFile ); + outputFile = fout; + fprintf( outputFile, "IN;VS%d;PU;PA;SP%d;\n", penSpeed, penNumber ); return true; } - -bool HPGL_PLOTTER::end_plot() +/** + * HPGL end of plot: pen return and release + */ +bool HPGL_PLOTTER::EndPlot() { - wxASSERT( output_file ); - fputs( "PU;PA;SP0;\n", output_file ); - fclose( output_file ); - output_file = NULL; + wxASSERT( outputFile ); + fputs( "PU;PA;SP0;\n", outputFile ); + fclose( outputFile ); + outputFile = NULL; return true; } - -void HPGL_PLOTTER::rect( wxPoint p1, wxPoint p2, FILL_T fill, int width ) +/** + * HPGL rectangle: fill not supported + */ +void HPGL_PLOTTER::Rect( const wxPoint& p1, const wxPoint& p2, FILL_T fill, int width ) { - wxASSERT( output_file ); - user_to_device_coordinates( p2 ); - move_to( p1 ); - fprintf( output_file, "EA %d,%d;\n", p2.x, p2.y ); - pen_finish(); + wxASSERT( outputFile ); + DPOINT p2dev = userToDeviceCoordinates( p2 ); + MoveTo( p1 ); + fprintf( outputFile, "EA %.0f,%.0f;\n", p2dev.x, p2dev.y ); + PenFinish(); } -void HPGL_PLOTTER::circle( wxPoint centre, - int diameter, - FILL_T fill, - int width ) +/** + * HPGL circle: fill not supported + */ +void HPGL_PLOTTER::Circle( const wxPoint& centre, int diameter, FILL_T fill, + int width ) { - wxASSERT( output_file ); - double rayon = user_to_device_size( diameter / 2 ); + wxASSERT( outputFile ); + double radius = userToDeviceSize( diameter / 2 ); - if( rayon > 0 ) + if( radius > 0 ) { - move_to( centre ); - fprintf( output_file, "CI %g;\n", rayon ); - pen_finish(); + MoveTo( centre ); + fprintf( outputFile, "CI %g;\n", radius ); + PenFinish(); } } -/* Plot a polygon (closed if completed) in HPGL - * aCornerList = a wxPoint list of corner - * aFill: if != 0 filled polygon +/** + * HPGL polygon: fill not supported (but closed, at least) */ -void HPGL_PLOTTER::PlotPoly( std::vector< wxPoint >& aCornerList, FILL_T aFill, int aWidth) +void HPGL_PLOTTER::PlotPoly( const std::vector< wxPoint >& aCornerList, + FILL_T aFill, int aWidth) { if( aCornerList.size() <= 1 ) return; - move_to( aCornerList[0] ); + MoveTo( aCornerList[0] ); for( unsigned ii = 1; ii < aCornerList.size(); ii++ ) - line_to( aCornerList[ii] ); + LineTo( aCornerList[ii] ); // Close polygon if filled. if( aFill ) { int ii = aCornerList.size() - 1; if( aCornerList[ii] != aCornerList[0] ) - line_to( aCornerList[0] ); + LineTo( aCornerList[0] ); } - pen_finish(); -} - -/* - * Function PlotImage - * Only Postscript plotters can plot bitmaps - * for plotters that cannot plot a bitmap, a rectangle is plotted - * For HPGL_PLOTTER, draws a rectangle - * param aImage = the bitmap - * param aPos = position of the center of the bitmap - * param aScaleFactor = the scale factor to apply to the bitmap size - * (this is not the plot scale factor) - */ -void HPGL_PLOTTER::PlotImage( wxImage & aImage, wxPoint aPos, double aScaleFactor ) -{ - wxSize size; - size.x = aImage.GetWidth(); - size.y = aImage.GetHeight(); - - size.x = KiROUND( size.x * aScaleFactor ); - size.y = KiROUND( size.y * aScaleFactor ); - - wxPoint start = aPos; - start.x -= size.x / 2; - start.y -= size.y / 2; - - wxPoint end = start; - end.x += size.x; - end.y += size.y; - - rect( start, end, NO_FILL ); - + PenFinish(); } -/* Set pen up ('U') or down ('D'). +/** + * Pen control logic (remove redundant pen activations) */ -void HPGL_PLOTTER::pen_control( int plume ) +void HPGL_PLOTTER::penControl( char plume ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); switch( plume ) { case 'U': - if( pen_state != 'U' ) + if( penState != 'U' ) { - fputs( "PU;", output_file ); - pen_state = 'U'; + fputs( "PU;", outputFile ); + penState = 'U'; } break; case 'D': - if( pen_state != 'D' ) + if( penState != 'D' ) { - fputs( "PD;", output_file ); - pen_state = 'D'; + fputs( "PD;", outputFile ); + penState = 'D'; } break; case 'Z': - fputs( "PU;", output_file ); - pen_state = 'U'; - pen_lastpos.x = -1; - pen_lastpos.y = -1; + fputs( "PU;", outputFile ); + penState = 'U'; + penLastpos.x = -1; + penLastpos.y = -1; break; } } -/* - * Move the pen to position with pen up or down. - * At position x, y - * Unit to unit DRAWING - * If pen = 'Z' without changing pen during move. - */ -void HPGL_PLOTTER::pen_to( wxPoint pos, char plume ) +void HPGL_PLOTTER::PenTo( const wxPoint& pos, char plume ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); if( plume == 'Z' ) { - pen_control( 'Z' ); + penControl( 'Z' ); return; } - pen_control( plume ); - user_to_device_coordinates( pos ); + penControl( plume ); + DPOINT pos_dev = userToDeviceCoordinates( pos ); - if( pen_lastpos != pos ) - fprintf( output_file, "PA %d,%d;\n", pos.x, pos.y ); + if( penLastpos != pos ) + fprintf( outputFile, "PA %.0f,%.0fd;\n", pos_dev.x, pos_dev.y ); - pen_lastpos = pos; + penLastpos = pos; } -void HPGL_PLOTTER::set_dash( bool dashed ) +/** + * HPGL supports dashed lines + */ +void HPGL_PLOTTER::SetDash( bool dashed ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); if( dashed ) fputs( "LI 2;\n", stderr ); else @@ -197,27 +180,21 @@ void HPGL_PLOTTER::set_dash( bool dashed ) } -/** - * Function Plot a filled segment (track) - * @param start = starting point - * @param end = ending point - * @param width = segment width (thickness) - * @param tracemode = FILLED, SKETCH .. - */ -void HPGL_PLOTTER::thick_segment( wxPoint start, wxPoint end, int width, EDA_DRAW_MODE_T tracemode ) +void HPGL_PLOTTER::ThickSegment( const wxPoint& start, const wxPoint& end, + int width, EDA_DRAW_MODE_T tracemode ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); wxPoint center; wxSize size; - if( (pen_diameter >= width) || (tracemode == LINE) ) /* just a line is - * Ok */ + // Suppress overlap if pen is too big or in line mode + if( (penDiameter >= width) || (tracemode == LINE) ) { - move_to( start ); - finish_to( end ); + MoveTo( start ); + FinishTo( end ); } else - segment_as_oval( start, end, width, tracemode ); + segmentAsOval( start, end, width, tracemode ); } @@ -229,48 +206,48 @@ void HPGL_PLOTTER::thick_segment( wxPoint start, wxPoint end, int width, EDA_DRA * PU PY x, y; PD start_arc_X AA, start_arc_Y, angle, NbSegm; PU; * Or PU PY x, y; PD start_arc_X AA, start_arc_Y, angle, PU; */ -void HPGL_PLOTTER::arc( wxPoint centre, int StAngle, int EndAngle, int rayon, +void HPGL_PLOTTER::Arc( const wxPoint& centre, int StAngle, int EndAngle, int radius, FILL_T fill, int width ) { - wxASSERT( output_file ); - wxPoint cmap; - wxPoint cpos; - float angle; + wxASSERT( outputFile ); + double angle; - if( rayon <= 0 ) + if( radius <= 0 ) return; - cpos = centre; - user_to_device_coordinates( cpos ); + DPOINT centre_dev = userToDeviceCoordinates( centre ); if( plotMirror ) angle = (StAngle - EndAngle) / 10.0; else angle = (EndAngle - StAngle) / 10.0; - // Calculate start point, - cmap.x = (int) ( centre.x + ( rayon * cos( StAngle * M_PI / 1800 ) ) ); - cmap.y = (int) ( centre.y - ( rayon * sin( StAngle * M_PI / 1800 ) ) ); - user_to_device_coordinates( cmap ); - fprintf( output_file, - "PU;PA %d,%d;PD;AA %d,%d, ", - cmap.x, - cmap.y, - cpos.x, - cpos.y ); - fprintf( output_file, "%f", angle ); - fprintf( output_file, ";PU;\n" ); - pen_finish(); + // Calculate start point, + wxPoint cmap; + cmap.x = (int) ( centre.x + ( radius * cos( RAD2DEG( StAngle / 10.0 ) ) ) ); + cmap.y = (int) ( centre.y - ( radius * sin( RAD2DEG( StAngle / 10.0 ) ) ) ); + DPOINT cmap_dev = userToDeviceCoordinates( cmap ); + + fprintf( outputFile, + "PU;PA %.0f,%.0f;PD;AA %.0f,%.0f,", + cmap_dev.x, + cmap_dev.y, + centre_dev.x, + centre_dev.y ); + fprintf( outputFile, "%.0f", angle ); + fprintf( outputFile, ";PU;\n" ); + PenFinish(); } /* Plot oval pad. */ -void HPGL_PLOTTER::flash_pad_oval( wxPoint pos, wxSize size, int orient, - EDA_DRAW_MODE_T trace_mode ) +void HPGL_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, int orient, + EDA_DRAW_MODE_T trace_mode ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); int deltaxy, cx, cy; + wxSize size( aSize ); /* The pad is reduced to an oval with size.y > size.x * (Oval vertical orientation 0) @@ -285,82 +262,68 @@ void HPGL_PLOTTER::flash_pad_oval( wxPoint pos, wxSize size, int orient, if( trace_mode == FILLED ) { - flash_pad_rect( pos, wxSize( size.x, deltaxy + KiROUND( pen_diameter ) ), - orient, trace_mode ); + FlashPadRect( pos, wxSize( size.x, deltaxy + KiROUND( penDiameter ) ), + orient, trace_mode ); cx = 0; cy = deltaxy / 2; RotatePoint( &cx, &cy, orient ); - flash_pad_circle( wxPoint( cx + pos.x, - cy + pos.y ), size.x, trace_mode ); + FlashPadCircle( wxPoint( cx + pos.x, cy + pos.y ), size.x, trace_mode ); cx = 0; cy = -deltaxy / 2; RotatePoint( &cx, &cy, orient ); - flash_pad_circle( wxPoint( cx + pos.x, - cy + pos.y ), size.x, trace_mode ); + FlashPadCircle( wxPoint( cx + pos.x, cy + pos.y ), size.x, trace_mode ); } else // Plot in SKETCH mode. { - sketch_oval( pos, size, orient, KiROUND( pen_diameter ) ); + sketchOval( pos, size, orient, KiROUND( penDiameter ) ); } } /* Plot round pad or via. */ -void HPGL_PLOTTER::flash_pad_circle( wxPoint pos, int diametre, - EDA_DRAW_MODE_T trace_mode ) +void HPGL_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre, + EDA_DRAW_MODE_T trace_mode ) { - wxASSERT( output_file ); - int rayon, delta; + wxASSERT( outputFile ); + DPOINT pos_dev = userToDeviceCoordinates( pos ); - user_to_device_coordinates( pos ); - - delta = KiROUND( pen_diameter - pen_overlap ); - rayon = diametre / 2; + int delta = KiROUND( penDiameter - penOverlap ); + int radius = diametre / 2; if( trace_mode != LINE ) { - rayon = ( diametre - KiROUND( pen_diameter ) ) / 2; + radius = ( diametre - KiROUND( penDiameter ) ) / 2; } - if( rayon < 0 ) + if( radius < 0 ) { - rayon = 0; + radius = 0; } - wxSize rsize( rayon, rayon ); - user_to_device_size( rsize ); + double rsize = userToDeviceSize( radius ); - fprintf( output_file, "PA %d,%d;CI %d;\n", pos.x, pos.y, rsize.x ); + fprintf( outputFile, "PA %.0f,%.0fd;CI %.0f;\n", + pos_dev.x, pos_dev.y, rsize ); if( trace_mode == FILLED ) // Plot in filled mode. { if( delta > 0 ) { - while( (rayon -= delta ) >= 0 ) + while( (radius -= delta ) >= 0 ) { - rsize.x = rsize.y = rayon; - user_to_device_size( rsize ); - fprintf( output_file, - "PA %d,%d; CI %d;\n", - pos.x, - pos.y, - rsize.x ); + rsize = userToDeviceSize( radius ); + fprintf( outputFile, "PA %.0f,%.0f;CI %.0f;\n", + pos_dev.x, pos_dev.y, rsize ); } } } - pen_finish(); - return; + PenFinish(); } -/* - * Plot rectangular pad vertical or horizontal. - * Gives its center and its dimensions X and Y - * Units are user units - */ -void HPGL_PLOTTER::flash_pad_rect( wxPoint pos, wxSize padsize, - int orient, EDA_DRAW_MODE_T trace_mode ) +void HPGL_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& padsize, + int orient, EDA_DRAW_MODE_T trace_mode ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); wxSize size; int delta; int ox, oy, fx, fy; @@ -370,8 +333,8 @@ void HPGL_PLOTTER::flash_pad_rect( wxPoint pos, wxSize padsize, if( trace_mode != LINE ) { - size.x = (padsize.x - (int) pen_diameter) / 2; - size.y = (padsize.y - (int) pen_diameter) / 2; + size.x = (padsize.x - (int) penDiameter) / 2; + size.y = (padsize.y - (int) penDiameter) / 2; } if( size.x < 0 ) @@ -388,8 +351,8 @@ void HPGL_PLOTTER::flash_pad_rect( wxPoint pos, wxSize padsize, fx = pos.x; fy = pos.y + size.y; RotatePoint( &fx, &fy, pos.x, pos.y, orient ); - move_to( wxPoint( ox, oy ) ); - finish_to( wxPoint( fx, fy ) ); + MoveTo( wxPoint( ox, oy ) ); + FinishTo( wxPoint( fx, fy ) ); return; } if( size.y == 0 ) @@ -400,37 +363,37 @@ void HPGL_PLOTTER::flash_pad_rect( wxPoint pos, wxSize padsize, fx = pos.x + size.x; fy = pos.y; RotatePoint( &fx, &fy, pos.x, pos.y, orient ); - move_to( wxPoint( ox, oy ) ); - finish_to( wxPoint( fx, fy ) ); + MoveTo( wxPoint( ox, oy ) ); + FinishTo( wxPoint( fx, fy ) ); return; } ox = pos.x - size.x; oy = pos.y - size.y; RotatePoint( &ox, &oy, pos.x, pos.y, orient ); - move_to( wxPoint( ox, oy ) ); + MoveTo( wxPoint( ox, oy ) ); fx = pos.x - size.x; fy = pos.y + size.y; RotatePoint( &fx, &fy, pos.x, pos.y, orient ); - line_to( wxPoint( fx, fy ) ); + LineTo( wxPoint( fx, fy ) ); fx = pos.x + size.x; fy = pos.y + size.y; RotatePoint( &fx, &fy, pos.x, pos.y, orient ); - line_to( wxPoint( fx, fy ) ); + LineTo( wxPoint( fx, fy ) ); fx = pos.x + size.x; fy = pos.y - size.y; RotatePoint( &fx, &fy, pos.x, pos.y, orient ); - line_to( wxPoint( fx, fy ) ); + LineTo( wxPoint( fx, fy ) ); - finish_to( wxPoint( ox, oy ) ); + FinishTo( wxPoint( ox, oy ) ); if( trace_mode == FILLED ) { // Plot in filled mode. - delta = (int) (pen_diameter - pen_overlap); + delta = (int) (penDiameter - penOverlap); if( delta > 0 ) while( (size.x > 0) && (size.y > 0) ) @@ -446,44 +409,39 @@ void HPGL_PLOTTER::flash_pad_rect( wxPoint pos, wxSize padsize, ox = pos.x - size.x; oy = pos.y - size.y; RotatePoint( &ox, &oy, pos.x, pos.y, orient ); - move_to( wxPoint( ox, oy ) ); + MoveTo( wxPoint( ox, oy ) ); fx = pos.x - size.x; fy = pos.y + size.y; RotatePoint( &fx, &fy, pos.x, pos.y, orient ); - line_to( wxPoint( fx, fy ) ); + LineTo( wxPoint( fx, fy ) ); fx = pos.x + size.x; fy = pos.y + size.y; RotatePoint( &fx, &fy, pos.x, pos.y, orient ); - line_to( wxPoint( fx, fy ) ); + LineTo( wxPoint( fx, fy ) ); fx = pos.x + size.x; fy = pos.y - size.y; RotatePoint( &fx, &fy, pos.x, pos.y, orient ); - line_to( wxPoint( fx, fy ) ); + LineTo( wxPoint( fx, fy ) ); - finish_to( wxPoint( ox, oy ) ); + FinishTo( wxPoint( ox, oy ) ); } } } -/* Plot trapezoidal pad. - * aPadPos is pad position, aCorners the corners position of the basic shape - * Orientation aPadOrient in 0.1 degrees - * Plot mode FILLED or SKETCH - */ -void HPGL_PLOTTER::flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], - int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ) +void HPGL_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, + int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ) { - wxASSERT( output_file ); + wxASSERT( outputFile ); wxPoint polygone[4]; // coordinates of corners relatives to the pad wxPoint coord[4]; // absolute coordinates of corners (coordinates in plotter space) int move; - move = KiROUND( pen_diameter ); + move = KiROUND( penDiameter ); for( int ii = 0; ii < 4; ii++ ) polygone[ii] = aCorners[ii]; @@ -500,11 +458,11 @@ void HPGL_PLOTTER::flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], RotatePoint( &coord[ii], aPadOrient ); coord[ii] += aPadPos; } - move_to( coord[0] ); - line_to( coord[1] ); - line_to( coord[2] ); - line_to( coord[3] ); - finish_to( coord[0] ); + MoveTo( coord[0] ); + LineTo( coord[1] ); + LineTo( coord[2] ); + LineTo( coord[3] ); + FinishTo( coord[0] ); // Fill shape: if( aTrace_Mode == FILLED ) @@ -512,20 +470,20 @@ void HPGL_PLOTTER::flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], // TODO: replace this par the HPGL plot polygon. int jj; // Fill the shape - move = KiROUND( pen_diameter - pen_overlap ); + move = KiROUND( penDiameter - penOverlap ); // Calculate fill height. if( polygone[0].y == polygone[3].y ) // Horizontal { - jj = polygone[3].y - (int) ( pen_diameter + ( 2 * pen_overlap ) ); + jj = polygone[3].y - (int) ( penDiameter + ( 2 * penOverlap ) ); } else // vertical { - jj = polygone[3].x - (int) ( pen_diameter + ( 2 * pen_overlap ) ); + jj = polygone[3].x - (int) ( penDiameter + ( 2 * penOverlap ) ); } // Calculation of dd = number of segments was traced to fill. - jj = jj / (int) ( pen_diameter - pen_overlap ); + jj = jj / (int) ( penDiameter - penOverlap ); // Trace the outline. for( ; jj > 0; jj-- ) @@ -568,11 +526,12 @@ void HPGL_PLOTTER::flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], coord[ii] += aPadPos; } - move_to( coord[0] ); - line_to( coord[1] ); - line_to( coord[2] ); - line_to( coord[3] ); - finish_to( coord[0] ); + MoveTo( coord[0] ); + LineTo( coord[1] ); + LineTo( coord[2] ); + LineTo( coord[3] ); + FinishTo( coord[0] ); } } } + diff --git a/common/common_plotPS_functions.cpp b/common/common_plotPS_functions.cpp index d0251881f8..4235706383 100644 --- a/common/common_plotPS_functions.cpp +++ b/common/common_plotPS_functions.cpp @@ -12,78 +12,37 @@ #include #include +/* Forward declaration of the font width metrics + (yes extern! this is the way to forward declare variables */ +extern const double hv_widths[256]; +extern const double hvb_widths[256]; +extern const double hvo_widths[256]; +extern const double hvbo_widths[256]; -/* Set the plot offset for the current plotting */ -void PS_PLOTTER::set_viewport( wxPoint aOffset, double aScale, bool aMirror ) +// Common routines for Postscript-like plotting engines + +void PSLIKE_PLOTTER::SetDefaultLineWidth( int width ) { - wxASSERT( !output_file ); - plotMirror = aMirror; - plot_offset = aOffset; - plot_scale = aScale; - device_scale = 1; /* PS references in decimals */ - set_default_line_width( 100 ); /* default line width in 1/1000 inch */ + defaultPenWidth = width; + currentPenWidth = -1; } -/* Set the default line width (in 1/1000 inch) for the current plotting - */ -void PS_PLOTTER::set_default_line_width( int width ) +void PSLIKE_PLOTTER::SetColor( EDA_COLOR_T color ) { - default_pen_width = width; // line width in 1/1000 inch - current_pen_width = -1; -} - - -/* Set the current line width (in 1/1000 inch) for the next plot - */ -void PS_PLOTTER::set_current_line_width( int width ) -{ - wxASSERT( output_file ); - int pen_width; - - if( width >= 0 ) - pen_width = width; - else - pen_width = default_pen_width; - - if( pen_width != current_pen_width ) - fprintf( output_file, "%g setlinewidth\n", - user_to_device_size( pen_width ) ); - - current_pen_width = pen_width; -} - - -/* Print the postscript set color command: - * r g b setrgbcolor, - * r, g, b = color values (= 0 .. 1.0 ) - * - * color = color index in ColorRefs[] - */ -void PS_PLOTTER::set_color( int color ) -{ - wxASSERT( output_file ); - - /* Return at invalid color index */ + // Return at invalid color index if( color < 0 ) return; - if( color_mode ) + if( colorMode ) { - if( negative_mode ) - { - fprintf( output_file, "%.3g %.3g %.3g setrgbcolor\n", - (double) 1.0 - ColorRefs[color].m_Red / 255, - (double) 1.0 - ColorRefs[color].m_Green / 255, - (double) 1.0 - ColorRefs[color].m_Blue / 255 ); - } + double r = ColorRefs[color].m_Red / 255.0; + double g = ColorRefs[color].m_Green / 255.0; + double b = ColorRefs[color].m_Blue / 255.0; + if( negativeMode ) + emitSetRGBColor( 1 - r, 1 - g, 1 - b ); else - { - fprintf( output_file, "%.3g %.3g %.3g setrgbcolor\n", - (double) ColorRefs[color].m_Red / 255, - (double) ColorRefs[color].m_Green / 255, - (double) ColorRefs[color].m_Blue / 255 ); - } + emitSetRGBColor( r, g, b ); } else { @@ -91,390 +50,23 @@ void PS_PLOTTER::set_color( int color ) * note the 2 colors are used in B&W mode, mainly by Pcbnew to draw * holes in white on pads in black */ - int bwcolor = WHITE; + double k = 1; // White if( color != WHITE ) - bwcolor = BLACK; - if( negative_mode ) - fprintf( output_file, "%.3g %.3g %.3g setrgbcolor\n", - (double) 1.0 - ColorRefs[bwcolor].m_Red / 255, - (double) 1.0 - ColorRefs[bwcolor].m_Green / 255, - (double) 1.0 - ColorRefs[bwcolor].m_Blue / 255 ); + k = 0; + if( negativeMode ) + emitSetRGBColor( 1 - k, 1 - k, 1 - k ); else - fprintf( output_file, "%.3g %.3g %.3g setrgbcolor\n", - (double) ColorRefs[bwcolor].m_Red / 255, - (double) ColorRefs[bwcolor].m_Green / 255, - (double) ColorRefs[bwcolor].m_Blue / 255 ); + emitSetRGBColor( k, k, k ); } } -void PS_PLOTTER::set_dash( bool dashed ) +void PSLIKE_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, int orient, + EDA_DRAW_MODE_T modetrace ) { - wxASSERT( output_file ); - if( dashed ) - fputs( "dashedline\n", stderr ); - else - fputs( "solidline\n", stderr ); -} - - -void PS_PLOTTER::rect( wxPoint p1, wxPoint p2, FILL_T fill, int width ) -{ - user_to_device_coordinates( p1 ); - user_to_device_coordinates( p2 ); - - set_current_line_width( width ); - fprintf( output_file, "%d %d %d %d rect%d\n", p1.x, p1.y, - p2.x - p1.x, p2.y - p1.y, fill ); -} - - -void PS_PLOTTER::circle( wxPoint pos, int diametre, FILL_T fill, int width ) -{ - wxASSERT( output_file ); - user_to_device_coordinates( pos ); - double radius = user_to_device_size( diametre / 2.0 ); - - if( radius < 1 ) - radius = 1; - - set_current_line_width( width ); - fprintf( output_file, "%d %d %g cir%d\n", pos.x, pos.y, radius, fill ); -} - - -/* Plot an arc: - * StAngle, EndAngle = start and end arc in 0.1 degree - */ -void PS_PLOTTER::arc( wxPoint centre, int StAngle, int EndAngle, int radius, - FILL_T fill, int width ) -{ - wxASSERT( output_file ); - if( radius <= 0 ) - return; - - if( StAngle > EndAngle ) - EXCHG( StAngle, EndAngle ); - - set_current_line_width( width ); - - // Calculate start point. - user_to_device_coordinates( centre ); - radius = KiROUND( user_to_device_size( radius ) ); - if( plotMirror ) - fprintf( output_file, "%d %d %d %g %g arc%d\n", centre.x, centre.y, - radius, (double) -EndAngle / 10, (double) -StAngle / 10, - fill ); - else - fprintf( output_file, "%d %d %d %g %g arc%d\n", centre.x, centre.y, - radius, (double) StAngle / 10, (double) EndAngle / 10, - fill ); -} - - -/* - * Function PlotPoly - * Draw a polygon (filled or not) in POSTSCRIPT format - * param aCornerList = corners list - * param aFill :if true : filled polygon - * param aWidth = line width - */ -void PS_PLOTTER::PlotPoly( std::vector< wxPoint >& aCornerList, FILL_T aFill, int aWidth ) -{ - if( aCornerList.size() <= 1 ) - return; - - set_current_line_width( aWidth ); - - wxPoint pos = aCornerList[0]; - user_to_device_coordinates( pos ); - fprintf( output_file, "newpath\n%d %d moveto\n", pos.x, pos.y ); - - for( unsigned ii = 1; ii < aCornerList.size(); ii++ ) - { - pos = aCornerList[ii]; - user_to_device_coordinates( pos ); - fprintf( output_file, "%d %d lineto\n", pos.x, pos.y ); - } - - // Close path - fprintf( output_file, "poly%d\n", aFill ); -} - -/* - * Function PlotImage - * Only some plotters can plot image bitmaps - * for plotters that cannot plot a bitmap, a rectangle is plotted - * param aImage = the bitmap - * param aPos = position of the center of the bitmap - * param aScaleFactor = the scale factor to apply to the bitmap size - * (this is not the plot scale factor) - */ -void PS_PLOTTER::PlotImage( wxImage & aImage, wxPoint aPos, double aScaleFactor ) -{ - wxSize pix_size; // size of the bitmap in pixels - pix_size.x = aImage.GetWidth(); - pix_size.y = aImage.GetHeight(); - wxSize drawsize; // requested size of image - drawsize.x = KiROUND( aScaleFactor * pix_size.x ); - drawsize.y = KiROUND( aScaleFactor * pix_size.y ); - - // calculate the bottom left corner position of bitmap - wxPoint start = aPos; - start.x -= drawsize.x / 2; // left - start.y += drawsize.y / 2; // bottom (Y axis reversed) - - // calculate the top right corner position of bitmap - wxPoint end; - end.x = start.x + drawsize.x; - end.y = start.y - drawsize.y; - - fprintf( output_file, "/origstate save def\n" ); - fprintf( output_file, "/pix %d string def\n", pix_size.x ); - fprintf( output_file, "/greys %d string def\n", pix_size.x ); - - // Locate lower-left corner of image - user_to_device_coordinates( start ); - fprintf( output_file, "%d %d translate\n", start.x, start.y ); - // Map image size to device - user_to_device_coordinates( end ); - fprintf( output_file, "%d %d scale\n", - ABS(end.x - start.x), ABS(end.y - start.y)); - - // Dimensions of source image (in pixels - fprintf( output_file, "%d %d 8", pix_size.x, pix_size.y ); - // Map unit square to source - fprintf( output_file, " [%d 0 0 %d 0 %d]\n", pix_size.x, -pix_size.y , pix_size.y); - // include image data in ps file - fprintf( output_file, "{currentfile pix readhexstring pop}\n" ); - fprintf( output_file, "false 3 colorimage\n"); - // Single data source, 3 colors, Output RGB data (hexadecimal) - int jj = 0; - for( int yy = 0; yy < pix_size.y; yy ++ ) - { - for( int xx = 0; xx < pix_size.x; xx++, jj++ ) - { - if( jj >= 16 ) - { - jj = 0; - fprintf( output_file, "\n"); - } - int red, green, blue; - red = aImage.GetRed( xx, yy) & 0xFF; - green = aImage.GetGreen( xx, yy) & 0xFF; - blue = aImage.GetBlue( xx, yy) & 0xFF; - fprintf( output_file, "%2.2X%2.2X%2.2X", red, green, blue); - } - } - fprintf( output_file, "\n"); - fprintf( output_file, "origstate restore\n" ); -} - - - -/* Routine to draw to a new position - */ -void PS_PLOTTER::pen_to( wxPoint pos, char plume ) -{ - wxASSERT( output_file ); - if( plume == 'Z' ) - { - if( pen_state != 'Z' ) - { - fputs( "stroke\n", output_file ); - pen_state = 'Z'; - pen_lastpos.x = -1; - pen_lastpos.y = -1; - } - return; - } - - user_to_device_coordinates( pos ); - if( pen_state == 'Z' ) - { - fputs( "newpath\n", output_file ); - } - if( pen_state != plume || pos != pen_lastpos ) - fprintf( output_file, - "%d %d %sto\n", - pos.x, - pos.y, - ( plume=='D' ) ? "line" : "move" ); - pen_state = plume; - pen_lastpos = pos; -} - - -/* The code within this function (and the CloseFilePS function) - * creates postscript files whose contents comply with Adobe's - * Document Structuring Convention, as documented by assorted - * details described within the following URLs: - * - * http://en.wikipedia.org/wiki/Document_Structuring_Conventions - * http://partners.adobe.com/public/developer/en/ps/5001.DSC_Spec.pdf - * - * - * BBox is the boundary box (position and size of the "client rectangle" - * for drawings (page - margins) in mils (0.001 inch) - */ -bool PS_PLOTTER::start_plot( FILE* fout ) -{ - wxASSERT( !output_file ); - wxString msg; - - output_file = fout; - static const char* PSMacro[] = - { - "/line {\n", - " newpath\n", - " moveto\n", - " lineto\n", - " stroke\n", - "} bind def\n", - "/cir0 { newpath 0 360 arc stroke } bind def\n", - "/cir1 { newpath 0 360 arc gsave fill grestore stroke } bind def\n", - "/cir2 { newpath 0 360 arc gsave fill grestore stroke } bind def\n", - "/arc0 { newpath arc stroke } bind def\n", - "/arc1 { newpath 4 index 4 index moveto arc closepath gsave fill ", - "grestore stroke } bind def\n", - "/arc2 { newpath 4 index 4 index moveto arc closepath gsave fill ", - "grestore stroke } bind def\n", - "/poly0 { stroke } bind def\n", - "/poly1 { closepath gsave fill grestore stroke } bind def\n", - "/poly2 { closepath gsave fill grestore stroke } bind def\n", - "/rect0 { rectstroke } bind def\n", - "/rect1 { rectfill } bind def\n", - "/rect2 { rectfill } bind def\n", - "/linemode0 { 0 setlinecap 0 setlinejoin 0 setlinewidth } bind def\n", - "/linemode1 { 1 setlinecap 1 setlinejoin } bind def\n", - "/dashedline { [50 50] 0 setdash } bind def\n", - "/solidline { [] 0 setdash } bind def\n", - "gsave\n", - "0.0072 0.0072 scale\n", // Configure postscript for decimals. - "linemode1\n", - NULL - }; - - const double DECIMIL_TO_INCH = 0.0001; - time_t time1970 = time( NULL ); - - fputs( "%!PS-Adobe-3.0\n", output_file ); // Print header - - fprintf( output_file, "%%%%Creator: %s\n", TO_UTF8( creator ) ); - - // A "newline" character ("\n") is not included in the following string, - // because it is provided by the ctime() function. - fprintf( output_file, "%%%%CreationDate: %s", ctime( &time1970 ) ); - fprintf( output_file, "%%%%Title: %s\n", TO_UTF8( filename ) ); - fprintf( output_file, "%%%%Pages: 1\n" ); - fprintf( output_file, "%%%%PageOrder: Ascend\n" ); - - // Print boundary box in 1/72 pixels per inch, box is in deci-mils - const double CONV_SCALE = DECIMIL_TO_INCH * 72; - - // The coordinates of the lower left corner of the boundary - // box need to be "rounded down", but the coordinates of its - // upper right corner need to be "rounded up" instead. - wxSize psPaperSize = paper_size; - - if( !pageInfo.IsPortrait() ) - psPaperSize.Set( paper_size.y, paper_size.x ); - - fprintf( output_file, "%%%%BoundingBox: 0 0 %d %d\n", - (int) ceil( psPaperSize.x * CONV_SCALE ), - (int) ceil( psPaperSize.y * CONV_SCALE ) ); - - // Specify the size of the sheet and the name associated with that size. - // (If the "User size" option has been selected for the sheet size, - // identify the sheet size as "Custom" (rather than as "User"), but - // otherwise use the name assigned by KiCad for each sheet size.) - // - // (The Document Structuring Convention also supports sheet weight, - // sheet color, and sheet type properties being specified within a - // %%DocumentMedia comment, but they are not being specified here; - // a zero and two null strings are subsequently provided instead.) - // - // (NOTE: m_Size.y is *supposed* to be listed before m_Size.x; - // the order in which they are specified is not wrong!) - // Also note pageSize is given in mils, not in internal units and must be - // converted to internal units. - wxSize psPageSize = pageInfo.GetSizeMils(); - - if( !pageInfo.IsPortrait() ) - psPageSize.Set( pageInfo.GetHeightMils(), pageInfo.GetWidthMils() ); - - if( pageInfo.IsCustom() ) - fprintf( output_file, "%%%%DocumentMedia: Custom %d %d 0 () ()\n", - KiROUND( psPageSize.x * 10 * CONV_SCALE ), - KiROUND( psPageSize.y * 10 * CONV_SCALE ) ); - - else // a standard paper size - fprintf( output_file, "%%%%DocumentMedia: %s %d %d 0 () ()\n", - TO_UTF8( pageInfo.GetType() ), - KiROUND( psPageSize.x * 10 * CONV_SCALE ), - KiROUND( psPageSize.y * 10 * CONV_SCALE ) ); - - if( pageInfo.IsPortrait() ) - fprintf( output_file, "%%%%Orientation: Portrait\n" ); - else - fprintf( output_file, "%%%%Orientation: Landscape\n" ); - - fprintf( output_file, "%%%%EndComments\n" ); - - // Now specify various other details. - - // The following string has been specified here (rather than within - // PSMacro[]) to highlight that it has been provided to ensure that the - // contents of the postscript file comply with the details specified - // within the Document Structuring Convention. - fprintf( output_file, "%%%%Page: 1 1\n" ); - - for( int ii = 0; PSMacro[ii] != NULL; ii++ ) - { - fputs( PSMacro[ii], output_file ); - } - - // (If support for creating postscript files with a portrait orientation - // is ever provided, determine whether it would be necessary to provide - // an "else" command and then an appropriate "sprintf" command here.) - if( !pageInfo.IsPortrait() ) - fprintf( output_file, "%d 0 translate 90 rotate\n", paper_size.y ); - - // Apply the scale adjustments - if( plot_scale_adjX != 1.0 || plot_scale_adjY != 1.0 ) - fprintf( output_file, "%g %g scale\n", - plot_scale_adjX, plot_scale_adjY ); - - // Set default line width ( g_Plot_DefaultPenWidth is in user units ) - fprintf( output_file, "%g setlinewidth\n", - user_to_device_size( default_pen_width ) ); - - return true; -} - - -bool PS_PLOTTER::end_plot() -{ - wxASSERT( output_file ); - fputs( "showpage\ngrestore\n%%EOF\n", output_file ); - fclose( output_file ); - output_file = NULL; - - return true; -} - - -/* Plot oval pad: - * pos - Position of pad. - * Dimensions dx, dy, - * Orient Orient - * The shape is drawn as a segment - */ -void PS_PLOTTER::flash_pad_oval( wxPoint pos, wxSize size, int orient, - EDA_DRAW_MODE_T modetrace ) -{ - wxASSERT( output_file ); + wxASSERT( outputFile ); int x0, y0, x1, y1, delta; + wxSize size( aSize ); // The pad is reduced to an oval by dy > dx if( size.x > size.y ) @@ -494,45 +86,42 @@ void PS_PLOTTER::flash_pad_oval( wxPoint pos, wxSize size, int orient, RotatePoint( &x1, &y1, orient ); if( modetrace == FILLED ) - thick_segment( wxPoint( pos.x + x0, pos.y + y0 ), - wxPoint( pos.x + x1, pos.y + y1 ), size.x, modetrace ); + ThickSegment( wxPoint( pos.x + x0, pos.y + y0 ), + wxPoint( pos.x + x1, pos.y + y1 ), size.x, modetrace ); else - sketch_oval( pos, size, orient, -1 ); + sketchOval( pos, size, orient, -1 ); } -/* Plot round pad or via. - */ -void PS_PLOTTER::flash_pad_circle( wxPoint pos, int diametre, - EDA_DRAW_MODE_T modetrace ) +void PSLIKE_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre, + EDA_DRAW_MODE_T modetrace ) { int current_line_width; - wxASSERT( output_file ); + wxASSERT( outputFile ); - set_current_line_width( -1 ); - current_line_width = get_current_line_width(); + SetCurrentLineWidth( -1 ); + current_line_width = GetCurrentLineWidth(); if( current_line_width > diametre ) current_line_width = diametre; if( modetrace == FILLED ) - circle( pos, diametre - current_pen_width, FILLED_SHAPE, current_line_width ); + Circle( pos, diametre - currentPenWidth, FILLED_SHAPE, current_line_width ); else - circle( pos, diametre - current_pen_width, NO_FILL, current_line_width ); + Circle( pos, diametre - currentPenWidth, NO_FILL, current_line_width ); - set_current_line_width( -1 ); + SetCurrentLineWidth( -1 ); } -/* Plot rectangular pad in any orientation. - */ -void PS_PLOTTER::flash_pad_rect( wxPoint pos, wxSize size, - int orient, EDA_DRAW_MODE_T trace_mode ) +void PSLIKE_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& aSize, + int orient, EDA_DRAW_MODE_T trace_mode ) { static std::vector< wxPoint > cornerList; + wxSize size( aSize ); cornerList.clear(); - set_current_line_width( -1 ); - int w = current_pen_width; + SetCurrentLineWidth( -1 ); + int w = currentPenWidth; size.x -= w; if( size.x < 1 ) size.x = 1; @@ -568,13 +157,8 @@ void PS_PLOTTER::flash_pad_rect( wxPoint pos, wxSize size, } -/* Plot trapezoidal pad. - * aPadPos is pad position, aCorners the corners position of the basic shape - * Orientation aPadOrient in 0.1 degrees - * Plot mode FILLED or SKETCH - */ -void PS_PLOTTER::flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], - int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ) +void PSLIKE_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, + int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ) { static std::vector< wxPoint > cornerList; cornerList.clear(); @@ -584,12 +168,12 @@ void PS_PLOTTER::flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], if( aTrace_Mode == FILLED ) { - set_current_line_width( 0 ); + SetCurrentLineWidth( 0 ); } else { - set_current_line_width( -1 ); - int w = current_pen_width; + SetCurrentLineWidth( -1 ); + int w = currentPenWidth; // offset polygon by w // coord[0] is assumed the lower left // coord[1] is assumed the upper left @@ -618,20 +202,832 @@ void PS_PLOTTER::flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], } -void PS_PLOTTER::user_to_device_coordinates( wxPoint& pos ) +/** + * Write on a stream a string escaped for postscript/PDF + */ +void PSLIKE_PLOTTER::fputsPostscriptString(FILE *fout, const wxString& txt) { - if( pageInfo.IsPortrait() ) + putc( '(', fout ); + for( unsigned i = 0; i < txt.length(); i++ ) { - pos.y = (int) ( ( paper_size.y - ( pos.y - plot_offset.y ) - * plot_scale ) * device_scale ); + // Lazyness made me use stdio buffering yet another time... + wchar_t ch = txt[i]; + if( ch < 256 ) + { + switch (ch) + { + // The ~ shouldn't reach the outside + case '~': + break; + // These characters must be escaped + case '(': + case ')': + case '\\': + putc( '\\', fout ); - if( plotMirror ) - pos.x = (int) ( ( paper_size.x - ( pos.x - plot_offset.x ) - * plot_scale ) * device_scale ); - else - pos.x = (int) ( (pos.x - plot_offset.x) * plot_scale * device_scale ); + // FALLTHRU + default: + putc( ch, fout ); + break; + } + } } - else - PLOTTER::user_to_device_coordinates( pos ); + putc( ')', fout ); } + +/** + * Sister function for the ReturnGraphicTextWidth in drawtxt.cpp + * Does the same processing (i.e. calculates a text string width) but + * using postscript metrics for the Helvetica font (optionally used for + * PS and PDF plotting + */ +int PSLIKE_PLOTTER::returnPostscriptTextWidth( const wxString& aText, int aXSize, + bool aItalic, bool aBold ) +{ + const double *width_table = aBold ? ( aItalic ? hvbo_widths : hvb_widths ) + : ( aItalic ? hvo_widths : hv_widths ); + double tally = 0; + + for( unsigned i = 0; i < aText.length(); i++ ) + { + wchar_t AsciiCode = aText[i]; + // Skip the negation marks and untabled points + if( AsciiCode != '~' && AsciiCode < 256 ) + { + tally += width_table[AsciiCode]; + } + } + + // Widths are proportional to height, but height is enlarged by a + // scaling factor + return KiROUND( aXSize * tally / postscriptTextAscent ); +} + + +/** + * Computes the x coordinates for the overlining in a string of text. + * Fills the passed vector with couples of (start, stop) values to be + * used in the text coordinate system (use computeTextParameters to + * obtain the parameters to estabilish such a system) + */ +void PSLIKE_PLOTTER::postscriptOverlinePositions( const wxString& aText, int aXSize, + bool aItalic, bool aBold, + std::vector *pos_pairs ) +{ + /* XXX This function is *too* similar to returnPostscriptTextWidth. + Consider merging them... */ + const double *width_table = aBold ? ( aItalic ? hvbo_widths : hvb_widths ) + : ( aItalic ? hvo_widths : hv_widths ); + double tally = 0; + + for( unsigned i = 0; i < aText.length(); i++ ) + { + wchar_t AsciiCode = aText[i]; + // Skip the negation marks and untabled points + if( AsciiCode != '~' && AsciiCode < 256 ) + { + tally += width_table[AsciiCode]; + } + else + { + if( AsciiCode == '~' ) + pos_pairs->push_back( KiROUND( aXSize * tally / postscriptTextAscent ) ); + } + } + + // Special rule: we have to complete the last bar if the ~ aren't matched + if( pos_pairs->size() % 2 == 1 ) + pos_pairs->push_back( KiROUND( aXSize * tally / postscriptTextAscent ) ); +} + +void PS_PLOTTER::SetViewport( const wxPoint& aOffset, double aIusPerDecimil, + double aScale, bool aMirror ) +{ + wxASSERT( !outputFile ); + plotMirror = aMirror; + plotOffset = aOffset; + plotScale = aScale; + iuPerDeviceUnit = 1.0 / aIusPerDecimil; + /* Compute the paper size in IUs */ + paperSize = pageInfo.GetSizeMils(); + paperSize.x *= 10.0 * aIusPerDecimil; + paperSize.y *= 10.0 * aIusPerDecimil; + SetDefaultLineWidth( 100 * aIusPerDecimil ); // arbitrary default +} + + +/** This is the core for postscript/PDF text alignment + * It computes the transformation matrix to generate a user space + * system aligned with the text. Even the PS uses the concat + * operator to simplify PDF generation (concat is everything PDF + * has to modify the CTM. Lots of parameters, both in and out. + */ +void PSLIKE_PLOTTER::computeTextParameters( const wxPoint& aPos, + const wxString& aText, + int aOrient, + const wxSize& aSize, + enum EDA_TEXT_HJUSTIFY_T aH_justify, + enum EDA_TEXT_VJUSTIFY_T aV_justify, + int aWidth, + bool aItalic, + bool aBold, + double *wideningFactor, + double *ctm_a, + double *ctm_b, + double *ctm_c, + double *ctm_d, + double *ctm_e, + double *ctm_f, + double *heightFactor ) +{ + // These are for the rotation matrix + double alpha = DEG2RAD( aOrient / 10.0 ); + double sinalpha = sin( alpha ); + double cosalpha = cos( alpha ); + + // Compute the starting position (compensated for alignment) + wxPoint start_pos = aPos; + + // This is an approximation of the text bounds (in IUs) + int tw = returnPostscriptTextWidth( aText, aSize.x, aItalic, aWidth ); + int th = aSize.y; + int dx, dy; + + switch( aH_justify ) + { + case GR_TEXT_HJUSTIFY_CENTER: + dx = -tw / 2; + break; + + case GR_TEXT_HJUSTIFY_RIGHT: + dx = -tw; + break; + + case GR_TEXT_HJUSTIFY_LEFT: + dx = 0; + break; + } + + switch( aV_justify ) + { + case GR_TEXT_VJUSTIFY_CENTER: + dy = th / 2; + break; + + case GR_TEXT_VJUSTIFY_TOP: + dy = th; + break; + + case GR_TEXT_VJUSTIFY_BOTTOM: + dy = 0; + break; + } + + RotatePoint( &dx, &dy, aOrient ); + RotatePoint( &tw, &th, aOrient ); + start_pos.x += dx; + start_pos.y += dy; + DPOINT pos_dev = userToDeviceCoordinates( start_pos ); + DPOINT sz_dev = userToDeviceSize( aSize ); + + // Now returns the final values... the widening factor + *wideningFactor = sz_dev.y / sz_dev.x; + + // The CTM transformation matrix + *ctm_a = cosalpha; + *ctm_b = sinalpha; + *ctm_c = -sinalpha; + *ctm_d = cosalpha; + *ctm_e = pos_dev.x; + *ctm_f = pos_dev.y; + + // This is because the letters are less than 1 unit high + *heightFactor = sz_dev.y / postscriptTextAscent; +} + + +/* Set the current line width (in IUs) for the next plot + */ +void PS_PLOTTER::SetCurrentLineWidth( int width ) +{ + wxASSERT( outputFile ); + int pen_width; + + if( width >= 0 ) + pen_width = width; + else + pen_width = defaultPenWidth; + + if( pen_width != currentPenWidth ) + fprintf( outputFile, "%g setlinewidth\n", + userToDeviceSize( pen_width ) ); + + currentPenWidth = pen_width; +} + + +void PS_PLOTTER::emitSetRGBColor( double r, double g, double b ) +{ + wxASSERT( outputFile ); + + // XXX why %.3g ? shouldn't %g suffice? who cares... + fprintf( outputFile, "%.3g %.3g %.3g setrgbcolor\n", r, g, b ); +} + + +/** + * Postscript supports dashed lines + */ +void PS_PLOTTER::SetDash( bool dashed ) +{ + wxASSERT( outputFile ); + if( dashed ) + fputs( "dashedline\n", outputFile ); + else + fputs( "solidline\n", outputFile ); +} + + +void PS_PLOTTER::Rect( const wxPoint& p1, const wxPoint& p2, FILL_T fill, int width ) +{ + DPOINT p1_dev = userToDeviceCoordinates( p1 ); + DPOINT p2_dev = userToDeviceCoordinates( p2 ); + + SetCurrentLineWidth( width ); + fprintf( outputFile, "%g %g %g %g rect%d\n", p1_dev.x, p1_dev.y, + p2_dev.x - p1_dev.x, p2_dev.y - p1_dev.y, fill ); +} + + +void PS_PLOTTER::Circle( const wxPoint& pos, int diametre, FILL_T fill, int width ) +{ + wxASSERT( outputFile ); + DPOINT pos_dev = userToDeviceCoordinates( pos ); + double radius = userToDeviceSize( diametre / 2.0 ); + + SetCurrentLineWidth( width ); + fprintf( outputFile, "%g %g %g cir%d\n", pos_dev.x, pos_dev.y, radius, fill ); +} + + +void PS_PLOTTER::Arc( const wxPoint& centre, int StAngle, int EndAngle, int radius, + FILL_T fill, int width ) +{ + wxASSERT( outputFile ); + if( radius <= 0 ) + return; + + if( StAngle > EndAngle ) + EXCHG( StAngle, EndAngle ); + + SetCurrentLineWidth( width ); + + // Calculate start point. + DPOINT centre_dev = userToDeviceCoordinates( centre ); + double radius_dev = userToDeviceSize( radius ); + if( plotMirror ) + fprintf( outputFile, "%g %g %g %g %g arc%d\n", centre_dev.x, centre_dev.y, + radius_dev, -EndAngle / 10.0, -StAngle / 10.0, + fill ); + else + fprintf( outputFile, "%g %g %g %g %g arc%d\n", centre_dev.x, centre_dev.y, + radius_dev, StAngle / 10.0, EndAngle / 10.0, + fill ); +} + + +void PS_PLOTTER::PlotPoly( const std::vector< wxPoint >& aCornerList, + FILL_T aFill, int aWidth ) +{ + if( aCornerList.size() <= 1 ) + return; + + SetCurrentLineWidth( aWidth ); + + DPOINT pos = userToDeviceCoordinates( aCornerList[0] ); + fprintf( outputFile, "newpath\n%g %g moveto\n", pos.x, pos.y ); + + for( unsigned ii = 1; ii < aCornerList.size(); ii++ ) + { + pos = userToDeviceCoordinates( aCornerList[ii] ); + fprintf( outputFile, "%g %g lineto\n", pos.x, pos.y ); + } + + // Close/(fill) the path + fprintf( outputFile, "poly%d\n", aFill ); +} + + +/** + * Postscript-likes at the moment are the only plot engines supporting bitmaps... + */ +void PS_PLOTTER::PlotImage( const wxImage & aImage, const wxPoint& aPos, + double aScaleFactor ) +{ + wxSize pix_size; // size of the bitmap in pixels + pix_size.x = aImage.GetWidth(); + pix_size.y = aImage.GetHeight(); + DPOINT drawsize( aScaleFactor * pix_size.x, + aScaleFactor * pix_size.y ); // requested size of image + + // calculate the bottom left corner position of bitmap + wxPoint start = aPos; + start.x -= drawsize.x / 2; // left + start.y += drawsize.y / 2; // bottom (Y axis reversed) + + // calculate the top right corner position of bitmap + wxPoint end; + end.x = start.x + drawsize.x; + end.y = start.y - drawsize.y; + + fprintf( outputFile, "/origstate save def\n" ); + fprintf( outputFile, "/pix %d string def\n", pix_size.x ); + + // Locate lower-left corner of image + DPOINT start_dev = userToDeviceCoordinates( start ); + fprintf( outputFile, "%g %g translate\n", start_dev.x, start_dev.y ); + // Map image size to device + DPOINT end_dev = userToDeviceCoordinates( end ); + fprintf( outputFile, "%g %g scale\n", + ABS(end_dev.x - start_dev.x), ABS(end_dev.y - start_dev.y)); + + // Dimensions of source image (in pixels + fprintf( outputFile, "%d %d 8", pix_size.x, pix_size.y ); + // Map unit square to source + fprintf( outputFile, " [%d 0 0 %d 0 %d]\n", pix_size.x, -pix_size.y , pix_size.y); + // include image data in ps file + fprintf( outputFile, "{currentfile pix readhexstring pop}\n" ); + if( colorMode ) + fputs( "false 3 colorimage\n", outputFile ); + else + fputs( "image\n", outputFile ); + // Single data source, 3 colors, Output RGB data (hexadecimal) + // (or the same downscaled to gray) + int jj = 0; + for( int yy = 0; yy < pix_size.y; yy ++ ) + { + for( int xx = 0; xx < pix_size.x; xx++, jj++ ) + { + if( jj >= 16 ) + { + jj = 0; + fprintf( outputFile, "\n"); + } + int red, green, blue; + red = aImage.GetRed( xx, yy) & 0xFF; + green = aImage.GetGreen( xx, yy) & 0xFF; + blue = aImage.GetBlue( xx, yy) & 0xFF; + if( colorMode ) + fprintf( outputFile, "%2.2X%2.2X%2.2X", red, green, blue ); + else + fprintf( outputFile, "%2.2X", (red + green + blue) / 3 ); + } + } + fprintf( outputFile, "\n"); + fprintf( outputFile, "origstate restore\n" ); +} + + +void PS_PLOTTER::PenTo( const wxPoint& pos, char plume ) +{ + wxASSERT( outputFile ); + if( plume == 'Z' ) + { + if( penState != 'Z' ) + { + fputs( "stroke\n", outputFile ); + penState = 'Z'; + penLastpos.x = -1; + penLastpos.y = -1; + } + return; + } + + if( penState == 'Z' ) + { + fputs( "newpath\n", outputFile ); + } + if( penState != plume || pos != penLastpos ) + { + DPOINT pos_dev = userToDeviceCoordinates( pos ); + fprintf( outputFile, "%g %g %sto\n", + pos_dev.x, pos_dev.y, + ( plume=='D' ) ? "line" : "move" ); + } + penState = plume; + penLastpos = pos; +} + + +/** + * The code within this function (and the CloseFilePS function) + * creates postscript files whose contents comply with Adobe's + * Document Structuring Convention, as documented by assorted + * details described within the following URLs: + * + * http://en.wikipedia.org/wiki/Document_Structuring_Conventions + * http://partners.adobe.com/public/developer/en/ps/5001.DSC_Spec.pdf + * + * + * BBox is the boundary box (position and size of the "client rectangle" + * for drawings (page - margins) in mils (0.001 inch) + */ +bool PS_PLOTTER::StartPlot( FILE* fout ) +{ + wxASSERT( !outputFile ); + wxString msg; + + outputFile = fout; + static const char* PSMacro[] = + { + "%%BeginProlog\n" + "/line { newpath moveto lineto stroke } bind def\n", + "/cir0 { newpath 0 360 arc stroke } bind def\n", + "/cir1 { newpath 0 360 arc gsave fill grestore stroke } bind def\n", + "/cir2 { newpath 0 360 arc gsave fill grestore stroke } bind def\n", + "/arc0 { newpath arc stroke } bind def\n", + "/arc1 { newpath 4 index 4 index moveto arc closepath gsave fill\n", + " grestore stroke } bind def\n", + "/arc2 { newpath 4 index 4 index moveto arc closepath gsave fill\n", + " grestore stroke } bind def\n", + "/poly0 { stroke } bind def\n", + "/poly1 { closepath gsave fill grestore stroke } bind def\n", + "/poly2 { closepath gsave fill grestore stroke } bind def\n", + "/rect0 { rectstroke } bind def\n", + "/rect1 { rectfill } bind def\n", + "/rect2 { rectfill } bind def\n", + "/linemode0 { 0 setlinecap 0 setlinejoin 0 setlinewidth } bind def\n", + "/linemode1 { 1 setlinecap 1 setlinejoin } bind def\n", + "/dashedline { [200] 100 setdash } bind def\n", + "/solidline { [] 0 setdash } bind def\n", + + // This is for 'hidden' text (search anchors for PDF) + "/phantomshow { moveto\n", + " /KicadFont findfont 0.000001 scalefont setfont\n", + " show } bind def\n", + + // This is for regular postscript text + "/textshow { gsave\n", + " findfont exch scalefont setfont concat 1 scale 0 0 moveto show\n", + " } bind def\n", + + // Utility for getting Latin1 encoded fonts + "/reencodefont {\n", + " findfont dup length dict begin\n", + " { 1 index /FID ne\n", + " { def }\n", + " { pop pop } ifelse\n", + " } forall\n", + " /Encoding ISOLatin1Encoding def\n", + " currentdict\n", + " end } bind def\n" + + // Remap AdobeStandard fonts to Latin1 + "/KicadFont /Helvetica reencodefont definefont pop\n", + "/KicadFont-Bold /Helvetica-Bold reencodefont definefont pop\n", + "/KicadFont-Oblique /Helvetica-Oblique reencodefont definefont pop\n", + "/KicadFont-BoldOblique /Helvetica-BoldOblique reencodefont definefont pop\n", + "%%EndProlog\n", + NULL + }; + + time_t time1970 = time( NULL ); + + fputs( "%!PS-Adobe-3.0\n", outputFile ); // Print header + + fprintf( outputFile, "%%%%Creator: %s\n", TO_UTF8( creator ) ); + + /* A "newline" character ("\n") is not included in the following string, + because it is provided by the ctime() function. */ + fprintf( outputFile, "%%%%CreationDate: %s", ctime( &time1970 ) ); + fprintf( outputFile, "%%%%Title: %s\n", TO_UTF8( filename ) ); + fprintf( outputFile, "%%%%Pages: 1\n" ); + fprintf( outputFile, "%%%%PageOrder: Ascend\n" ); + + // Print boundary box in 1/72 pixels per inch, box is in mils + const double BIGPTsPERMIL = 0.072; + + /* The coordinates of the lower left corner of the boundary + box need to be "rounded down", but the coordinates of its + upper right corner need to be "rounded up" instead. */ + wxSize psPaperSize = pageInfo.GetSizeMils(); + + if( !pageInfo.IsPortrait() ) + psPaperSize.Set( pageInfo.GetHeightMils(), pageInfo.GetWidthMils() ); + + fprintf( outputFile, "%%%%BoundingBox: 0 0 %d %d\n", + (int) ceil( psPaperSize.x * BIGPTsPERMIL ), + (int) ceil( psPaperSize.y * BIGPTsPERMIL ) ); + + // Specify the size of the sheet and the name associated with that size. + // (If the "User size" option has been selected for the sheet size, + // identify the sheet size as "Custom" (rather than as "User"), but + // otherwise use the name assigned by KiCad for each sheet size.) + // + // (The Document Structuring Convention also supports sheet weight, + // sheet color, and sheet type properties being specified within a + // %%DocumentMedia comment, but they are not being specified here; + // a zero and two null strings are subsequently provided instead.) + // + // (NOTE: m_Size.y is *supposed* to be listed before m_Size.x; + // the order in which they are specified is not wrong!) + // Also note pageSize is given in mils, not in internal units and must be + // converted to internal units. + + if( pageInfo.IsCustom() ) + fprintf( outputFile, "%%%%DocumentMedia: Custom %d %d 0 () ()\n", + KiROUND( psPaperSize.x * BIGPTsPERMIL ), + KiROUND( psPaperSize.y * BIGPTsPERMIL ) ); + + else // a standard paper size + fprintf( outputFile, "%%%%DocumentMedia: %s %d %d 0 () ()\n", + TO_UTF8( pageInfo.GetType() ), + KiROUND( psPaperSize.x * BIGPTsPERMIL ), + KiROUND( psPaperSize.y * BIGPTsPERMIL ) ); + + if( pageInfo.IsPortrait() ) + fprintf( outputFile, "%%%%Orientation: Portrait\n" ); + else + fprintf( outputFile, "%%%%Orientation: Landscape\n" ); + + fprintf( outputFile, "%%%%EndComments\n" ); + + // Now specify various other details. + + for( int ii = 0; PSMacro[ii] != NULL; ii++ ) + { + fputs( PSMacro[ii], outputFile ); + } + + // The following string has been specified here (rather than within + // PSMacro[]) to highlight that it has been provided to ensure that the + // contents of the postscript file comply with the details specified + // within the Document Structuring Convention. + fputs( "%%Page: 1 1\n" + "%%BeginPageSetup\n" + "gsave\n" + "0.0072 0.0072 scale\n" // Configure postscript for decimils coordinates + "linemode1\n", outputFile ); + + + // Rototranslate the coordinate to achieve the landscape layout + if( !pageInfo.IsPortrait() ) + fprintf( outputFile, "%d 0 translate 90 rotate\n", 10 * psPaperSize.x ); + + // Apply the user fine scale adjustments + if( plotScaleAdjX != 1.0 || plotScaleAdjY != 1.0 ) + fprintf( outputFile, "%g %g scale\n", + plotScaleAdjX, plotScaleAdjY ); + + // Set default line width + fprintf( outputFile, "%g setlinewidth\n", + userToDeviceSize( defaultPenWidth ) ); + fputs( "%%EndPageSetup\n", outputFile ); + + return true; +} + + +bool PS_PLOTTER::EndPlot() +{ + wxASSERT( outputFile ); + fputs( "showpage\n" + "grestore\n" + "%%EOF\n", outputFile ); + fclose( outputFile ); + outputFile = NULL; + + return true; +} + + + +void PS_PLOTTER::Text( const wxPoint& aPos, + enum EDA_COLOR_T aColor, + const wxString& aText, + int aOrient, + const wxSize& aSize, + enum EDA_TEXT_HJUSTIFY_T aH_justify, + enum EDA_TEXT_VJUSTIFY_T aV_justify, + int aWidth, + bool aItalic, + bool aBold ) +{ + SetCurrentLineWidth( aWidth ); + SetColor( aColor ); + + // Draw the native postscript text (if requested) + if( psTextMode == PSTEXTMODE_NATIVE ) + { + const char *fontname = aItalic ? (aBold ? "/KicadFont-BoldOblique" + : "/KicadFont-Oblique") + : (aBold ? "/KicadFont-Bold" + : "/KicadFont"); + + // Compute the copious tranformation parameters + double ctm_a, ctm_b, ctm_c, ctm_d, ctm_e, ctm_f; + double wideningFactor, heightFactor; + computeTextParameters( aPos, aText, aOrient, aSize, aH_justify, + aV_justify, aWidth, aItalic, aBold, + &wideningFactor, &ctm_a, &ctm_b, &ctm_c, + &ctm_d, &ctm_e, &ctm_f, &heightFactor ); + + + // The text must be escaped correctly, the others are the various + // parameters. The CTM is formatted with %f since sin/cos tends + // to make %g use exponential notation (which is not supported) + fputsPostscriptString( outputFile, aText ); + fprintf( outputFile, " %g [%f %f %f %f %f %f] %g %s textshow\n", + wideningFactor, ctm_a, ctm_b, ctm_c, ctm_d, ctm_e, ctm_f, + heightFactor, fontname ); + + /* The textshow operator retained the coordinate system, we use it + * to plot the overbars. See the PDF sister function for more + * details */ + + std::vector pos_pairs; + postscriptOverlinePositions( aText, aSize.x, aItalic, aBold, &pos_pairs ); + int overbar_y = KiROUND( aSize.y * 1.1 ); + for( unsigned i = 0; i < pos_pairs.size(); i += 2) + { + DPOINT dev_from = userToDeviceSize( wxSize( pos_pairs[i], overbar_y ) ); + DPOINT dev_to = userToDeviceSize( wxSize( pos_pairs[i + 1], overbar_y ) ); + fprintf( outputFile, "%g %g %g %g line ", + dev_from.x, dev_from.y, dev_to.x, dev_to.y ); + } + + // Restore the CTM + fputs( "grestore\n", outputFile ); + } + + // Draw the hidden postscript text (if requested) + if( psTextMode == PSTEXTMODE_PHANTOM ) + { + fputsPostscriptString( outputFile, aText ); + DPOINT pos_dev = userToDeviceCoordinates( aPos ); + fprintf( outputFile, " %g %g phantomshow\n", + pos_dev.x, pos_dev.y ); + } + + // Draw the stroked text (if requested) + if( psTextMode != PSTEXTMODE_NATIVE ) + { + PLOTTER::Text( aPos, aColor, aText, aOrient, aSize, aH_justify, aV_justify, + aWidth, aItalic, aBold ); + } +} + + +/** + * Character widths for Helvetica + */ +const double hv_widths[256] = { + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.355, 0.556, 0.556, 0.889, 0.667, 0.191, + 0.333, 0.333, 0.389, 0.584, 0.278, 0.333, 0.278, 0.278, + 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, + 0.556, 0.556, 0.278, 0.278, 0.584, 0.584, 0.584, 0.556, + 1.015, 0.667, 0.667, 0.722, 0.722, 0.667, 0.611, 0.778, + 0.722, 0.278, 0.500, 0.667, 0.556, 0.833, 0.722, 0.778, + 0.667, 0.778, 0.722, 0.667, 0.611, 0.722, 0.667, 0.944, + 0.667, 0.667, 0.611, 0.278, 0.278, 0.278, 0.469, 0.556, + 0.333, 0.556, 0.556, 0.500, 0.556, 0.556, 0.278, 0.556, + 0.556, 0.222, 0.222, 0.500, 0.222, 0.833, 0.556, 0.556, + 0.556, 0.556, 0.333, 0.500, 0.278, 0.556, 0.500, 0.722, + 0.500, 0.500, 0.500, 0.334, 0.260, 0.334, 0.584, 0.278, + 0.278, 0.278, 0.222, 0.556, 0.333, 1.000, 0.556, 0.556, + 0.333, 1.000, 0.667, 0.333, 1.000, 0.278, 0.278, 0.278, + 0.278, 0.222, 0.222, 0.333, 0.333, 0.350, 0.556, 1.000, + 0.333, 1.000, 0.500, 0.333, 0.944, 0.278, 0.278, 0.667, + 0.278, 0.333, 0.556, 0.556, 0.556, 0.556, 0.260, 0.556, + 0.333, 0.737, 0.370, 0.556, 0.584, 0.333, 0.737, 0.333, + 0.400, 0.584, 0.333, 0.333, 0.333, 0.556, 0.537, 0.278, + 0.333, 0.333, 0.365, 0.556, 0.834, 0.834, 0.834, 0.611, + 0.667, 0.667, 0.667, 0.667, 0.667, 0.667, 1.000, 0.722, + 0.667, 0.667, 0.667, 0.667, 0.278, 0.278, 0.278, 0.278, + 0.722, 0.722, 0.778, 0.778, 0.778, 0.778, 0.778, 0.584, + 0.778, 0.722, 0.722, 0.722, 0.722, 0.667, 0.667, 0.611, + 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.889, 0.500, + 0.556, 0.556, 0.556, 0.556, 0.278, 0.278, 0.278, 0.278, + 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.584, + 0.611, 0.556, 0.556, 0.556, 0.556, 0.500, 0.556, 0.500 +}; + +/** + * Character widths for Helvetica-Bold + */ +const double hvb_widths[256] = { + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.333, 0.474, 0.556, 0.556, 0.889, 0.722, 0.238, + 0.333, 0.333, 0.389, 0.584, 0.278, 0.333, 0.278, 0.278, + 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, + 0.556, 0.556, 0.333, 0.333, 0.584, 0.584, 0.584, 0.611, + 0.975, 0.722, 0.722, 0.722, 0.722, 0.667, 0.611, 0.778, + 0.722, 0.278, 0.556, 0.722, 0.611, 0.833, 0.722, 0.778, + 0.667, 0.778, 0.722, 0.667, 0.611, 0.722, 0.667, 0.944, + 0.667, 0.667, 0.611, 0.333, 0.278, 0.333, 0.584, 0.556, + 0.333, 0.556, 0.611, 0.556, 0.611, 0.556, 0.333, 0.611, + 0.611, 0.278, 0.278, 0.556, 0.278, 0.889, 0.611, 0.611, + 0.611, 0.611, 0.389, 0.556, 0.333, 0.611, 0.556, 0.778, + 0.556, 0.556, 0.500, 0.389, 0.280, 0.389, 0.584, 0.278, + 0.278, 0.278, 0.278, 0.556, 0.500, 1.000, 0.556, 0.556, + 0.333, 1.000, 0.667, 0.333, 1.000, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.278, 0.500, 0.500, 0.350, 0.556, 1.000, + 0.333, 1.000, 0.556, 0.333, 0.944, 0.278, 0.278, 0.667, + 0.278, 0.333, 0.556, 0.556, 0.556, 0.556, 0.280, 0.556, + 0.333, 0.737, 0.370, 0.556, 0.584, 0.333, 0.737, 0.333, + 0.400, 0.584, 0.333, 0.333, 0.333, 0.611, 0.556, 0.278, + 0.333, 0.333, 0.365, 0.556, 0.834, 0.834, 0.834, 0.611, + 0.722, 0.722, 0.722, 0.722, 0.722, 0.722, 1.000, 0.722, + 0.667, 0.667, 0.667, 0.667, 0.278, 0.278, 0.278, 0.278, + 0.722, 0.722, 0.778, 0.778, 0.778, 0.778, 0.778, 0.584, + 0.778, 0.722, 0.722, 0.722, 0.722, 0.667, 0.667, 0.611, + 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.889, 0.556, + 0.556, 0.556, 0.556, 0.556, 0.278, 0.278, 0.278, 0.278, + 0.611, 0.611, 0.611, 0.611, 0.611, 0.611, 0.611, 0.584, + 0.611, 0.611, 0.611, 0.611, 0.611, 0.556, 0.611, 0.556 +}; + +/** + * Character widths for Helvetica-Oblique + */ +const double hvo_widths[256] = { + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.355, 0.556, 0.556, 0.889, 0.667, 0.191, + 0.333, 0.333, 0.389, 0.584, 0.278, 0.333, 0.278, 0.278, + 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, + 0.556, 0.556, 0.278, 0.278, 0.584, 0.584, 0.584, 0.556, + 1.015, 0.667, 0.667, 0.722, 0.722, 0.667, 0.611, 0.778, + 0.722, 0.278, 0.500, 0.667, 0.556, 0.833, 0.722, 0.778, + 0.667, 0.778, 0.722, 0.667, 0.611, 0.722, 0.667, 0.944, + 0.667, 0.667, 0.611, 0.278, 0.278, 0.278, 0.469, 0.556, + 0.333, 0.556, 0.556, 0.500, 0.556, 0.556, 0.278, 0.556, + 0.556, 0.222, 0.222, 0.500, 0.222, 0.833, 0.556, 0.556, + 0.556, 0.556, 0.333, 0.500, 0.278, 0.556, 0.500, 0.722, + 0.500, 0.500, 0.500, 0.334, 0.260, 0.334, 0.584, 0.278, + 0.278, 0.278, 0.222, 0.556, 0.333, 1.000, 0.556, 0.556, + 0.333, 1.000, 0.667, 0.333, 1.000, 0.278, 0.278, 0.278, + 0.278, 0.222, 0.222, 0.333, 0.333, 0.350, 0.556, 1.000, + 0.333, 1.000, 0.500, 0.333, 0.944, 0.278, 0.278, 0.667, + 0.278, 0.333, 0.556, 0.556, 0.556, 0.556, 0.260, 0.556, + 0.333, 0.737, 0.370, 0.556, 0.584, 0.333, 0.737, 0.333, + 0.400, 0.584, 0.333, 0.333, 0.333, 0.556, 0.537, 0.278, + 0.333, 0.333, 0.365, 0.556, 0.834, 0.834, 0.834, 0.611, + 0.667, 0.667, 0.667, 0.667, 0.667, 0.667, 1.000, 0.722, + 0.667, 0.667, 0.667, 0.667, 0.278, 0.278, 0.278, 0.278, + 0.722, 0.722, 0.778, 0.778, 0.778, 0.778, 0.778, 0.584, + 0.778, 0.722, 0.722, 0.722, 0.722, 0.667, 0.667, 0.611, + 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.889, 0.500, + 0.556, 0.556, 0.556, 0.556, 0.278, 0.278, 0.278, 0.278, + 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.584, + 0.611, 0.556, 0.556, 0.556, 0.556, 0.500, 0.556, 0.500 +}; + +/** + * Character widths for Helvetica-BoldOblique + */ +const double hvbo_widths[256] = { + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, 0.278, + 0.278, 0.333, 0.474, 0.556, 0.556, 0.889, 0.722, 0.238, + 0.333, 0.333, 0.389, 0.584, 0.278, 0.333, 0.278, 0.278, + 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, + 0.556, 0.556, 0.333, 0.333, 0.584, 0.584, 0.584, 0.611, + 0.975, 0.722, 0.722, 0.722, 0.722, 0.667, 0.611, 0.778, + 0.722, 0.278, 0.556, 0.722, 0.611, 0.833, 0.722, 0.778, + 0.667, 0.778, 0.722, 0.667, 0.611, 0.722, 0.667, 0.944, + 0.667, 0.667, 0.611, 0.333, 0.278, 0.333, 0.584, 0.556, + 0.333, 0.556, 0.611, 0.556, 0.611, 0.556, 0.333, 0.611, + 0.611, 0.278, 0.278, 0.556, 0.278, 0.889, 0.611, 0.611, + 0.611, 0.611, 0.389, 0.556, 0.333, 0.611, 0.556, 0.778, + 0.556, 0.556, 0.500, 0.389, 0.280, 0.389, 0.584, 0.278, + 0.278, 0.278, 0.278, 0.556, 0.500, 1.000, 0.556, 0.556, + 0.333, 1.000, 0.667, 0.333, 1.000, 0.278, 0.278, 0.278, + 0.278, 0.278, 0.278, 0.500, 0.500, 0.350, 0.556, 1.000, + 0.333, 1.000, 0.556, 0.333, 0.944, 0.278, 0.278, 0.667, + 0.278, 0.333, 0.556, 0.556, 0.556, 0.556, 0.280, 0.556, + 0.333, 0.737, 0.370, 0.556, 0.584, 0.333, 0.737, 0.333, + 0.400, 0.584, 0.333, 0.333, 0.333, 0.611, 0.556, 0.278, + 0.333, 0.333, 0.365, 0.556, 0.834, 0.834, 0.834, 0.611, + 0.722, 0.722, 0.722, 0.722, 0.722, 0.722, 1.000, 0.722, + 0.667, 0.667, 0.667, 0.667, 0.278, 0.278, 0.278, 0.278, + 0.722, 0.722, 0.778, 0.778, 0.778, 0.778, 0.778, 0.584, + 0.778, 0.722, 0.722, 0.722, 0.722, 0.667, 0.667, 0.611, + 0.556, 0.556, 0.556, 0.556, 0.556, 0.556, 0.889, 0.556, + 0.556, 0.556, 0.556, 0.556, 0.278, 0.278, 0.278, 0.278, + 0.611, 0.611, 0.611, 0.611, 0.611, 0.611, 0.611, 0.584, + 0.611, 0.611, 0.611, 0.611, 0.611, 0.556, 0.611, 0.556 +}; + diff --git a/common/common_plot_functions.cpp b/common/common_plot_functions.cpp index b74ac9f8ea..250cf4a61b 100644 --- a/common/common_plot_functions.cpp +++ b/common/common_plot_functions.cpp @@ -1,6 +1,6 @@ /** * @file common_plot_functions.cpp - * @brief Kicad: Common plot Postscript Routines + * @brief Kicad: Common plotting Routines */ #include @@ -31,7 +31,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) EDA_COLOR_T color; // Paper is sized in mils. Here is a conversion factor to scale mils to internal units. - int conv_unit = screen->MilsToIuScalar(); + int iusPerMil = screen->MilsToIuScalar(); wxString msg; wxSize text_size; @@ -49,59 +49,59 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) bool thickness = 0; //@todo : use current pen color = BLACK; - plotter->set_color( color ); + plotter->SetColor( color ); // Plot edge. - ref.x = pageInfo.GetLeftMarginMils() * conv_unit; - ref.y = pageInfo.GetTopMarginMils() * conv_unit; + ref.x = pageInfo.GetLeftMarginMils() * iusPerMil; + ref.y = pageInfo.GetTopMarginMils() * iusPerMil; - xg = ( pageSize.x - pageInfo.GetRightMarginMils() ) * conv_unit; - yg = ( pageSize.y - pageInfo.GetBottomMarginMils() ) * conv_unit; + xg = ( pageSize.x - pageInfo.GetRightMarginMils() ) * iusPerMil; + yg = ( pageSize.y - pageInfo.GetBottomMarginMils() ) * iusPerMil; #if defined(KICAD_GOST) - plotter->move_to( ref ); + plotter->MoveTo( ref ); pos.x = xg; pos.y = ref.y; - plotter->line_to( pos ); + plotter->LineTo( pos ); pos.x = xg; pos.y = yg; - plotter->line_to( pos ); + plotter->LineTo( pos ); pos.x = ref.x; pos.y = yg; - plotter->line_to( pos ); - plotter->finish_to( ref ); + plotter->LineTo( pos ); + plotter->FinishTo( ref ); #else for( unsigned ii = 0; ii < 2; ii++ ) { - plotter->move_to( ref ); + plotter->MoveTo( ref ); pos.x = xg; pos.y = ref.y; - plotter->line_to( pos ); + plotter->LineTo( pos ); pos.x = xg; pos.y = yg; - plotter->line_to( pos ); + plotter->LineTo( pos ); pos.x = ref.x; pos.y = yg; - plotter->line_to( pos ); + plotter->LineTo( pos ); - plotter->finish_to( ref ); + plotter->FinishTo( ref ); - ref.x += GRID_REF_W * conv_unit; - ref.y += GRID_REF_W * conv_unit; + ref.x += GRID_REF_W * iusPerMil; + ref.y += GRID_REF_W * iusPerMil; - xg -= GRID_REF_W * conv_unit; - yg -= GRID_REF_W * conv_unit; + xg -= GRID_REF_W * iusPerMil; + yg -= GRID_REF_W * iusPerMil; } #endif - text_size.x = WSTEXTSIZE * conv_unit; - text_size.y = WSTEXTSIZE * conv_unit; + text_size.x = WSTEXTSIZE * iusPerMil; + text_size.y = WSTEXTSIZE * iusPerMil; // upper left corner in mils ref.x = pageInfo.GetLeftMarginMils(); @@ -116,8 +116,8 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) WsItem != NULL; WsItem = WsItem->Pnext ) { - pos.x = ( ref.x - WsItem->m_Posx ) * conv_unit; - pos.y = ( yg - WsItem->m_Posy ) * conv_unit; + pos.x = ( ref.x - WsItem->m_Posx ) * iusPerMil; + pos.y = ( yg - WsItem->m_Posy ) * iusPerMil; msg.Empty(); switch( WsItem->m_Type ) { @@ -127,17 +127,17 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) case WS_PODPIS_LU: if( WsItem->m_Legende ) msg = WsItem->m_Legende; - plotter->text( pos, color, + plotter->Text( pos, color, msg, TEXT_ORIENT_VERT, text_size, GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_BOTTOM, thickness, italic, false ); break; case WS_SEGMENT_LU: - plotter->move_to( pos ); - pos.x = ( ref.x - WsItem->m_Endx ) * conv_unit; - pos.y = ( yg - WsItem->m_Endy ) * conv_unit; - plotter->finish_to( pos ); + plotter->MoveTo( pos ); + pos.x = ( ref.x - WsItem->m_Endx ) * iusPerMil; + pos.y = ( yg - WsItem->m_Endy ) * iusPerMil; + plotter->FinishTo( pos ); break; } } @@ -146,16 +146,16 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) WsItem != NULL; WsItem = WsItem->Pnext ) { - pos.x = ( ref.x + WsItem->m_Posx ) * conv_unit; - pos.y = ( ref.y + WsItem->m_Posy ) * conv_unit; + pos.x = ( ref.x + WsItem->m_Posx ) * iusPerMil; + pos.y = ( ref.y + WsItem->m_Posy ) * iusPerMil; msg.Empty(); switch( WsItem->m_Type ) { case WS_SEGMENT_LT: - plotter->move_to( pos ); - pos.x = ( ref.x + WsItem->m_Endx ) * conv_unit; - pos.y = ( ref.y + WsItem->m_Endy ) * conv_unit; - plotter->finish_to( pos ); + plotter->MoveTo( pos ); + pos.x = ( ref.x + WsItem->m_Endx ) * iusPerMil; + pos.y = ( ref.y + WsItem->m_Endy ) * iusPerMil; + plotter->FinishTo( pos ); break; } } @@ -172,33 +172,33 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) if( ii < xg - PAS_REF / 2 ) { - pos.x = ii * conv_unit; - pos.y = ref.y * conv_unit; - plotter->move_to( pos ); - pos.x = ii * conv_unit; - pos.y = ( ref.y + GRID_REF_W ) * conv_unit; - plotter->finish_to( pos ); + pos.x = ii * iusPerMil; + pos.y = ref.y * iusPerMil; + plotter->MoveTo( pos ); + pos.x = ii * iusPerMil; + pos.y = ( ref.y + GRID_REF_W ) * iusPerMil; + plotter->FinishTo( pos ); } - pos.x = ( ii - gxpas / 2 ) * conv_unit; - pos.y = ( ref.y + GRID_REF_W / 2 ) * conv_unit; - plotter->text( pos, color, + pos.x = ( ii - gxpas / 2 ) * iusPerMil; + pos.y = ( ref.y + GRID_REF_W / 2 ) * iusPerMil; + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); if( ii < xg - PAS_REF / 2 ) { - pos.x = ii * conv_unit; - pos.y = yg * conv_unit; - plotter->move_to( pos ); - pos.x = ii * conv_unit; - pos.y = (yg - GRID_REF_W) * conv_unit; - plotter->finish_to( pos ); + pos.x = ii * iusPerMil; + pos.y = yg * iusPerMil; + plotter->MoveTo( pos ); + pos.x = ii * iusPerMil; + pos.y = (yg - GRID_REF_W) * iusPerMil; + plotter->FinishTo( pos ); } - pos.x = ( ii - gxpas / 2 ) * conv_unit; - pos.y = ( yg - GRID_REF_W / 2 ) * conv_unit; - plotter->text( pos, color, + pos.x = ( ii - gxpas / 2 ) * iusPerMil; + pos.y = ( yg - GRID_REF_W / 2 ) * iusPerMil; + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); @@ -215,33 +215,33 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) msg.Printf( wxT( "%c" ), 'a' + jj - 26 ); if( ii < yg - PAS_REF / 2 ) { - pos.x = ref.x * conv_unit; - pos.y = ii * conv_unit; - plotter->move_to( pos ); - pos.x = ( ref.x + GRID_REF_W ) * conv_unit; - pos.y = ii * conv_unit; - plotter->finish_to( pos ); + pos.x = ref.x * iusPerMil; + pos.y = ii * iusPerMil; + plotter->MoveTo( pos ); + pos.x = ( ref.x + GRID_REF_W ) * iusPerMil; + pos.y = ii * iusPerMil; + plotter->FinishTo( pos ); } - pos.x = ( ref.x + GRID_REF_W / 2 ) * conv_unit; - pos.y = ( ii - gypas / 2 ) * conv_unit; - plotter->text( pos, color, + pos.x = ( ref.x + GRID_REF_W / 2 ) * iusPerMil; + pos.y = ( ii - gypas / 2 ) * iusPerMil; + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); if( ii < yg - PAS_REF / 2 ) { - pos.x = xg * conv_unit; - pos.y = ii * conv_unit; - plotter->move_to( pos ); - pos.x = ( xg - GRID_REF_W ) * conv_unit; - pos.y = ii * conv_unit; - plotter->finish_to( pos ); + pos.x = xg * iusPerMil; + pos.y = ii * iusPerMil; + plotter->MoveTo( pos ); + pos.x = ( xg - GRID_REF_W ) * iusPerMil; + pos.y = ii * iusPerMil; + plotter->FinishTo( pos ); } - pos.x = ( xg - GRID_REF_W / 2 ) * conv_unit; - pos.y = ( ii - gypas / 2 ) * conv_unit; - plotter->text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, + pos.x = ( xg - GRID_REF_W / 2 ) * iusPerMil; + pos.y = ( ii - gypas / 2 ) * iusPerMil; + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); } @@ -249,16 +249,16 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) #endif // Plot the worksheet. - text_size.x = SIZETEXT * conv_unit; - text_size.y = SIZETEXT * conv_unit; + text_size.x = SIZETEXT * iusPerMil; + text_size.y = SIZETEXT * iusPerMil; #if defined(KICAD_GOST) - text_size2.x = SIZETEXT * conv_unit * 2; - text_size2.y = SIZETEXT * conv_unit * 2; - text_size3.x = SIZETEXT * conv_unit * 3; - text_size3.y = SIZETEXT * conv_unit * 3; - text_size1_5.x = SIZETEXT * conv_unit * 1.5; - text_size1_5.y = SIZETEXT * conv_unit * 1.5; + text_size2.x = SIZETEXT * iusPerMil * 2; + text_size2.y = SIZETEXT * iusPerMil * 2; + text_size3.x = SIZETEXT * iusPerMil * 3; + text_size3.y = SIZETEXT * iusPerMil * 3; + text_size1_5.x = SIZETEXT * iusPerMil * 1.5; + text_size1_5.y = SIZETEXT * iusPerMil * 1.5; ref.x = pageSize.x - pageInfo.GetRightMarginMils(); ref.y = pageSize.y - pageInfo.GetBottomMarginMils(); @@ -269,8 +269,8 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) WsItem != NULL; WsItem = WsItem->Pnext ) { - pos.x = ( ref.x - WsItem->m_Posx ) * conv_unit; - pos.y = ( ref.y - WsItem->m_Posy ) * conv_unit; + pos.x = ( ref.x - WsItem->m_Posx ) * iusPerMil; + pos.y = ( ref.y - WsItem->m_Posy ) * iusPerMil; msg.Empty(); switch( WsItem->m_Type ) @@ -287,7 +287,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) case WS_PODPIS: if( WsItem->m_Legende ) msg = WsItem->m_Legende; - plotter->text( pos, color, + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); @@ -301,7 +301,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) msg = WsItem->m_Legende; if( screen->m_NumberOfScreen > 1 ) msg << screen->m_ScreenNumber; - plotter->text( pos, color, + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); @@ -311,7 +311,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) if( WsItem->m_Legende ) msg = WsItem->m_Legende; msg << screen->m_NumberOfScreen; - plotter->text( pos, color, + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); @@ -321,7 +321,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) msg = GetTitleBlock().GetCompany(); if( !msg.IsEmpty() ) { - plotter->text( pos, color, + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size1_5, GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); @@ -332,7 +332,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) msg = GetTitleBlock().GetTitle(); if( !msg.IsEmpty() ) { - plotter->text( pos, color, + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size1_5, GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); @@ -343,13 +343,13 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) msg = GetTitleBlock().GetComment1(); if( !msg.IsEmpty() ) { - plotter->text( pos, color, + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size3, GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); - pos.x = (pageInfo.GetLeftMarginMils() + 1260) * conv_unit; - pos.y = (pageInfo.GetTopMarginMils() + 270) * conv_unit; - plotter->text( pos, color, + pos.x = (pageInfo.GetLeftMarginMils() + 1260) * iusPerMil; + pos.y = (pageInfo.GetTopMarginMils() + 270) * iusPerMil; + plotter->Text( pos, color, msg.GetData(), 1800, text_size2, GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); @@ -360,7 +360,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) msg = GetTitleBlock().GetComment2(); if( !msg.IsEmpty() ) { - plotter->text( pos, color, + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); @@ -371,7 +371,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) msg = GetTitleBlock().GetComment3(); if( !msg.IsEmpty() ) { - plotter->text( pos, color, + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); @@ -382,7 +382,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) msg = GetTitleBlock().GetComment4(); if( !msg.IsEmpty() ) { - plotter->text( pos, color, + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); @@ -392,10 +392,10 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) case WS_UPPER_SEGMENT: case WS_LEFT_SEGMENT: case WS_SEGMENT: - plotter->move_to( pos ); - pos.x = ( ref.x - WsItem->m_Endx ) * conv_unit; - pos.y = ( ref.y - WsItem->m_Endy ) * conv_unit; - plotter->finish_to( pos ); + plotter->MoveTo( pos ); + pos.x = ( ref.x - WsItem->m_Endx ) * iusPerMil; + pos.y = ( ref.y - WsItem->m_Endy ) * iusPerMil; + plotter->FinishTo( pos ); break; } } @@ -406,8 +406,8 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) WsItem != NULL; WsItem = WsItem->Pnext ) { - pos.x = ( ref.x - WsItem->m_Posx ) * conv_unit; - pos.y = ( ref.y - WsItem->m_Posy ) * conv_unit; + pos.x = ( ref.x - WsItem->m_Posx ) * iusPerMil; + pos.y = ( ref.y - WsItem->m_Posy ) * iusPerMil; msg.Empty(); switch( WsItem->m_Type ) @@ -417,13 +417,13 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) msg = GetTitleBlock().GetComment1(); if( !msg.IsEmpty() ) { - plotter->text( pos, color, + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size3, GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); - pos.x = (pageInfo.GetLeftMarginMils() + 1260) * conv_unit; - pos.y = (pageInfo.GetTopMarginMils() + 270) * conv_unit; - plotter->text( pos, color, + pos.x = (pageInfo.GetLeftMarginMils() + 1260) * iusPerMil; + pos.y = (pageInfo.GetTopMarginMils() + 270) * iusPerMil; + plotter->Text( pos, color, msg, 1800, text_size2, GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); @@ -433,7 +433,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) case WS_PODPIS_D: if( WsItem->m_Legende ) msg = WsItem->m_Legende; - plotter->text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); break; @@ -442,17 +442,17 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) if( WsItem->m_Legende ) msg = WsItem->m_Legende; msg << screen->m_ScreenNumber; - plotter->text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, false ); break; case WS_LEFT_SEGMENT_D: case WS_SEGMENT_D: - plotter->move_to( pos ); - pos.x = ( ref.x - WsItem->m_Endx ) * conv_unit; - pos.y = ( ref.y - WsItem->m_Endy ) * conv_unit; - plotter->finish_to( pos ); + plotter->MoveTo( pos ); + pos.x = ( ref.x - WsItem->m_Endx ) * iusPerMil; + pos.y = ( ref.y - WsItem->m_Endy ) * iusPerMil; + plotter->FinishTo( pos ); break; } } @@ -467,8 +467,8 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) WsItem != NULL; WsItem = WsItem->Pnext ) { - pos.x = ( ref.x - WsItem->m_Posx ) * conv_unit; - pos.y = ( ref.y - WsItem->m_Posy ) * conv_unit; + pos.x = ( ref.x - WsItem->m_Posx ) * iusPerMil; + pos.y = ( ref.y - WsItem->m_Posy ) * iusPerMil; bold = false; if( WsItem->m_Legende ) msg = WsItem->m_Legende; @@ -558,22 +558,22 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) case WS_LEFT_SEGMENT: WS_MostUpperLine.m_Posy = WS_MostUpperLine.m_Endy = WS_MostLeftLine.m_Posy = UpperLimit; - pos.y = (ref.y - WsItem->m_Posy) * conv_unit; + pos.y = (ref.y - WsItem->m_Posy) * iusPerMil; case WS_SEGMENT: { wxPoint auxpos; - auxpos.x = ( ref.x - WsItem->m_Endx ) * conv_unit; - auxpos.y = ( ref.y - WsItem->m_Endy ) * conv_unit; - plotter->move_to( pos ); - plotter->finish_to( auxpos ); + auxpos.x = ( ref.x - WsItem->m_Endx ) * iusPerMil; + auxpos.y = ( ref.y - WsItem->m_Endy ) * iusPerMil; + plotter->MoveTo( pos ); + plotter->FinishTo( auxpos ); } break; } if( !msg.IsEmpty() ) { - plotter->text( pos, color, + plotter->Text( pos, color, msg, TEXT_ORIENT_HORIZ, text_size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, thickness, italic, bold ); diff --git a/common/drawtxt.cpp b/common/drawtxt.cpp index 590c0d69ec..27865f2db7 100644 --- a/common/drawtxt.cpp +++ b/common/drawtxt.cpp @@ -164,13 +164,13 @@ static void DrawGraphicTextPline( { if( aPlotter ) { - aPlotter->move_to( coord[0] ); + aPlotter->MoveTo( coord[0] ); for( int ik = 1; ik < point_count; ik++ ) { - aPlotter->line_to( coord[ik] ); + aPlotter->LineTo( coord[ik] ); } - aPlotter->pen_finish(); + aPlotter->PenFinish(); } else if( aCallback ) { @@ -357,8 +357,8 @@ void DrawGraphicText( EDA_DRAW_PANEL* aPanel, if( aPlotter ) { - aPlotter->move_to( current_char_pos ); - aPlotter->finish_to( end ); + aPlotter->MoveTo( current_char_pos ); + aPlotter->FinishTo( end ); } else if( aCallback ) { @@ -515,7 +515,7 @@ void DrawGraphicText( EDA_DRAW_PANEL* aPanel, * @param aItalic = true to simulate an italic font * @param aBold = true to use a bold font Useful only with default width value (aWidth = 0) */ -void PLOTTER::text( const wxPoint& aPos, +void PLOTTER::Text( const wxPoint& aPos, enum EDA_COLOR_T aColor, const wxString& aText, int aOrient, @@ -534,11 +534,11 @@ void PLOTTER::text( const wxPoint& aPos, else aWidth = -Clamp_Text_PenSize( -aWidth, aSize, aBold ); - set_current_line_width( aWidth ); + SetCurrentLineWidth( aWidth ); if( aColor >= 0 ) - set_color( aColor ); + SetColor( aColor ); DrawGraphicText( NULL, NULL, aPos, aColor, aText, aOrient, aSize, diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt index e519f3cae1..c23776f914 100644 --- a/eeschema/CMakeLists.txt +++ b/eeschema/CMakeLists.txt @@ -36,6 +36,8 @@ set(EESCHEMA_SRCS dialogs/dialog_plot_schematic_HPGL_base.cpp dialogs/dialog_plot_schematic_PS.cpp dialogs/dialog_plot_schematic_PS_base.cpp + dialogs/dialog_plot_schematic_PDF.cpp + dialogs/dialog_plot_schematic_PDF_base.cpp dialogs/annotate_dialog.cpp dialogs/dialog_annotate_base.cpp dialogs/dialog_lib_edit_text.cpp @@ -218,6 +220,7 @@ target_link_libraries(eeschema kbool ${wxWidgets_LIBRARIES} ${GDI_PLUS_LIBRARIES} + zlib ) install(TARGETS eeschema diff --git a/eeschema/class_libentry.cpp b/eeschema/class_libentry.cpp index ff2db51338..4828fdf241 100644 --- a/eeschema/class_libentry.cpp +++ b/eeschema/class_libentry.cpp @@ -391,8 +391,8 @@ void LIB_COMPONENT::Plot( PLOTTER* aPlotter, int aUnit, int aConvert, if( aConvert && item.m_Convert && ( item.m_Convert != aConvert ) ) continue; - aPlotter->set_color( ReturnLayerColor( LAYER_DEVICE ) ); - bool fill = aPlotter->get_color_mode(); + aPlotter->SetColor( ReturnLayerColor( LAYER_DEVICE ) ); + bool fill = aPlotter->GetColorMode(); item.Plot( aPlotter, aOffset, fill, aTransform ); } diff --git a/eeschema/dialogs/dialog_plot_schematic_DXF.cpp b/eeschema/dialogs/dialog_plot_schematic_DXF.cpp index fc21d78e6b..5bc384974c 100644 --- a/eeschema/dialogs/dialog_plot_schematic_DXF.cpp +++ b/eeschema/dialogs/dialog_plot_schematic_DXF.cpp @@ -185,14 +185,12 @@ void DIALOG_PLOT_SCHEMATIC_DXF::CreateDXFFile( ) sheetpath = SheetList.GetNext(); } - double scale = 10; - plot_offset.x = 0; plot_offset.y = 0; plotFileName = schframe->GetUniqueFilenameForCurrentSheet() + wxT( ".dxf" ); - PlotOneSheetDXF( plotFileName, screen, plot_offset, scale ); + PlotOneSheetDXF( plotFileName, screen, plot_offset, 1 ); if( !m_select_PlotAll ) break; @@ -232,24 +230,24 @@ void DIALOG_PLOT_SCHEMATIC_DXF::PlotOneSheetDXF( const wxString& FileName, const PAGE_INFO& pageInfo = screen->GetPageSettings(); plotter->SetPageSettings( pageInfo ); - plotter->set_viewport( plot_offset, scale, 0 ); - plotter->set_color_mode( m_plotColorOpt ); + plotter->SetViewport( plot_offset, IU_PER_DECIMILS, scale, 0 ); + plotter->SetColorMode( m_plotColorOpt ); // Init : - plotter->set_creator( wxT( "Eeschema-DXF" ) ); - plotter->set_filename( FileName ); - plotter->start_plot( output_file ); + plotter->SetCreator( wxT( "Eeschema-DXF" ) ); + plotter->SetFilename( FileName ); + plotter->StartPlot( output_file ); if( m_plot_Sheet_Ref ) { - plotter->set_color( BLACK ); + plotter->SetColor( BLACK ); m_Parent->PlotWorkSheet( plotter, screen ); } screen->Plot( plotter ); // finish - plotter->end_plot(); + plotter->EndPlot(); delete plotter; m_MsgBox->AppendText( wxT( "Ok\n" ) ); diff --git a/eeschema/dialogs/dialog_plot_schematic_HPGL.cpp b/eeschema/dialogs/dialog_plot_schematic_HPGL.cpp index 2308a4a8c4..7ce19b0212 100644 --- a/eeschema/dialogs/dialog_plot_schematic_HPGL.cpp +++ b/eeschema/dialogs/dialog_plot_schematic_HPGL.cpp @@ -330,7 +330,7 @@ void DIALOG_PLOT_SCHEMATIC_HPGL::Plot_Schematic_HPGL( bool aPlotAll ) // Calculation of conversion scales. // 10x because Eeschema works in mils, not deci-mils - double plot_scale = 10 * (double) plotPage.GetWidthMils() / curPage.GetWidthMils(); + double plot_scale = (double) plotPage.GetWidthMils() / curPage.GetWidthMils(); // Calculate offsets plotOffset.x = -s_Offset.x; @@ -380,26 +380,26 @@ void DIALOG_PLOT_SCHEMATIC_HPGL::Plot_1_Page_HPGL( const wxString& FileName, plotter->SetPageSettings( pageInfo ); - plotter->set_viewport( offset, plot_scale, 0 ); - plotter->set_default_line_width( g_DrawDefaultLineThickness ); + plotter->SetViewport( offset, IU_PER_DECIMILS, plot_scale, 0 ); + plotter->SetDefaultLineWidth( g_DrawDefaultLineThickness ); // Init : - plotter->set_creator( wxT( "Eeschema-HPGL" ) ); - plotter->set_filename( FileName ); - plotter->set_pen_speed( g_HPGL_Pen_Descr.m_Pen_Speed ); - plotter->set_pen_number( g_HPGL_Pen_Descr.m_Pen_Num ); - plotter->set_pen_diameter( g_HPGL_Pen_Descr.m_Pen_Diam ); - plotter->set_pen_overlap( g_HPGL_Pen_Descr.m_Pen_Diam / 2 ); - plotter->start_plot( output_file ); + plotter->SetCreator( wxT( "Eeschema-HPGL" ) ); + plotter->SetFilename( FileName ); + plotter->SetPenSpeed( g_HPGL_Pen_Descr.m_Pen_Speed ); + plotter->SetPenNumber( g_HPGL_Pen_Descr.m_Pen_Num ); + plotter->SetPenDiameter( g_HPGL_Pen_Descr.m_Pen_Diam ); + plotter->SetPenOverlap( g_HPGL_Pen_Descr.m_Pen_Diam / 2 ); + plotter->StartPlot( output_file ); - plotter->set_color( BLACK ); + plotter->SetColor( BLACK ); if( s_plot_Sheet_Ref ) m_Parent->PlotWorkSheet( plotter, screen ); screen->Plot( plotter ); - plotter->end_plot(); + plotter->EndPlot(); delete plotter; m_MsgBox->AppendText( wxT( "Ok\n" ) ); diff --git a/eeschema/dialogs/dialog_plot_schematic_PS.cpp b/eeschema/dialogs/dialog_plot_schematic_PS.cpp index 9074b05ee2..4fdce575e1 100644 --- a/eeschema/dialogs/dialog_plot_schematic_PS.cpp +++ b/eeschema/dialogs/dialog_plot_schematic_PS.cpp @@ -237,7 +237,7 @@ void DIALOG_PLOT_SCHEMATIC_PS::createPSFile() double scalex = (double) plotPage.GetWidthMils() / actualPage.GetWidthMils(); double scaley = (double) plotPage.GetHeightMils() / actualPage.GetHeightMils(); - double scale = 10 * MIN( scalex, scaley ); + double scale = MIN( scalex, scaley ); plot_offset.x = 0; plot_offset.y = 0; @@ -281,24 +281,25 @@ void DIALOG_PLOT_SCHEMATIC_PS::plotOneSheetPS( const wxString& FileName, PS_PLOTTER* plotter = new PS_PLOTTER(); plotter->SetPageSettings( pageInfo ); - plotter->set_viewport( plot_offset, scale, 0 ); - plotter->set_default_line_width( g_DrawDefaultLineThickness ); - plotter->set_color_mode( m_plotColorOpt ); + plotter->SetViewport( plot_offset, IU_PER_DECIMILS, scale, 0 ); + plotter->SetDefaultLineWidth( g_DrawDefaultLineThickness ); + plotter->SetColorMode( m_plotColorOpt ); + plotter->SetPsTextMode( PSTEXTMODE_STROKE ); // Init : - plotter->set_creator( wxT( "Eeschema-PS" ) ); - plotter->set_filename( FileName ); - plotter->start_plot( output_file ); + plotter->SetCreator( wxT( "Eeschema-PS" ) ); + plotter->SetFilename( FileName ); + plotter->StartPlot( output_file ); if( m_plot_Sheet_Ref ) { - plotter->set_color( BLACK ); + plotter->SetColor( BLACK ); m_Parent->PlotWorkSheet( plotter, screen ); } screen->Plot( plotter ); - plotter->end_plot(); + plotter->EndPlot(); delete plotter; SetLocaleTo_Default(); diff --git a/eeschema/lib_arc.cpp b/eeschema/lib_arc.cpp index a13bd9a66e..f1fcb5f319 100644 --- a/eeschema/lib_arc.cpp +++ b/eeschema/lib_arc.cpp @@ -1,775 +1,775 @@ -/* - * This program source code file is part of KiCad, a free EDA CAD application. - * - * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com - * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/** - * @file lib_arc.cpp - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - - -//! @brief Given three points A B C, compute the circumcenter of the resulting triangle -//! reference: http://en.wikipedia.org/wiki/Circumscribed_circle -//! Coordinates of circumcenter in Cartesian coordinates -static wxPoint calcCenter( const wxPoint& A, const wxPoint& B, const wxPoint& C ) -{ - double circumCenterX, circumCenterY; - double Ax = (double) A.x; - double Ay = (double) A.y; - double Bx = (double) B.x; - double By = (double) B.y; - double Cx = (double) C.x; - double Cy = (double) C.y; - - wxPoint circumCenter; - - double D = 2.0 * ( Ax * ( By - Cy ) + Bx * ( Cy - Ay ) + Cx * ( Ay - By ) ); - - // prevent division / 0 - if( fabs( D ) < 1e-7 ) - D = 1e-7; - - circumCenterX = ( (Ay * Ay + Ax * Ax) * (By - Cy) + - (By * By + Bx * Bx) * (Cy - Ay) + - (Cy * Cy + Cx * Cx) * (Ay - By) ) / D; - - circumCenterY = ( (Ay * Ay + Ax * Ax) * (Cx - Bx) + - (By * By + Bx * Bx) * (Ax - Cx) + - (Cy * Cy + Cx * Cx) * (Bx - Ax) ) / D; - - circumCenter.x = (int) circumCenterX; - circumCenter.y = (int) circumCenterY; - - return circumCenter; -} - - -LIB_ARC::LIB_ARC( LIB_COMPONENT* aParent ) : LIB_ITEM( LIB_ARC_T, aParent ) -{ - m_Radius = 0; - m_t1 = 0; - m_t2 = 0; - m_Width = 0; - m_Fill = NO_FILL; - m_isFillable = true; - m_typeName = _( "Arc" ); - m_editState = 0; - m_lastEditState = 0; -} - - -bool LIB_ARC::Save( OUTPUTFORMATTER& aFormatter ) -{ - int x1 = m_t1; - - if( x1 > 1800 ) - x1 -= 3600; - - int x2 = m_t2; - - if( x2 > 1800 ) - x2 -= 3600; - - aFormatter.Print( 0, "A %d %d %d %d %d %d %d %d %c %d %d %d %d\n", - m_Pos.x, m_Pos.y, m_Radius, x1, x2, m_Unit, m_Convert, m_Width, - fill_tab[m_Fill], m_ArcStart.x, m_ArcStart.y, m_ArcEnd.x, - m_ArcEnd.y ); - - return true; -} - - -bool LIB_ARC::Load( LINE_READER& aLineReader, wxString& aErrorMsg ) -{ - int startx, starty, endx, endy, cnt; - char tmp[256]; - char* line = (char*) aLineReader; - - cnt = sscanf( line + 2, "%d %d %d %d %d %d %d %d %s %d %d %d %d", - &m_Pos.x, &m_Pos.y, &m_Radius, &m_t1, &m_t2, &m_Unit, - &m_Convert, &m_Width, tmp, &startx, &starty, &endx, &endy ); - if( cnt < 8 ) - { - aErrorMsg.Printf( _( "arc only had %d parameters of the required 8" ), cnt ); - return false; - } - - if( tmp[0] == 'F' ) - m_Fill = FILLED_SHAPE; - - if( tmp[0] == 'f' ) - m_Fill = FILLED_WITH_BG_BODYCOLOR; - - NORMALIZE_ANGLE_POS( m_t1 ); - NORMALIZE_ANGLE_POS( m_t2 ); - - // Actual Coordinates of arc ends are read from file - if( cnt >= 13 ) - { - m_ArcStart.x = startx; - m_ArcStart.y = starty; - m_ArcEnd.x = endx; - m_ArcEnd.y = endy; - } - else - { - // Actual Coordinates of arc ends are not read from file - // (old library), calculate them - m_ArcStart.x = m_Radius; - m_ArcStart.y = 0; - m_ArcEnd.x = m_Radius; - m_ArcEnd.y = 0; - RotatePoint( &m_ArcStart.x, &m_ArcStart.y, -m_t1 ); - m_ArcStart.x += m_Pos.x; - m_ArcStart.y += m_Pos.y; - RotatePoint( &m_ArcEnd.x, &m_ArcEnd.y, -m_t2 ); - m_ArcEnd.x += m_Pos.x; - m_ArcEnd.y += m_Pos.y; - } - - return true; -} - - -bool LIB_ARC::HitTest( const wxPoint& aRefPoint ) -{ - int mindist = GetPenSize() / 2; - - // Have a minimal tolerance for hit test - if( mindist < MINIMUM_SELECTION_DISTANCE ) - mindist = MINIMUM_SELECTION_DISTANCE; - - return HitTest( aRefPoint, mindist, DefaultTransform ); -} - - -bool LIB_ARC::HitTest( wxPoint aPosition, int aThreshold, const TRANSFORM& aTransform ) -{ - - if( aThreshold < 0 ) - aThreshold = GetPenSize() / 2; - - // TODO: use aTransMat to calculates parameters - wxPoint relativePosition = aPosition; - - NEGATE( relativePosition.y ); // reverse Y axis - - int distance = KiROUND( EuclideanNorm( TwoPointVector( m_Pos, relativePosition ) ) ); - - if( abs( distance - m_Radius ) > aThreshold ) - return false; - - // We are on the circle, ensure we are only on the arc, i.e. between - // m_ArcStart and m_ArcEnd - - wxPoint startEndVector = TwoPointVector( m_ArcStart, m_ArcEnd); - wxPoint startRelativePositionVector = TwoPointVector( m_ArcStart, relativePosition ); - - wxPoint centerStartVector = TwoPointVector( m_Pos, m_ArcStart ); - wxPoint centerEndVector = TwoPointVector( m_Pos, m_ArcEnd ); - wxPoint centerRelativePositionVector = TwoPointVector( m_Pos, relativePosition ); - - // Compute the cross product to check if the point is in the sector - int crossProductStart = CrossProduct( centerStartVector, centerRelativePositionVector ); - int crossProductEnd = CrossProduct( centerEndVector, centerRelativePositionVector ); - - // The cross products need to be exchanged, depending on which side the center point - // relative to the start point to end point vector lies - if( CrossProduct( startEndVector, startRelativePositionVector ) < 0 ) - { - EXCHG( crossProductStart, crossProductEnd ); - } - - // When the cross products have a different sign, the point lies in sector - // also check, if the reference is near start or end point - return HitTestPoints( m_ArcStart, relativePosition, MINIMUM_SELECTION_DISTANCE ) || - HitTestPoints( m_ArcEnd, relativePosition, MINIMUM_SELECTION_DISTANCE ) || - ( crossProductStart <= 0 && crossProductEnd >= 0 ); -} - - -EDA_ITEM* LIB_ARC::Clone() const -{ - return new LIB_ARC( *this ); -} - - -int LIB_ARC::compare( const LIB_ITEM& aOther ) const -{ - wxASSERT( aOther.Type() == LIB_ARC_T ); - - const LIB_ARC* tmp = ( LIB_ARC* ) &aOther; - - if( m_Pos.x != tmp->m_Pos.x ) - return m_Pos.x - tmp->m_Pos.x; - - if( m_Pos.y != tmp->m_Pos.y ) - return m_Pos.y - tmp->m_Pos.y; - - if( m_t1 != tmp->m_t1 ) - return m_t1 - tmp->m_t1; - - if( m_t2 != tmp->m_t2 ) - return m_t2 - tmp->m_t2; - - return 0; -} - - -void LIB_ARC::SetOffset( const wxPoint& aOffset ) -{ - m_Pos += aOffset; - m_ArcStart += aOffset; - m_ArcEnd += aOffset; -} - - -bool LIB_ARC::Inside( EDA_RECT& aRect ) const -{ - return aRect.Contains( m_ArcStart.x, -m_ArcStart.y ) - || aRect.Contains( m_ArcEnd.x, -m_ArcEnd.y ); -} - - -void LIB_ARC::Move( const wxPoint& aPosition ) -{ - wxPoint offset = aPosition - m_Pos; - m_Pos = aPosition; - m_ArcStart += offset; - m_ArcEnd += offset; -} - - -void LIB_ARC::MirrorHorizontal( const wxPoint& aCenter ) -{ - m_Pos.x -= aCenter.x; - m_Pos.x *= -1; - m_Pos.x += aCenter.x; - m_ArcStart.x -= aCenter.x; - m_ArcStart.x *= -1; - m_ArcStart.x += aCenter.x; - m_ArcEnd.x -= aCenter.x; - m_ArcEnd.x *= -1; - m_ArcEnd.x += aCenter.x; - EXCHG( m_ArcStart, m_ArcEnd ); -} - -void LIB_ARC::MirrorVertical( const wxPoint& aCenter ) -{ - m_Pos.y -= aCenter.y; - m_Pos.y *= -1; - m_Pos.y += aCenter.y; - m_ArcStart.y -= aCenter.y; - m_ArcStart.y *= -1; - m_ArcStart.y += aCenter.y; - m_ArcEnd.y -= aCenter.y; - m_ArcEnd.y *= -1; - m_ArcEnd.y += aCenter.y; - EXCHG( m_ArcStart, m_ArcEnd ); -} - -void LIB_ARC::Rotate( const wxPoint& aCenter, bool aRotateCCW ) -{ - int rot_angle = aRotateCCW ? -900 : 900; - RotatePoint( &m_Pos, aCenter, rot_angle ); - RotatePoint( &m_ArcStart, aCenter, rot_angle ); - RotatePoint( &m_ArcEnd, aCenter, rot_angle ); -} - - - -void LIB_ARC::Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, - const TRANSFORM& aTransform ) -{ - wxASSERT( aPlotter != NULL ); - - int t1 = m_t1; - int t2 = m_t2; - wxPoint pos = aTransform.TransformCoordinate( m_Pos ) + aOffset; - - aTransform.MapAngles( &t1, &t2 ); - - if( aFill && m_Fill == FILLED_WITH_BG_BODYCOLOR ) - { - aPlotter->set_color( ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) ); - aPlotter->arc( pos, -t2, -t1, m_Radius, FILLED_SHAPE, 0 ); - } - - bool already_filled = m_Fill == FILLED_WITH_BG_BODYCOLOR; - aPlotter->set_color( ReturnLayerColor( LAYER_DEVICE ) ); - aPlotter->arc( pos, -t2, -t1, m_Radius, already_filled ? NO_FILL : m_Fill, GetPenSize() ); -} - - -int LIB_ARC::GetPenSize() const -{ - return ( m_Width == 0 ) ? g_DrawDefaultLineThickness : m_Width; -} - - -void LIB_ARC::drawEditGraphics( EDA_RECT* aClipBox, wxDC* aDC, int aColor ) -{ - // The edit indicators only get drawn when a new arc is being drawn. - if( !IsNew() ) - return; - - // Use the last edit state so when the drawing switches from the end mode to the center - // point mode, the last line between the center points gets erased. - if( m_lastEditState == 1 ) - { - GRLine( aClipBox, aDC, m_ArcStart.x, -m_ArcStart.y, m_ArcEnd.x, -m_ArcEnd.y, 0, aColor ); - } - else - { - GRDashedLine( aClipBox, aDC, m_ArcStart.x, -m_ArcStart.y, m_Pos.x, -m_Pos.y, 0, aColor ); - GRDashedLine( aClipBox, aDC, m_ArcEnd.x, -m_ArcEnd.y, m_Pos.x, -m_Pos.y, 0, aColor ); - } -} - - -void LIB_ARC::drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, - int aColor, int aDrawMode, void* aData, const TRANSFORM& aTransform ) -{ - // Don't draw the arc until the end point is selected. Only the edit indicators - // get drawn at this time. - if( IsNew() && m_lastEditState == 1 ) - return; - - wxPoint pos1, pos2, posc; - int color = ReturnLayerColor( LAYER_DEVICE ); - - if( aColor < 0 ) // Used normal color or selected color - { - if( IsSelected() ) - color = g_ItemSelectetColor; - } - else - { - color = aColor; - } - - pos1 = aTransform.TransformCoordinate( m_ArcEnd ) + aOffset; - pos2 = aTransform.TransformCoordinate( m_ArcStart ) + aOffset; - posc = aTransform.TransformCoordinate( m_Pos ) + aOffset; - int pt1 = m_t1; - int pt2 = m_t2; - bool swap = aTransform.MapAngles( &pt1, &pt2 ); - - if( swap ) - { - EXCHG( pos1.x, pos2.x ); - EXCHG( pos1.y, pos2.y ); - } - - GRSetDrawMode( aDC, aDrawMode ); - - FILL_T fill = aData ? NO_FILL : m_Fill; - - if( aColor >= 0 ) - fill = NO_FILL; - - if( fill == FILLED_WITH_BG_BODYCOLOR ) - { - GRFilledArc( aPanel->GetClipBox(), aDC, posc.x, posc.y, pt1, pt2, - m_Radius, GetPenSize( ), - (m_Flags & IS_MOVED) ? color : ReturnLayerColor( LAYER_DEVICE_BACKGROUND ), - ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) ); - } - else if( fill == FILLED_SHAPE && !aData ) - { - GRFilledArc( aPanel->GetClipBox(), aDC, posc.x, posc.y, pt1, pt2, m_Radius, - color, color ); - } - else - { - -#ifdef DRAW_ARC_WITH_ANGLE - - GRArc( aPanel->GetClipBox(), aDC, posc.x, posc.y, pt1, pt2, m_Radius, - GetPenSize(), color ); -#else - - GRArc1( aPanel->GetClipBox(), aDC, pos1.x, pos1.y, pos2.x, pos2.y, - posc.x, posc.y, GetPenSize(), color ); -#endif - } - - /* Set to one (1) to draw bounding box around arc to validate bounding box - * calculation. */ -#if 0 - EDA_RECT bBox = GetBoundingBox(); - GRRect( aPanel->GetClipBox(), aDC, bBox.GetOrigin().x, bBox.GetOrigin().y, - bBox.GetEnd().x, bBox.GetEnd().y, 0, LIGHTMAGENTA ); -#endif -} - - -EDA_RECT LIB_ARC::GetBoundingBox() const -{ - int minX, minY, maxX, maxY, angleStart, angleEnd; - EDA_RECT rect; - wxPoint nullPoint, startPos, endPos, centerPos; - wxPoint normStart = m_ArcStart - m_Pos; - wxPoint normEnd = m_ArcEnd - m_Pos; - - if( ( normStart == nullPoint ) || ( normEnd == nullPoint ) || ( m_Radius == 0 ) ) - { - wxLogDebug( wxT("Invalid arc drawing definition, center(%d, %d) \ -start(%d, %d), end(%d, %d), radius %d" ), - m_Pos.x, m_Pos.y, m_ArcStart.x, m_ArcStart.y, m_ArcEnd.x, - m_ArcEnd.y, m_Radius ); - return rect; - } - - endPos = DefaultTransform.TransformCoordinate( m_ArcEnd ); - startPos = DefaultTransform.TransformCoordinate( m_ArcStart ); - centerPos = DefaultTransform.TransformCoordinate( m_Pos ); - angleStart = m_t1; - angleEnd = m_t2; - - if( DefaultTransform.MapAngles( &angleStart, &angleEnd ) ) - { - EXCHG( endPos.x, startPos.x ); - EXCHG( endPos.y, startPos.y ); - } - - /* Start with the start and end point of the arc. */ - minX = MIN( startPos.x, endPos.x ); - minY = MIN( startPos.y, endPos.y ); - maxX = MAX( startPos.x, endPos.x ); - maxY = MAX( startPos.y, endPos.y ); - - /* Zero degrees is a special case. */ - if( angleStart == 0 ) - maxX = centerPos.x + m_Radius; - - /* Arc end angle wrapped passed 360. */ - if( angleStart > angleEnd ) - angleEnd += 3600; - - if( angleStart <= 900 && angleEnd >= 900 ) /* 90 deg */ - maxY = centerPos.y + m_Radius; - - if( angleStart <= 1800 && angleEnd >= 1800 ) /* 180 deg */ - minX = centerPos.x - m_Radius; - - if( angleStart <= 2700 && angleEnd >= 2700 ) /* 270 deg */ - minY = centerPos.y - m_Radius; - - if( angleStart <= 3600 && angleEnd >= 3600 ) /* 0 deg */ - maxX = centerPos.x + m_Radius; - - rect.SetOrigin( minX, minY ); - rect.SetEnd( maxX, maxY ); - rect.Inflate( m_Width / 2, m_Width / 2 ); - - return rect; -} - - -void LIB_ARC::DisplayInfo( EDA_DRAW_FRAME* aFrame ) -{ - wxString msg; - EDA_RECT bBox = GetBoundingBox(); - - LIB_ITEM::DisplayInfo( aFrame ); - - msg = ReturnStringFromValue( g_UserUnit, m_Width, true ); - - aFrame->AppendMsgPanel( _( "Line width" ), msg, BLUE ); - - msg.Printf( wxT( "(%d, %d, %d, %d)" ), bBox.GetOrigin().x, - bBox.GetOrigin().y, bBox.GetEnd().x, bBox.GetEnd().y ); - - aFrame->AppendMsgPanel( _( "Bounding box" ), msg, BROWN ); -} - - -wxString LIB_ARC::GetSelectMenuText() const -{ - return wxString::Format( _( "Arc center (%s, %s), radius %s" ), - GetChars( CoordinateToString( m_Pos.x ) ), - GetChars( CoordinateToString( m_Pos.y ) ), - GetChars( CoordinateToString( m_Radius ) ) ); -} - - -void LIB_ARC::BeginEdit( int aEditMode, const wxPoint aPosition ) -{ - wxCHECK_RET( ( aEditMode & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0, - wxT( "Invalid edit mode for LIB_ARC object." ) ); - - if( aEditMode == IS_NEW ) - { - m_ArcStart = m_ArcEnd = aPosition; - m_editState = m_lastEditState = 1; - } - else if( aEditMode == IS_MOVED ) - { - m_initialPos = m_Pos; - m_initialCursorPos = aPosition; - SetEraseLastDrawItem(); - } - else - { - // The arc center point has to be rotated with while adjusting the - // start or end point, determine the side of this point and the distance - // from the start / end point - wxPoint middlePoint = wxPoint( (m_ArcStart.x + m_ArcEnd.x) / 2, - (m_ArcStart.y + m_ArcEnd.y) / 2 ); - wxPoint centerVector = m_Pos - middlePoint; - wxPoint startEndVector = TwoPointVector( m_ArcStart, m_ArcEnd ); - m_editCenterDistance = EuclideanNorm( centerVector ); - - // Determine on which side is the center point - m_editDirection = CrossProduct( startEndVector, centerVector ) ? 1 : -1; - - // Drag either the start, end point or the outline - if( HitTestPoints( m_ArcStart, aPosition, MINIMUM_SELECTION_DISTANCE ) ) - { - m_editSelectPoint = START; - } - else if( HitTestPoints( m_ArcEnd, aPosition, MINIMUM_SELECTION_DISTANCE ) ) - { - m_editSelectPoint = END; - } - else - { - m_editSelectPoint = OUTLINE; - } - - m_editState = 0; - SetEraseLastDrawItem(); - } - - m_Flags = aEditMode; -} - - -bool LIB_ARC::ContinueEdit( const wxPoint aPosition ) -{ - wxCHECK_MSG( ( m_Flags & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0, false, - wxT( "Bad call to ContinueEdit(). LIB_ARC is not being edited." ) ); - - if( m_Flags == IS_NEW ) - { - if( m_editState == 1 ) // Second position yields the arc segment length. - { - m_ArcEnd = aPosition; - m_editState = 2; - SetEraseLastDrawItem( false ); - return true; // Need third position to calculate center point. - } - } - - return false; -} - - -void LIB_ARC::EndEdit( const wxPoint& aPosition, bool aAbort ) -{ - wxCHECK_RET( ( m_Flags & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0, - wxT( "Bad call to EndEdit(). LIB_ARC is not being edited." ) ); - - SetEraseLastDrawItem( false ); - m_lastEditState = 0; - m_editState = 0; - m_Flags = 0; -} - - -void LIB_ARC::calcEdit( const wxPoint& aPosition ) -{ - if( m_Flags == IS_RESIZED ) - { - wxPoint newCenterPoint, startPos, endPos; - - // Choose the point of the arc to be adjusted - if( m_editSelectPoint == START ) - { - startPos = aPosition; - endPos = m_ArcEnd; - } - else if( m_editSelectPoint == END ) - { - endPos = aPosition; - startPos = m_ArcStart; - } - else - { - // Use the cursor for adjusting the arc curvature - startPos = m_ArcStart; - endPos = m_ArcEnd; - - // If the distance is too small, use the old center point - // else the new center point is calculated over the three points start/end/cursor - if( DistanceLinePoint( startPos, endPos, aPosition ) > MINIMUM_SELECTION_DISTANCE ) - { - newCenterPoint = calcCenter( startPos, aPosition, endPos ); - } - else - { - newCenterPoint = m_Pos; - } - - // Determine if the arc angle is larger than 180 degrees -> this happens if both - // points (cursor position, center point) lie on the same side of the vector - // start-end - int crossA = CrossProduct( TwoPointVector( startPos, endPos ), - TwoPointVector( endPos, aPosition ) ); - int crossB = CrossProduct( TwoPointVector( startPos, endPos ), - TwoPointVector( endPos, newCenterPoint ) ); - - if( ( crossA < 0 && crossB < 0 ) || ( crossA >= 0 && crossB >= 0 ) ) - newCenterPoint = m_Pos; - } - - if( m_editSelectPoint == START || m_editSelectPoint == END ) - { - // Compute the new center point when the start/end points are modified - wxPoint middlePoint = wxPoint( (startPos.x + endPos.x) / 2, - (startPos.y + endPos.y) / 2 ); - - wxPoint startEndVector = TwoPointVector( startPos, endPos ); - wxPoint perpendicularVector = wxPoint( -startEndVector.y, startEndVector.x ); - double lengthPerpendicularVector = EuclideanNorm( perpendicularVector ); - - // prevent too large values, division / 0 - if( lengthPerpendicularVector < 1e-1 ) - lengthPerpendicularVector = 1e-1; - - perpendicularVector.x = (int) ( (double) perpendicularVector.x * - m_editCenterDistance / - lengthPerpendicularVector ) * m_editDirection; - perpendicularVector.y = (int) ( (double) perpendicularVector.y * - m_editCenterDistance / - lengthPerpendicularVector ) * m_editDirection; - - newCenterPoint = middlePoint + perpendicularVector; - - m_ArcStart = startPos; - m_ArcEnd = endPos; - } - - m_Pos = newCenterPoint; - calcRadiusAngles(); - } - else if( m_Flags == IS_NEW ) - { - if( m_editState == 1 ) - { - m_ArcEnd = aPosition; - } - - if( m_editState != m_lastEditState ) - m_lastEditState = m_editState; - - // Keep the arc center point up to date. Otherwise, there will be edit graphic - // artifacts left behind from the initial draw. - int dx, dy; - int cX, cY; - int angle; - - cX = aPosition.x; - cY = aPosition.y; - - dx = m_ArcEnd.x - m_ArcStart.x; - dy = m_ArcEnd.y - m_ArcStart.y; - cX -= m_ArcStart.x; - cY -= m_ArcStart.y; - angle = (int) ( atan2( (double) dy, (double) dx ) * 1800 / M_PI ); - RotatePoint( &dx, &dy, angle ); /* The segment dx, dy is horizontal - * -> Length = dx, dy = 0 */ - RotatePoint( &cX, &cY, angle ); - cX = dx / 2; /* cX, cY is on the median segment 0.0 a dx, 0 */ - - RotatePoint( &cX, &cY, -angle ); - cX += m_ArcStart.x; - cY += m_ArcStart.y; - m_Pos.x = cX; - m_Pos.y = cY; - calcRadiusAngles(); - - SetEraseLastDrawItem(); - } - else if( m_Flags == IS_MOVED ) - { - Move( m_initialPos + aPosition - m_initialCursorPos ); - } -} - - -void LIB_ARC::calcRadiusAngles() -{ - wxPoint centerStartVector = TwoPointVector( m_Pos, m_ArcStart ); - wxPoint centerEndVector = TwoPointVector( m_Pos, m_ArcEnd ); - - m_Radius = KiROUND( EuclideanNorm( centerStartVector ) ); - - m_t1 = (int) ( atan2( (double) centerStartVector.y, - (double) centerStartVector.x ) * 1800 / M_PI ); - - m_t2 = (int) ( atan2( (double) centerEndVector.y, - (double) centerEndVector.x ) * 1800 / M_PI ); - - NORMALIZE_ANGLE_POS( m_t1 ); - NORMALIZE_ANGLE_POS( m_t2 ); // angles = 0 .. 3600 - - // Restrict angle to less than 180 to avoid PBS display mirror Trace because it is - // assumed that the arc is less than 180 deg to find orientation after rotate or mirror. - if( (m_t2 - m_t1) > 1800 ) - m_t2 -= 3600; - else if( (m_t2 - m_t1) <= -1800 ) - m_t2 += 3600; - - while( (m_t2 - m_t1) >= 1800 ) - { - m_t2--; - m_t1++; - } - - while( (m_t1 - m_t2) >= 1800 ) - { - m_t2++; - m_t1--; - } - - NORMALIZE_ANGLE_POS( m_t1 ); - - if( !IsMoving() ) - NORMALIZE_ANGLE_POS( m_t2 ); -} +/* + * This program source code file is part of KiCad, a free EDA CAD application. + * + * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com + * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, you may find one here: + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * or you may search the http://www.gnu.org website for the version 2 license, + * or you may write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/** + * @file lib_arc.cpp + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + + +//! @brief Given three points A B C, compute the circumcenter of the resulting triangle +//! reference: http://en.wikipedia.org/wiki/Circumscribed_circle +//! Coordinates of circumcenter in Cartesian coordinates +static wxPoint calcCenter( const wxPoint& A, const wxPoint& B, const wxPoint& C ) +{ + double circumCenterX, circumCenterY; + double Ax = (double) A.x; + double Ay = (double) A.y; + double Bx = (double) B.x; + double By = (double) B.y; + double Cx = (double) C.x; + double Cy = (double) C.y; + + wxPoint circumCenter; + + double D = 2.0 * ( Ax * ( By - Cy ) + Bx * ( Cy - Ay ) + Cx * ( Ay - By ) ); + + // prevent division / 0 + if( fabs( D ) < 1e-7 ) + D = 1e-7; + + circumCenterX = ( (Ay * Ay + Ax * Ax) * (By - Cy) + + (By * By + Bx * Bx) * (Cy - Ay) + + (Cy * Cy + Cx * Cx) * (Ay - By) ) / D; + + circumCenterY = ( (Ay * Ay + Ax * Ax) * (Cx - Bx) + + (By * By + Bx * Bx) * (Ax - Cx) + + (Cy * Cy + Cx * Cx) * (Bx - Ax) ) / D; + + circumCenter.x = (int) circumCenterX; + circumCenter.y = (int) circumCenterY; + + return circumCenter; +} + + +LIB_ARC::LIB_ARC( LIB_COMPONENT* aParent ) : LIB_ITEM( LIB_ARC_T, aParent ) +{ + m_Radius = 0; + m_t1 = 0; + m_t2 = 0; + m_Width = 0; + m_Fill = NO_FILL; + m_isFillable = true; + m_typeName = _( "Arc" ); + m_editState = 0; + m_lastEditState = 0; +} + + +bool LIB_ARC::Save( OUTPUTFORMATTER& aFormatter ) +{ + int x1 = m_t1; + + if( x1 > 1800 ) + x1 -= 3600; + + int x2 = m_t2; + + if( x2 > 1800 ) + x2 -= 3600; + + aFormatter.Print( 0, "A %d %d %d %d %d %d %d %d %c %d %d %d %d\n", + m_Pos.x, m_Pos.y, m_Radius, x1, x2, m_Unit, m_Convert, m_Width, + fill_tab[m_Fill], m_ArcStart.x, m_ArcStart.y, m_ArcEnd.x, + m_ArcEnd.y ); + + return true; +} + + +bool LIB_ARC::Load( LINE_READER& aLineReader, wxString& aErrorMsg ) +{ + int startx, starty, endx, endy, cnt; + char tmp[256]; + char* line = (char*) aLineReader; + + cnt = sscanf( line + 2, "%d %d %d %d %d %d %d %d %s %d %d %d %d", + &m_Pos.x, &m_Pos.y, &m_Radius, &m_t1, &m_t2, &m_Unit, + &m_Convert, &m_Width, tmp, &startx, &starty, &endx, &endy ); + if( cnt < 8 ) + { + aErrorMsg.Printf( _( "arc only had %d parameters of the required 8" ), cnt ); + return false; + } + + if( tmp[0] == 'F' ) + m_Fill = FILLED_SHAPE; + + if( tmp[0] == 'f' ) + m_Fill = FILLED_WITH_BG_BODYCOLOR; + + NORMALIZE_ANGLE_POS( m_t1 ); + NORMALIZE_ANGLE_POS( m_t2 ); + + // Actual Coordinates of arc ends are read from file + if( cnt >= 13 ) + { + m_ArcStart.x = startx; + m_ArcStart.y = starty; + m_ArcEnd.x = endx; + m_ArcEnd.y = endy; + } + else + { + // Actual Coordinates of arc ends are not read from file + // (old library), calculate them + m_ArcStart.x = m_Radius; + m_ArcStart.y = 0; + m_ArcEnd.x = m_Radius; + m_ArcEnd.y = 0; + RotatePoint( &m_ArcStart.x, &m_ArcStart.y, -m_t1 ); + m_ArcStart.x += m_Pos.x; + m_ArcStart.y += m_Pos.y; + RotatePoint( &m_ArcEnd.x, &m_ArcEnd.y, -m_t2 ); + m_ArcEnd.x += m_Pos.x; + m_ArcEnd.y += m_Pos.y; + } + + return true; +} + + +bool LIB_ARC::HitTest( const wxPoint& aRefPoint ) +{ + int mindist = GetPenSize() / 2; + + // Have a minimal tolerance for hit test + if( mindist < MINIMUM_SELECTION_DISTANCE ) + mindist = MINIMUM_SELECTION_DISTANCE; + + return HitTest( aRefPoint, mindist, DefaultTransform ); +} + + +bool LIB_ARC::HitTest( wxPoint aPosition, int aThreshold, const TRANSFORM& aTransform ) +{ + + if( aThreshold < 0 ) + aThreshold = GetPenSize() / 2; + + // TODO: use aTransMat to calculates parameters + wxPoint relativePosition = aPosition; + + NEGATE( relativePosition.y ); // reverse Y axis + + int distance = KiROUND( EuclideanNorm( TwoPointVector( m_Pos, relativePosition ) ) ); + + if( abs( distance - m_Radius ) > aThreshold ) + return false; + + // We are on the circle, ensure we are only on the arc, i.e. between + // m_ArcStart and m_ArcEnd + + wxPoint startEndVector = TwoPointVector( m_ArcStart, m_ArcEnd); + wxPoint startRelativePositionVector = TwoPointVector( m_ArcStart, relativePosition ); + + wxPoint centerStartVector = TwoPointVector( m_Pos, m_ArcStart ); + wxPoint centerEndVector = TwoPointVector( m_Pos, m_ArcEnd ); + wxPoint centerRelativePositionVector = TwoPointVector( m_Pos, relativePosition ); + + // Compute the cross product to check if the point is in the sector + int crossProductStart = CrossProduct( centerStartVector, centerRelativePositionVector ); + int crossProductEnd = CrossProduct( centerEndVector, centerRelativePositionVector ); + + // The cross products need to be exchanged, depending on which side the center point + // relative to the start point to end point vector lies + if( CrossProduct( startEndVector, startRelativePositionVector ) < 0 ) + { + EXCHG( crossProductStart, crossProductEnd ); + } + + // When the cross products have a different sign, the point lies in sector + // also check, if the reference is near start or end point + return HitTestPoints( m_ArcStart, relativePosition, MINIMUM_SELECTION_DISTANCE ) || + HitTestPoints( m_ArcEnd, relativePosition, MINIMUM_SELECTION_DISTANCE ) || + ( crossProductStart <= 0 && crossProductEnd >= 0 ); +} + + +EDA_ITEM* LIB_ARC::Clone() const +{ + return new LIB_ARC( *this ); +} + + +int LIB_ARC::compare( const LIB_ITEM& aOther ) const +{ + wxASSERT( aOther.Type() == LIB_ARC_T ); + + const LIB_ARC* tmp = ( LIB_ARC* ) &aOther; + + if( m_Pos.x != tmp->m_Pos.x ) + return m_Pos.x - tmp->m_Pos.x; + + if( m_Pos.y != tmp->m_Pos.y ) + return m_Pos.y - tmp->m_Pos.y; + + if( m_t1 != tmp->m_t1 ) + return m_t1 - tmp->m_t1; + + if( m_t2 != tmp->m_t2 ) + return m_t2 - tmp->m_t2; + + return 0; +} + + +void LIB_ARC::SetOffset( const wxPoint& aOffset ) +{ + m_Pos += aOffset; + m_ArcStart += aOffset; + m_ArcEnd += aOffset; +} + + +bool LIB_ARC::Inside( EDA_RECT& aRect ) const +{ + return aRect.Contains( m_ArcStart.x, -m_ArcStart.y ) + || aRect.Contains( m_ArcEnd.x, -m_ArcEnd.y ); +} + + +void LIB_ARC::Move( const wxPoint& aPosition ) +{ + wxPoint offset = aPosition - m_Pos; + m_Pos = aPosition; + m_ArcStart += offset; + m_ArcEnd += offset; +} + + +void LIB_ARC::MirrorHorizontal( const wxPoint& aCenter ) +{ + m_Pos.x -= aCenter.x; + m_Pos.x *= -1; + m_Pos.x += aCenter.x; + m_ArcStart.x -= aCenter.x; + m_ArcStart.x *= -1; + m_ArcStart.x += aCenter.x; + m_ArcEnd.x -= aCenter.x; + m_ArcEnd.x *= -1; + m_ArcEnd.x += aCenter.x; + EXCHG( m_ArcStart, m_ArcEnd ); +} + +void LIB_ARC::MirrorVertical( const wxPoint& aCenter ) +{ + m_Pos.y -= aCenter.y; + m_Pos.y *= -1; + m_Pos.y += aCenter.y; + m_ArcStart.y -= aCenter.y; + m_ArcStart.y *= -1; + m_ArcStart.y += aCenter.y; + m_ArcEnd.y -= aCenter.y; + m_ArcEnd.y *= -1; + m_ArcEnd.y += aCenter.y; + EXCHG( m_ArcStart, m_ArcEnd ); +} + +void LIB_ARC::Rotate( const wxPoint& aCenter, bool aRotateCCW ) +{ + int rot_angle = aRotateCCW ? -900 : 900; + RotatePoint( &m_Pos, aCenter, rot_angle ); + RotatePoint( &m_ArcStart, aCenter, rot_angle ); + RotatePoint( &m_ArcEnd, aCenter, rot_angle ); +} + + + +void LIB_ARC::Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, + const TRANSFORM& aTransform ) +{ + wxASSERT( aPlotter != NULL ); + + int t1 = m_t1; + int t2 = m_t2; + wxPoint pos = aTransform.TransformCoordinate( m_Pos ) + aOffset; + + aTransform.MapAngles( &t1, &t2 ); + + if( aFill && m_Fill == FILLED_WITH_BG_BODYCOLOR ) + { + aPlotter->SetColor( ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) ); + aPlotter->Arc( pos, -t2, -t1, m_Radius, FILLED_SHAPE, 0 ); + } + + bool already_filled = m_Fill == FILLED_WITH_BG_BODYCOLOR; + aPlotter->SetColor( ReturnLayerColor( LAYER_DEVICE ) ); + aPlotter->Arc( pos, -t2, -t1, m_Radius, already_filled ? NO_FILL : m_Fill, GetPenSize() ); +} + + +int LIB_ARC::GetPenSize() const +{ + return ( m_Width == 0 ) ? g_DrawDefaultLineThickness : m_Width; +} + + +void LIB_ARC::drawEditGraphics( EDA_RECT* aClipBox, wxDC* aDC, int aColor ) +{ + // The edit indicators only get drawn when a new arc is being drawn. + if( !IsNew() ) + return; + + // Use the last edit state so when the drawing switches from the end mode to the center + // point mode, the last line between the center points gets erased. + if( m_lastEditState == 1 ) + { + GRLine( aClipBox, aDC, m_ArcStart.x, -m_ArcStart.y, m_ArcEnd.x, -m_ArcEnd.y, 0, aColor ); + } + else + { + GRDashedLine( aClipBox, aDC, m_ArcStart.x, -m_ArcStart.y, m_Pos.x, -m_Pos.y, 0, aColor ); + GRDashedLine( aClipBox, aDC, m_ArcEnd.x, -m_ArcEnd.y, m_Pos.x, -m_Pos.y, 0, aColor ); + } +} + + +void LIB_ARC::drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, + int aColor, int aDrawMode, void* aData, const TRANSFORM& aTransform ) +{ + // Don't draw the arc until the end point is selected. Only the edit indicators + // get drawn at this time. + if( IsNew() && m_lastEditState == 1 ) + return; + + wxPoint pos1, pos2, posc; + int color = ReturnLayerColor( LAYER_DEVICE ); + + if( aColor < 0 ) // Used normal color or selected color + { + if( IsSelected() ) + color = g_ItemSelectetColor; + } + else + { + color = aColor; + } + + pos1 = aTransform.TransformCoordinate( m_ArcEnd ) + aOffset; + pos2 = aTransform.TransformCoordinate( m_ArcStart ) + aOffset; + posc = aTransform.TransformCoordinate( m_Pos ) + aOffset; + int pt1 = m_t1; + int pt2 = m_t2; + bool swap = aTransform.MapAngles( &pt1, &pt2 ); + + if( swap ) + { + EXCHG( pos1.x, pos2.x ); + EXCHG( pos1.y, pos2.y ); + } + + GRSetDrawMode( aDC, aDrawMode ); + + FILL_T fill = aData ? NO_FILL : m_Fill; + + if( aColor >= 0 ) + fill = NO_FILL; + + if( fill == FILLED_WITH_BG_BODYCOLOR ) + { + GRFilledArc( aPanel->GetClipBox(), aDC, posc.x, posc.y, pt1, pt2, + m_Radius, GetPenSize( ), + (m_Flags & IS_MOVED) ? color : ReturnLayerColor( LAYER_DEVICE_BACKGROUND ), + ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) ); + } + else if( fill == FILLED_SHAPE && !aData ) + { + GRFilledArc( aPanel->GetClipBox(), aDC, posc.x, posc.y, pt1, pt2, m_Radius, + color, color ); + } + else + { + +#ifdef DRAW_ARC_WITH_ANGLE + + GRArc( aPanel->GetClipBox(), aDC, posc.x, posc.y, pt1, pt2, m_Radius, + GetPenSize(), color ); +#else + + GRArc1( aPanel->GetClipBox(), aDC, pos1.x, pos1.y, pos2.x, pos2.y, + posc.x, posc.y, GetPenSize(), color ); +#endif + } + + /* Set to one (1) to draw bounding box around arc to validate bounding box + * calculation. */ +#if 0 + EDA_RECT bBox = GetBoundingBox(); + GRRect( aPanel->GetClipBox(), aDC, bBox.GetOrigin().x, bBox.GetOrigin().y, + bBox.GetEnd().x, bBox.GetEnd().y, 0, LIGHTMAGENTA ); +#endif +} + + +EDA_RECT LIB_ARC::GetBoundingBox() const +{ + int minX, minY, maxX, maxY, angleStart, angleEnd; + EDA_RECT rect; + wxPoint nullPoint, startPos, endPos, centerPos; + wxPoint normStart = m_ArcStart - m_Pos; + wxPoint normEnd = m_ArcEnd - m_Pos; + + if( ( normStart == nullPoint ) || ( normEnd == nullPoint ) || ( m_Radius == 0 ) ) + { + wxLogDebug( wxT("Invalid arc drawing definition, center(%d, %d) \ +start(%d, %d), end(%d, %d), radius %d" ), + m_Pos.x, m_Pos.y, m_ArcStart.x, m_ArcStart.y, m_ArcEnd.x, + m_ArcEnd.y, m_Radius ); + return rect; + } + + endPos = DefaultTransform.TransformCoordinate( m_ArcEnd ); + startPos = DefaultTransform.TransformCoordinate( m_ArcStart ); + centerPos = DefaultTransform.TransformCoordinate( m_Pos ); + angleStart = m_t1; + angleEnd = m_t2; + + if( DefaultTransform.MapAngles( &angleStart, &angleEnd ) ) + { + EXCHG( endPos.x, startPos.x ); + EXCHG( endPos.y, startPos.y ); + } + + /* Start with the start and end point of the arc. */ + minX = MIN( startPos.x, endPos.x ); + minY = MIN( startPos.y, endPos.y ); + maxX = MAX( startPos.x, endPos.x ); + maxY = MAX( startPos.y, endPos.y ); + + /* Zero degrees is a special case. */ + if( angleStart == 0 ) + maxX = centerPos.x + m_Radius; + + /* Arc end angle wrapped passed 360. */ + if( angleStart > angleEnd ) + angleEnd += 3600; + + if( angleStart <= 900 && angleEnd >= 900 ) /* 90 deg */ + maxY = centerPos.y + m_Radius; + + if( angleStart <= 1800 && angleEnd >= 1800 ) /* 180 deg */ + minX = centerPos.x - m_Radius; + + if( angleStart <= 2700 && angleEnd >= 2700 ) /* 270 deg */ + minY = centerPos.y - m_Radius; + + if( angleStart <= 3600 && angleEnd >= 3600 ) /* 0 deg */ + maxX = centerPos.x + m_Radius; + + rect.SetOrigin( minX, minY ); + rect.SetEnd( maxX, maxY ); + rect.Inflate( m_Width / 2, m_Width / 2 ); + + return rect; +} + + +void LIB_ARC::DisplayInfo( EDA_DRAW_FRAME* aFrame ) +{ + wxString msg; + EDA_RECT bBox = GetBoundingBox(); + + LIB_ITEM::DisplayInfo( aFrame ); + + msg = ReturnStringFromValue( g_UserUnit, m_Width, true ); + + aFrame->AppendMsgPanel( _( "Line width" ), msg, BLUE ); + + msg.Printf( wxT( "(%d, %d, %d, %d)" ), bBox.GetOrigin().x, + bBox.GetOrigin().y, bBox.GetEnd().x, bBox.GetEnd().y ); + + aFrame->AppendMsgPanel( _( "Bounding box" ), msg, BROWN ); +} + + +wxString LIB_ARC::GetSelectMenuText() const +{ + return wxString::Format( _( "Arc center (%s, %s), radius %s" ), + GetChars( CoordinateToString( m_Pos.x ) ), + GetChars( CoordinateToString( m_Pos.y ) ), + GetChars( CoordinateToString( m_Radius ) ) ); +} + + +void LIB_ARC::BeginEdit( int aEditMode, const wxPoint aPosition ) +{ + wxCHECK_RET( ( aEditMode & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0, + wxT( "Invalid edit mode for LIB_ARC object." ) ); + + if( aEditMode == IS_NEW ) + { + m_ArcStart = m_ArcEnd = aPosition; + m_editState = m_lastEditState = 1; + } + else if( aEditMode == IS_MOVED ) + { + m_initialPos = m_Pos; + m_initialCursorPos = aPosition; + SetEraseLastDrawItem(); + } + else + { + // The arc center point has to be rotated with while adjusting the + // start or end point, determine the side of this point and the distance + // from the start / end point + wxPoint middlePoint = wxPoint( (m_ArcStart.x + m_ArcEnd.x) / 2, + (m_ArcStart.y + m_ArcEnd.y) / 2 ); + wxPoint centerVector = m_Pos - middlePoint; + wxPoint startEndVector = TwoPointVector( m_ArcStart, m_ArcEnd ); + m_editCenterDistance = EuclideanNorm( centerVector ); + + // Determine on which side is the center point + m_editDirection = CrossProduct( startEndVector, centerVector ) ? 1 : -1; + + // Drag either the start, end point or the outline + if( HitTestPoints( m_ArcStart, aPosition, MINIMUM_SELECTION_DISTANCE ) ) + { + m_editSelectPoint = START; + } + else if( HitTestPoints( m_ArcEnd, aPosition, MINIMUM_SELECTION_DISTANCE ) ) + { + m_editSelectPoint = END; + } + else + { + m_editSelectPoint = OUTLINE; + } + + m_editState = 0; + SetEraseLastDrawItem(); + } + + m_Flags = aEditMode; +} + + +bool LIB_ARC::ContinueEdit( const wxPoint aPosition ) +{ + wxCHECK_MSG( ( m_Flags & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0, false, + wxT( "Bad call to ContinueEdit(). LIB_ARC is not being edited." ) ); + + if( m_Flags == IS_NEW ) + { + if( m_editState == 1 ) // Second position yields the arc segment length. + { + m_ArcEnd = aPosition; + m_editState = 2; + SetEraseLastDrawItem( false ); + return true; // Need third position to calculate center point. + } + } + + return false; +} + + +void LIB_ARC::EndEdit( const wxPoint& aPosition, bool aAbort ) +{ + wxCHECK_RET( ( m_Flags & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0, + wxT( "Bad call to EndEdit(). LIB_ARC is not being edited." ) ); + + SetEraseLastDrawItem( false ); + m_lastEditState = 0; + m_editState = 0; + m_Flags = 0; +} + + +void LIB_ARC::calcEdit( const wxPoint& aPosition ) +{ + if( m_Flags == IS_RESIZED ) + { + wxPoint newCenterPoint, startPos, endPos; + + // Choose the point of the arc to be adjusted + if( m_editSelectPoint == START ) + { + startPos = aPosition; + endPos = m_ArcEnd; + } + else if( m_editSelectPoint == END ) + { + endPos = aPosition; + startPos = m_ArcStart; + } + else + { + // Use the cursor for adjusting the arc curvature + startPos = m_ArcStart; + endPos = m_ArcEnd; + + // If the distance is too small, use the old center point + // else the new center point is calculated over the three points start/end/cursor + if( DistanceLinePoint( startPos, endPos, aPosition ) > MINIMUM_SELECTION_DISTANCE ) + { + newCenterPoint = calcCenter( startPos, aPosition, endPos ); + } + else + { + newCenterPoint = m_Pos; + } + + // Determine if the arc angle is larger than 180 degrees -> this happens if both + // points (cursor position, center point) lie on the same side of the vector + // start-end + int crossA = CrossProduct( TwoPointVector( startPos, endPos ), + TwoPointVector( endPos, aPosition ) ); + int crossB = CrossProduct( TwoPointVector( startPos, endPos ), + TwoPointVector( endPos, newCenterPoint ) ); + + if( ( crossA < 0 && crossB < 0 ) || ( crossA >= 0 && crossB >= 0 ) ) + newCenterPoint = m_Pos; + } + + if( m_editSelectPoint == START || m_editSelectPoint == END ) + { + // Compute the new center point when the start/end points are modified + wxPoint middlePoint = wxPoint( (startPos.x + endPos.x) / 2, + (startPos.y + endPos.y) / 2 ); + + wxPoint startEndVector = TwoPointVector( startPos, endPos ); + wxPoint perpendicularVector = wxPoint( -startEndVector.y, startEndVector.x ); + double lengthPerpendicularVector = EuclideanNorm( perpendicularVector ); + + // prevent too large values, division / 0 + if( lengthPerpendicularVector < 1e-1 ) + lengthPerpendicularVector = 1e-1; + + perpendicularVector.x = (int) ( (double) perpendicularVector.x * + m_editCenterDistance / + lengthPerpendicularVector ) * m_editDirection; + perpendicularVector.y = (int) ( (double) perpendicularVector.y * + m_editCenterDistance / + lengthPerpendicularVector ) * m_editDirection; + + newCenterPoint = middlePoint + perpendicularVector; + + m_ArcStart = startPos; + m_ArcEnd = endPos; + } + + m_Pos = newCenterPoint; + calcRadiusAngles(); + } + else if( m_Flags == IS_NEW ) + { + if( m_editState == 1 ) + { + m_ArcEnd = aPosition; + } + + if( m_editState != m_lastEditState ) + m_lastEditState = m_editState; + + // Keep the arc center point up to date. Otherwise, there will be edit graphic + // artifacts left behind from the initial draw. + int dx, dy; + int cX, cY; + int angle; + + cX = aPosition.x; + cY = aPosition.y; + + dx = m_ArcEnd.x - m_ArcStart.x; + dy = m_ArcEnd.y - m_ArcStart.y; + cX -= m_ArcStart.x; + cY -= m_ArcStart.y; + angle = (int) ( atan2( (double) dy, (double) dx ) * 1800 / M_PI ); + RotatePoint( &dx, &dy, angle ); /* The segment dx, dy is horizontal + * -> Length = dx, dy = 0 */ + RotatePoint( &cX, &cY, angle ); + cX = dx / 2; /* cX, cY is on the median segment 0.0 a dx, 0 */ + + RotatePoint( &cX, &cY, -angle ); + cX += m_ArcStart.x; + cY += m_ArcStart.y; + m_Pos.x = cX; + m_Pos.y = cY; + calcRadiusAngles(); + + SetEraseLastDrawItem(); + } + else if( m_Flags == IS_MOVED ) + { + Move( m_initialPos + aPosition - m_initialCursorPos ); + } +} + + +void LIB_ARC::calcRadiusAngles() +{ + wxPoint centerStartVector = TwoPointVector( m_Pos, m_ArcStart ); + wxPoint centerEndVector = TwoPointVector( m_Pos, m_ArcEnd ); + + m_Radius = KiROUND( EuclideanNorm( centerStartVector ) ); + + m_t1 = (int) ( atan2( (double) centerStartVector.y, + (double) centerStartVector.x ) * 1800 / M_PI ); + + m_t2 = (int) ( atan2( (double) centerEndVector.y, + (double) centerEndVector.x ) * 1800 / M_PI ); + + NORMALIZE_ANGLE_POS( m_t1 ); + NORMALIZE_ANGLE_POS( m_t2 ); // angles = 0 .. 3600 + + // Restrict angle to less than 180 to avoid PBS display mirror Trace because it is + // assumed that the arc is less than 180 deg to find orientation after rotate or mirror. + if( (m_t2 - m_t1) > 1800 ) + m_t2 -= 3600; + else if( (m_t2 - m_t1) <= -1800 ) + m_t2 += 3600; + + while( (m_t2 - m_t1) >= 1800 ) + { + m_t2--; + m_t1++; + } + + while( (m_t1 - m_t2) >= 1800 ) + { + m_t2++; + m_t1--; + } + + NORMALIZE_ANGLE_POS( m_t1 ); + + if( !IsMoving() ) + NORMALIZE_ANGLE_POS( m_t2 ); +} diff --git a/eeschema/lib_bezier.cpp b/eeschema/lib_bezier.cpp index 1c1bcc41dd..66c1a05ad2 100644 --- a/eeschema/lib_bezier.cpp +++ b/eeschema/lib_bezier.cpp @@ -270,12 +270,12 @@ void LIB_BEZIER::Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, if( aFill && m_Fill == FILLED_WITH_BG_BODYCOLOR ) { - aPlotter->set_color( ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) ); + aPlotter->SetColor( ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) ); aPlotter->PlotPoly( cornerList, FILLED_WITH_BG_BODYCOLOR, 0 ); } bool already_filled = m_Fill == FILLED_WITH_BG_BODYCOLOR; - aPlotter->set_color( ReturnLayerColor( LAYER_DEVICE ) ); + aPlotter->SetColor( ReturnLayerColor( LAYER_DEVICE ) ); aPlotter->PlotPoly( cornerList, already_filled ? NO_FILL : m_Fill, GetPenSize() ); } diff --git a/eeschema/lib_circle.cpp b/eeschema/lib_circle.cpp index 327420a2d8..8b05d3eaf1 100644 --- a/eeschema/lib_circle.cpp +++ b/eeschema/lib_circle.cpp @@ -1,355 +1,355 @@ -/* - * This program source code file is part of KiCad, a free EDA CAD application. - * - * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com - * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/** - * @file lib_circle.cpp - * @brief LIB_CIRCLE class implementation. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - - -LIB_CIRCLE::LIB_CIRCLE( LIB_COMPONENT* aParent ) : - LIB_ITEM( LIB_CIRCLE_T, aParent ) -{ - m_Radius = 0; - m_Width = 0; - m_Fill = NO_FILL; - m_isFillable = true; - m_typeName = _( "Circle" ); -} - - -bool LIB_CIRCLE::Save( OUTPUTFORMATTER& aFormatter ) -{ - aFormatter.Print( 0, "C %d %d %d %d %d %d %c\n", m_Pos.x, m_Pos.y, - m_Radius, m_Unit, m_Convert, m_Width, fill_tab[m_Fill] ); - - return true; -} - - -bool LIB_CIRCLE::Load( LINE_READER& aLineReader, wxString& aErrorMsg ) -{ - char tmp[256]; - char* line = (char*) aLineReader; - - int cnt = sscanf( line + 2, "%d %d %d %d %d %d %s", &m_Pos.x, &m_Pos.y, - &m_Radius, &m_Unit, &m_Convert, &m_Width, tmp ); - - if( cnt < 6 ) - { - aErrorMsg.Printf( _( "circle only had %d parameters of the required 6" ), cnt ); - return false; - } - - if( tmp[0] == 'F' ) - m_Fill = FILLED_SHAPE; - - if( tmp[0] == 'f' ) - m_Fill = FILLED_WITH_BG_BODYCOLOR; - - return true; -} - - -bool LIB_CIRCLE::HitTest( const wxPoint& aPosRef ) -{ - int mindist = GetPenSize() / 2; - - // Have a minimal tolerance for hit test - if( mindist < MINIMUM_SELECTION_DISTANCE ) - mindist = MINIMUM_SELECTION_DISTANCE; - - return HitTest( aPosRef, mindist, DefaultTransform ); -} - - -bool LIB_CIRCLE::HitTest( wxPoint aPosRef, int aThreshold, const TRANSFORM& aTransform ) -{ - if( aThreshold < 0 ) - aThreshold = GetPenSize() / 2; - - wxPoint relpos = aPosRef - aTransform.TransformCoordinate( m_Pos ); - - int dist = KiROUND( sqrt( ( (double) relpos.x * relpos.x ) + - ( (double) relpos.y * relpos.y ) ) ); - - if( abs( dist - m_Radius ) <= aThreshold ) - return true; - return false; -} - - -EDA_ITEM* LIB_CIRCLE::Clone() const -{ - return new LIB_CIRCLE( *this ); -} - - -int LIB_CIRCLE::compare( const LIB_ITEM& aOther ) const -{ - wxASSERT( aOther.Type() == LIB_CIRCLE_T ); - - const LIB_CIRCLE* tmp = ( LIB_CIRCLE* ) &aOther; - - if( m_Pos.x != tmp->m_Pos.x ) - return m_Pos.x - tmp->m_Pos.x; - - if( m_Pos.y != tmp->m_Pos.y ) - return m_Pos.y - tmp->m_Pos.y; - - if( m_Radius != tmp->m_Radius ) - return m_Radius - tmp->m_Radius; - - return 0; -} - - -void LIB_CIRCLE::SetOffset( const wxPoint& aOffset ) -{ - m_Pos += aOffset; -} - - -bool LIB_CIRCLE::Inside( EDA_RECT& aRect ) const -{ - /* - * FIXME: This fails to take into account the radius around the center - * point. - */ - return aRect.Contains( m_Pos.x, -m_Pos.y ); -} - - -void LIB_CIRCLE::Move( const wxPoint& aPosition ) -{ - m_Pos = aPosition; -} - - -void LIB_CIRCLE::MirrorHorizontal( const wxPoint& aCenter ) -{ - m_Pos.x -= aCenter.x; - m_Pos.x *= -1; - m_Pos.x += aCenter.x; -} - - -void LIB_CIRCLE::MirrorVertical( const wxPoint& aCenter ) -{ - m_Pos.y -= aCenter.y; - m_Pos.y *= -1; - m_Pos.y += aCenter.y; -} - - -void LIB_CIRCLE::Rotate( const wxPoint& aCenter, bool aRotateCCW ) -{ - int rot_angle = aRotateCCW ? -900 : 900; - - RotatePoint( &m_Pos, aCenter, rot_angle ); -} - - -void LIB_CIRCLE::Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, - const TRANSFORM& aTransform ) -{ - wxPoint pos = aTransform.TransformCoordinate( m_Pos ) + aOffset; - - if( aFill && m_Fill == FILLED_WITH_BG_BODYCOLOR ) - { - aPlotter->set_color( ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) ); - aPlotter->circle( pos, m_Radius * 2, FILLED_SHAPE, 0 ); - } - - bool already_filled = m_Fill == FILLED_WITH_BG_BODYCOLOR; - aPlotter->set_color( ReturnLayerColor( LAYER_DEVICE ) ); - aPlotter->circle( pos, m_Radius * 2, already_filled ? NO_FILL : m_Fill, GetPenSize() ); -} - - -int LIB_CIRCLE::GetPenSize() const -{ - return ( m_Width == 0 ) ? g_DrawDefaultLineThickness : m_Width; -} - - -void LIB_CIRCLE::drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, - int aColor, int aDrawMode, void* aData, const TRANSFORM& aTransform ) -{ - wxPoint pos1; - - int color = ReturnLayerColor( LAYER_DEVICE ); - - if( aColor < 0 ) // Used normal color or selected color - { - if( IsSelected() ) - color = g_ItemSelectetColor; - } - else - { - color = aColor; - } - - pos1 = aTransform.TransformCoordinate( m_Pos ) + aOffset; - GRSetDrawMode( aDC, aDrawMode ); - - FILL_T fill = aData ? NO_FILL : m_Fill; - if( aColor >= 0 ) - fill = NO_FILL; - - if( fill == FILLED_WITH_BG_BODYCOLOR ) - GRFilledCircle( aPanel->GetClipBox(), aDC, pos1.x, pos1.y, m_Radius, GetPenSize(), - (m_Flags & IS_MOVED) ? color : ReturnLayerColor( LAYER_DEVICE_BACKGROUND ), - ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) ); - else if( fill == FILLED_SHAPE ) - GRFilledCircle( aPanel->GetClipBox(), aDC, pos1.x, pos1.y, m_Radius, 0, color, color ); - else - GRCircle( aPanel->GetClipBox(), aDC, pos1.x, pos1.y, m_Radius, GetPenSize(), color ); - - /* Set to one (1) to draw bounding box around circle to validate bounding - * box calculation. */ -#if 0 - EDA_RECT bBox = GetBoundingBox(); - GRRect( aPanel->GetClipBox(), aDC, bBox.GetOrigin().x, bBox.GetOrigin().y, - bBox.GetEnd().x, bBox.GetEnd().y, 0, LIGHTMAGENTA ); -#endif -} - - -EDA_RECT LIB_CIRCLE::GetBoundingBox() const -{ - EDA_RECT rect; - - rect.SetOrigin( m_Pos.x - m_Radius, ( m_Pos.y - m_Radius ) * -1 ); - rect.SetEnd( m_Pos.x + m_Radius, ( m_Pos.y + m_Radius ) * -1 ); - rect.Inflate( m_Width / 2, m_Width / 2 ); - - return rect; -} - - -void LIB_CIRCLE::DisplayInfo( EDA_DRAW_FRAME* aFrame ) -{ - wxString msg; - EDA_RECT bBox = GetBoundingBox(); - - LIB_ITEM::DisplayInfo( aFrame ); - - msg = ReturnStringFromValue( g_UserUnit, m_Width, true ); - - aFrame->AppendMsgPanel( _( "Line width" ), msg, BLUE ); - - msg = ReturnStringFromValue( g_UserUnit, m_Radius, true ); - aFrame->AppendMsgPanel( _( "Radius" ), msg, RED ); - - msg.Printf( wxT( "(%d, %d, %d, %d)" ), bBox.GetOrigin().x, - bBox.GetOrigin().y, bBox.GetEnd().x, bBox.GetEnd().y ); - - aFrame->AppendMsgPanel( _( "Bounding box" ), msg, BROWN ); -} - - -wxString LIB_CIRCLE::GetSelectMenuText() const -{ - return wxString::Format( _( "Circle center (%s, %s), radius %s" ), - GetChars( CoordinateToString( m_Pos.x ) ), - GetChars( CoordinateToString( m_Pos.y ) ), - GetChars( CoordinateToString( m_Radius ) ) ); -} - - -void LIB_CIRCLE::BeginEdit( int aEditMode, const wxPoint aPosition ) -{ - wxCHECK_RET( ( aEditMode & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0, - wxT( "Invalid edit mode for LIB_CIRCLE object." ) ); - - if( aEditMode == IS_NEW ) - { - m_Pos = m_initialPos = aPosition; - } - else if( aEditMode == IS_MOVED ) - { - m_initialPos = m_Pos; - m_initialCursorPos = aPosition; - SetEraseLastDrawItem(); - } - else if( aEditMode == IS_RESIZED ) - { - SetEraseLastDrawItem(); - } - - m_Flags = aEditMode; -} - - -bool LIB_CIRCLE::ContinueEdit( const wxPoint aPosition ) -{ - wxCHECK_MSG( ( m_Flags & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0, false, - wxT( "Bad call to ContinueEdit(). LIB_CIRCLE is not being edited." ) ); - - return false; -} - - -void LIB_CIRCLE::EndEdit( const wxPoint& aPosition, bool aAbort ) -{ - wxCHECK_RET( ( m_Flags & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0, - wxT( "Bad call to EndEdit(). LIB_CIRCLE is not being edited." ) ); - - SetEraseLastDrawItem( false ); - m_Flags = 0; -} - - -void LIB_CIRCLE::calcEdit( const wxPoint& aPosition ) -{ - if( m_Flags == IS_NEW || m_Flags == IS_RESIZED ) - { - if( m_Flags == IS_NEW ) - SetEraseLastDrawItem(); - - int dx = m_Pos.x - aPosition.x; - int dy = m_Pos.y - aPosition.y; - m_Radius = KiROUND( sqrt( ( (double) dx * dx ) + ( (double) dy * dy ) ) ); - } - else - { - Move( m_initialPos + aPosition - m_initialCursorPos ); - } -} +/* + * This program source code file is part of KiCad, a free EDA CAD application. + * + * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com + * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, you may find one here: + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * or you may search the http://www.gnu.org website for the version 2 license, + * or you may write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/** + * @file lib_circle.cpp + * @brief LIB_CIRCLE class implementation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + + +LIB_CIRCLE::LIB_CIRCLE( LIB_COMPONENT* aParent ) : + LIB_ITEM( LIB_CIRCLE_T, aParent ) +{ + m_Radius = 0; + m_Width = 0; + m_Fill = NO_FILL; + m_isFillable = true; + m_typeName = _( "Circle" ); +} + + +bool LIB_CIRCLE::Save( OUTPUTFORMATTER& aFormatter ) +{ + aFormatter.Print( 0, "C %d %d %d %d %d %d %c\n", m_Pos.x, m_Pos.y, + m_Radius, m_Unit, m_Convert, m_Width, fill_tab[m_Fill] ); + + return true; +} + + +bool LIB_CIRCLE::Load( LINE_READER& aLineReader, wxString& aErrorMsg ) +{ + char tmp[256]; + char* line = (char*) aLineReader; + + int cnt = sscanf( line + 2, "%d %d %d %d %d %d %s", &m_Pos.x, &m_Pos.y, + &m_Radius, &m_Unit, &m_Convert, &m_Width, tmp ); + + if( cnt < 6 ) + { + aErrorMsg.Printf( _( "circle only had %d parameters of the required 6" ), cnt ); + return false; + } + + if( tmp[0] == 'F' ) + m_Fill = FILLED_SHAPE; + + if( tmp[0] == 'f' ) + m_Fill = FILLED_WITH_BG_BODYCOLOR; + + return true; +} + + +bool LIB_CIRCLE::HitTest( const wxPoint& aPosRef ) +{ + int mindist = GetPenSize() / 2; + + // Have a minimal tolerance for hit test + if( mindist < MINIMUM_SELECTION_DISTANCE ) + mindist = MINIMUM_SELECTION_DISTANCE; + + return HitTest( aPosRef, mindist, DefaultTransform ); +} + + +bool LIB_CIRCLE::HitTest( wxPoint aPosRef, int aThreshold, const TRANSFORM& aTransform ) +{ + if( aThreshold < 0 ) + aThreshold = GetPenSize() / 2; + + wxPoint relpos = aPosRef - aTransform.TransformCoordinate( m_Pos ); + + int dist = KiROUND( sqrt( ( (double) relpos.x * relpos.x ) + + ( (double) relpos.y * relpos.y ) ) ); + + if( abs( dist - m_Radius ) <= aThreshold ) + return true; + return false; +} + + +EDA_ITEM* LIB_CIRCLE::Clone() const +{ + return new LIB_CIRCLE( *this ); +} + + +int LIB_CIRCLE::compare( const LIB_ITEM& aOther ) const +{ + wxASSERT( aOther.Type() == LIB_CIRCLE_T ); + + const LIB_CIRCLE* tmp = ( LIB_CIRCLE* ) &aOther; + + if( m_Pos.x != tmp->m_Pos.x ) + return m_Pos.x - tmp->m_Pos.x; + + if( m_Pos.y != tmp->m_Pos.y ) + return m_Pos.y - tmp->m_Pos.y; + + if( m_Radius != tmp->m_Radius ) + return m_Radius - tmp->m_Radius; + + return 0; +} + + +void LIB_CIRCLE::SetOffset( const wxPoint& aOffset ) +{ + m_Pos += aOffset; +} + + +bool LIB_CIRCLE::Inside( EDA_RECT& aRect ) const +{ + /* + * FIXME: This fails to take into account the radius around the center + * point. + */ + return aRect.Contains( m_Pos.x, -m_Pos.y ); +} + + +void LIB_CIRCLE::Move( const wxPoint& aPosition ) +{ + m_Pos = aPosition; +} + + +void LIB_CIRCLE::MirrorHorizontal( const wxPoint& aCenter ) +{ + m_Pos.x -= aCenter.x; + m_Pos.x *= -1; + m_Pos.x += aCenter.x; +} + + +void LIB_CIRCLE::MirrorVertical( const wxPoint& aCenter ) +{ + m_Pos.y -= aCenter.y; + m_Pos.y *= -1; + m_Pos.y += aCenter.y; +} + + +void LIB_CIRCLE::Rotate( const wxPoint& aCenter, bool aRotateCCW ) +{ + int rot_angle = aRotateCCW ? -900 : 900; + + RotatePoint( &m_Pos, aCenter, rot_angle ); +} + + +void LIB_CIRCLE::Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, + const TRANSFORM& aTransform ) +{ + wxPoint pos = aTransform.TransformCoordinate( m_Pos ) + aOffset; + + if( aFill && m_Fill == FILLED_WITH_BG_BODYCOLOR ) + { + aPlotter->SetColor( ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) ); + aPlotter->Circle( pos, m_Radius * 2, FILLED_SHAPE, 0 ); + } + + bool already_filled = m_Fill == FILLED_WITH_BG_BODYCOLOR; + aPlotter->SetColor( ReturnLayerColor( LAYER_DEVICE ) ); + aPlotter->Circle( pos, m_Radius * 2, already_filled ? NO_FILL : m_Fill, GetPenSize() ); +} + + +int LIB_CIRCLE::GetPenSize() const +{ + return ( m_Width == 0 ) ? g_DrawDefaultLineThickness : m_Width; +} + + +void LIB_CIRCLE::drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, + int aColor, int aDrawMode, void* aData, const TRANSFORM& aTransform ) +{ + wxPoint pos1; + + int color = ReturnLayerColor( LAYER_DEVICE ); + + if( aColor < 0 ) // Used normal color or selected color + { + if( IsSelected() ) + color = g_ItemSelectetColor; + } + else + { + color = aColor; + } + + pos1 = aTransform.TransformCoordinate( m_Pos ) + aOffset; + GRSetDrawMode( aDC, aDrawMode ); + + FILL_T fill = aData ? NO_FILL : m_Fill; + if( aColor >= 0 ) + fill = NO_FILL; + + if( fill == FILLED_WITH_BG_BODYCOLOR ) + GRFilledCircle( aPanel->GetClipBox(), aDC, pos1.x, pos1.y, m_Radius, GetPenSize(), + (m_Flags & IS_MOVED) ? color : ReturnLayerColor( LAYER_DEVICE_BACKGROUND ), + ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) ); + else if( fill == FILLED_SHAPE ) + GRFilledCircle( aPanel->GetClipBox(), aDC, pos1.x, pos1.y, m_Radius, 0, color, color ); + else + GRCircle( aPanel->GetClipBox(), aDC, pos1.x, pos1.y, m_Radius, GetPenSize(), color ); + + /* Set to one (1) to draw bounding box around circle to validate bounding + * box calculation. */ +#if 0 + EDA_RECT bBox = GetBoundingBox(); + GRRect( aPanel->GetClipBox(), aDC, bBox.GetOrigin().x, bBox.GetOrigin().y, + bBox.GetEnd().x, bBox.GetEnd().y, 0, LIGHTMAGENTA ); +#endif +} + + +EDA_RECT LIB_CIRCLE::GetBoundingBox() const +{ + EDA_RECT rect; + + rect.SetOrigin( m_Pos.x - m_Radius, ( m_Pos.y - m_Radius ) * -1 ); + rect.SetEnd( m_Pos.x + m_Radius, ( m_Pos.y + m_Radius ) * -1 ); + rect.Inflate( m_Width / 2, m_Width / 2 ); + + return rect; +} + + +void LIB_CIRCLE::DisplayInfo( EDA_DRAW_FRAME* aFrame ) +{ + wxString msg; + EDA_RECT bBox = GetBoundingBox(); + + LIB_ITEM::DisplayInfo( aFrame ); + + msg = ReturnStringFromValue( g_UserUnit, m_Width, true ); + + aFrame->AppendMsgPanel( _( "Line width" ), msg, BLUE ); + + msg = ReturnStringFromValue( g_UserUnit, m_Radius, true ); + aFrame->AppendMsgPanel( _( "Radius" ), msg, RED ); + + msg.Printf( wxT( "(%d, %d, %d, %d)" ), bBox.GetOrigin().x, + bBox.GetOrigin().y, bBox.GetEnd().x, bBox.GetEnd().y ); + + aFrame->AppendMsgPanel( _( "Bounding box" ), msg, BROWN ); +} + + +wxString LIB_CIRCLE::GetSelectMenuText() const +{ + return wxString::Format( _( "Circle center (%s, %s), radius %s" ), + GetChars( CoordinateToString( m_Pos.x ) ), + GetChars( CoordinateToString( m_Pos.y ) ), + GetChars( CoordinateToString( m_Radius ) ) ); +} + + +void LIB_CIRCLE::BeginEdit( int aEditMode, const wxPoint aPosition ) +{ + wxCHECK_RET( ( aEditMode & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0, + wxT( "Invalid edit mode for LIB_CIRCLE object." ) ); + + if( aEditMode == IS_NEW ) + { + m_Pos = m_initialPos = aPosition; + } + else if( aEditMode == IS_MOVED ) + { + m_initialPos = m_Pos; + m_initialCursorPos = aPosition; + SetEraseLastDrawItem(); + } + else if( aEditMode == IS_RESIZED ) + { + SetEraseLastDrawItem(); + } + + m_Flags = aEditMode; +} + + +bool LIB_CIRCLE::ContinueEdit( const wxPoint aPosition ) +{ + wxCHECK_MSG( ( m_Flags & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0, false, + wxT( "Bad call to ContinueEdit(). LIB_CIRCLE is not being edited." ) ); + + return false; +} + + +void LIB_CIRCLE::EndEdit( const wxPoint& aPosition, bool aAbort ) +{ + wxCHECK_RET( ( m_Flags & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0, + wxT( "Bad call to EndEdit(). LIB_CIRCLE is not being edited." ) ); + + SetEraseLastDrawItem( false ); + m_Flags = 0; +} + + +void LIB_CIRCLE::calcEdit( const wxPoint& aPosition ) +{ + if( m_Flags == IS_NEW || m_Flags == IS_RESIZED ) + { + if( m_Flags == IS_NEW ) + SetEraseLastDrawItem(); + + int dx = m_Pos.x - aPosition.x; + int dy = m_Pos.y - aPosition.y; + m_Radius = KiROUND( sqrt( ( (double) dx * dx ) + ( (double) dy * dy ) ) ); + } + else + { + Move( m_initialPos + aPosition - m_initialCursorPos ); + } +} diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp index 4e64347c16..81435e9e84 100644 --- a/eeschema/lib_pin.cpp +++ b/eeschema/lib_pin.cpp @@ -1275,7 +1275,7 @@ void LIB_PIN::PlotSymbol( PLOTTER* aPlotter, const wxPoint& aPosition, int aOrie color = ReturnLayerColor( LAYER_PIN ); - aPlotter->set_color( color ); + aPlotter->SetColor( color ); MapX1 = MapY1 = 0; x1 = aPosition.x; y1 = aPosition.y; @@ -1305,35 +1305,35 @@ void LIB_PIN::PlotSymbol( PLOTTER* aPlotter, const wxPoint& aPosition, int aOrie if( m_shape & INVERT ) { - aPlotter->circle( wxPoint( MapX1 * INVERT_PIN_RADIUS + x1, + aPlotter->Circle( wxPoint( MapX1 * INVERT_PIN_RADIUS + x1, MapY1 * INVERT_PIN_RADIUS + y1 ), INVERT_PIN_RADIUS * 2, // diameter NO_FILL, // fill -1 ); // width - aPlotter->move_to( wxPoint( MapX1 * INVERT_PIN_RADIUS * 2 + x1, + aPlotter->MoveTo( wxPoint( MapX1 * INVERT_PIN_RADIUS * 2 + x1, MapY1 * INVERT_PIN_RADIUS * 2 + y1 ) ); - aPlotter->finish_to( aPosition ); + aPlotter->FinishTo( aPosition ); } else { - aPlotter->move_to( wxPoint( x1, y1 ) ); - aPlotter->finish_to( aPosition ); + aPlotter->MoveTo( wxPoint( x1, y1 ) ); + aPlotter->FinishTo( aPosition ); } if( m_shape & CLOCK ) { if( MapY1 == 0 ) /* MapX1 = +- 1 */ { - aPlotter->move_to( wxPoint( x1, y1 + CLOCK_PIN_DIM ) ); - aPlotter->line_to( wxPoint( x1 - MapX1 * CLOCK_PIN_DIM, y1 ) ); - aPlotter->finish_to( wxPoint( x1, y1 - CLOCK_PIN_DIM ) ); + aPlotter->MoveTo( wxPoint( x1, y1 + CLOCK_PIN_DIM ) ); + aPlotter->LineTo( wxPoint( x1 - MapX1 * CLOCK_PIN_DIM, y1 ) ); + aPlotter->FinishTo( wxPoint( x1, y1 - CLOCK_PIN_DIM ) ); } else /* MapX1 = 0 */ { - aPlotter->move_to( wxPoint( x1 + CLOCK_PIN_DIM, y1 ) ); - aPlotter->line_to( wxPoint( x1, y1 - MapY1 * CLOCK_PIN_DIM ) ); - aPlotter->finish_to( wxPoint( x1 - CLOCK_PIN_DIM, y1 ) ); + aPlotter->MoveTo( wxPoint( x1 + CLOCK_PIN_DIM, y1 ) ); + aPlotter->LineTo( wxPoint( x1, y1 - MapY1 * CLOCK_PIN_DIM ) ); + aPlotter->FinishTo( wxPoint( x1 - CLOCK_PIN_DIM, y1 ) ); } } @@ -1341,17 +1341,17 @@ void LIB_PIN::PlotSymbol( PLOTTER* aPlotter, const wxPoint& aPosition, int aOrie { if( MapY1 == 0 ) /* MapX1 = +- 1 */ { - aPlotter->move_to( wxPoint( x1 + MapX1 * IEEE_SYMBOL_PIN_DIM * 2, y1 ) ); - aPlotter->line_to( wxPoint( x1 + MapX1 * IEEE_SYMBOL_PIN_DIM * 2, + aPlotter->MoveTo( wxPoint( x1 + MapX1 * IEEE_SYMBOL_PIN_DIM * 2, y1 ) ); + aPlotter->LineTo( wxPoint( x1 + MapX1 * IEEE_SYMBOL_PIN_DIM * 2, y1 - IEEE_SYMBOL_PIN_DIM ) ); - aPlotter->finish_to( wxPoint( x1, y1 ) ); + aPlotter->FinishTo( wxPoint( x1, y1 ) ); } else /* MapX1 = 0 */ { - aPlotter->move_to( wxPoint( x1, y1 + MapY1 * IEEE_SYMBOL_PIN_DIM * 2 ) ); - aPlotter->line_to( wxPoint( x1 - IEEE_SYMBOL_PIN_DIM, + aPlotter->MoveTo( wxPoint( x1, y1 + MapY1 * IEEE_SYMBOL_PIN_DIM * 2 ) ); + aPlotter->LineTo( wxPoint( x1 - IEEE_SYMBOL_PIN_DIM, y1 + MapY1 * IEEE_SYMBOL_PIN_DIM * 2 ) ); - aPlotter->finish_to( wxPoint( x1, y1 ) ); + aPlotter->FinishTo( wxPoint( x1, y1 ) ); } } @@ -1360,13 +1360,13 @@ void LIB_PIN::PlotSymbol( PLOTTER* aPlotter, const wxPoint& aPosition, int aOrie { if( MapY1 == 0 ) /* MapX1 = +- 1 */ { - aPlotter->move_to( wxPoint( x1, y1 - IEEE_SYMBOL_PIN_DIM ) ); - aPlotter->finish_to( wxPoint( x1 + MapX1 * IEEE_SYMBOL_PIN_DIM * 2, y1 ) ); + aPlotter->MoveTo( wxPoint( x1, y1 - IEEE_SYMBOL_PIN_DIM ) ); + aPlotter->FinishTo( wxPoint( x1 + MapX1 * IEEE_SYMBOL_PIN_DIM * 2, y1 ) ); } else /* MapX1 = 0 */ { - aPlotter->move_to( wxPoint( x1 - IEEE_SYMBOL_PIN_DIM, y1 ) ); - aPlotter->finish_to( wxPoint( x1, y1 + MapY1 * IEEE_SYMBOL_PIN_DIM * 2 ) ); + aPlotter->MoveTo( wxPoint( x1 - IEEE_SYMBOL_PIN_DIM, y1 ) ); + aPlotter->FinishTo( wxPoint( x1, y1 + MapY1 * IEEE_SYMBOL_PIN_DIM * 2 ) ); } } } @@ -1427,7 +1427,7 @@ void LIB_PIN::PlotPinTexts( PLOTTER* plotter, if( orient == PIN_RIGHT ) { x = x1 + TextInside; - plotter->text( wxPoint( x, y1 ), NameColor, + plotter->Text( wxPoint( x, y1 ), NameColor, m_name, TEXT_ORIENT_HORIZ, PinNameSize, @@ -1440,7 +1440,7 @@ void LIB_PIN::PlotPinTexts( PLOTTER* plotter, x = x1 - TextInside; if( DrawPinName ) - plotter->text( wxPoint( x, y1 ), + plotter->Text( wxPoint( x, y1 ), NameColor, m_name, TEXT_ORIENT_HORIZ, PinNameSize, GR_TEXT_HJUSTIFY_RIGHT, @@ -1450,7 +1450,7 @@ void LIB_PIN::PlotPinTexts( PLOTTER* plotter, } if( DrawPinNum ) { - plotter->text( wxPoint( (x1 + pin_pos.x) / 2, y1 - TXTMARGE ), + plotter->Text( wxPoint( (x1 + pin_pos.x) / 2, y1 - TXTMARGE ), NumColor, StringPinNum, TEXT_ORIENT_HORIZ, PinNumSize, GR_TEXT_HJUSTIFY_CENTER, @@ -1465,7 +1465,7 @@ void LIB_PIN::PlotPinTexts( PLOTTER* plotter, y = y1 + TextInside; if( DrawPinName ) - plotter->text( wxPoint( x1, y ), NameColor, + plotter->Text( wxPoint( x1, y ), NameColor, m_name, TEXT_ORIENT_VERT, PinNameSize, GR_TEXT_HJUSTIFY_RIGHT, @@ -1474,7 +1474,7 @@ void LIB_PIN::PlotPinTexts( PLOTTER* plotter, if( DrawPinNum ) { - plotter->text( wxPoint( x1 - TXTMARGE, (y1 + pin_pos.y) / 2 ), + plotter->Text( wxPoint( x1 - TXTMARGE, (y1 + pin_pos.y) / 2 ), NumColor, StringPinNum, TEXT_ORIENT_VERT, PinNumSize, GR_TEXT_HJUSTIFY_CENTER, @@ -1487,7 +1487,7 @@ void LIB_PIN::PlotPinTexts( PLOTTER* plotter, y = y1 - TextInside; if( DrawPinName ) - plotter->text( wxPoint( x1, y ), NameColor, + plotter->Text( wxPoint( x1, y ), NameColor, m_name, TEXT_ORIENT_VERT, PinNameSize, GR_TEXT_HJUSTIFY_LEFT, @@ -1496,7 +1496,7 @@ void LIB_PIN::PlotPinTexts( PLOTTER* plotter, if( DrawPinNum ) { - plotter->text( wxPoint( x1 - TXTMARGE, (y1 + pin_pos.y) / 2 ), + plotter->Text( wxPoint( x1 - TXTMARGE, (y1 + pin_pos.y) / 2 ), NumColor, StringPinNum, TEXT_ORIENT_VERT, PinNumSize, GR_TEXT_HJUSTIFY_CENTER, @@ -1514,7 +1514,7 @@ void LIB_PIN::PlotPinTexts( PLOTTER* plotter, if( DrawPinName ) { x = (x1 + pin_pos.x) / 2; - plotter->text( wxPoint( x, y1 - TXTMARGE ), + plotter->Text( wxPoint( x, y1 - TXTMARGE ), NameColor, m_name, TEXT_ORIENT_HORIZ, PinNameSize, GR_TEXT_HJUSTIFY_CENTER, @@ -1525,7 +1525,7 @@ void LIB_PIN::PlotPinTexts( PLOTTER* plotter, if( DrawPinNum ) { x = ( x1 + pin_pos.x ) / 2; - plotter->text( wxPoint( x, y1 + TXTMARGE ), + plotter->Text( wxPoint( x, y1 + TXTMARGE ), NumColor, StringPinNum, TEXT_ORIENT_HORIZ, PinNumSize, GR_TEXT_HJUSTIFY_CENTER, @@ -1538,7 +1538,7 @@ void LIB_PIN::PlotPinTexts( PLOTTER* plotter, if( DrawPinName ) { y = ( y1 + pin_pos.y ) / 2; - plotter->text( wxPoint( x1 - TXTMARGE, y ), + plotter->Text( wxPoint( x1 - TXTMARGE, y ), NameColor, m_name, TEXT_ORIENT_VERT, PinNameSize, GR_TEXT_HJUSTIFY_CENTER, @@ -1548,7 +1548,7 @@ void LIB_PIN::PlotPinTexts( PLOTTER* plotter, if( DrawPinNum ) { - plotter->text( wxPoint( x1 + TXTMARGE, ( y1 + pin_pos.y ) / 2 ), + plotter->Text( wxPoint( x1 + TXTMARGE, ( y1 + pin_pos.y ) / 2 ), NumColor, StringPinNum, TEXT_ORIENT_VERT, PinNumSize, GR_TEXT_HJUSTIFY_CENTER, @@ -1808,7 +1808,7 @@ void LIB_PIN::Plot( PLOTTER* plotter, const wxPoint& offset, bool fill, wxPoint pos = aTransform.TransformCoordinate( m_position ) + offset; - plotter->set_current_line_width( GetPenSize() ); + plotter->SetCurrentLineWidth( GetPenSize() ); PlotSymbol( plotter, pos, orient ); PlotPinTexts( plotter, pos, orient, GetParent()->GetPinNameOffset(), GetParent()->ShowPinNumbers(), GetParent()->ShowPinNames(), diff --git a/eeschema/lib_polyline.cpp b/eeschema/lib_polyline.cpp index ca57fe87b9..ee1604db53 100644 --- a/eeschema/lib_polyline.cpp +++ b/eeschema/lib_polyline.cpp @@ -241,13 +241,13 @@ void LIB_POLYLINE::Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, if( aFill && m_Fill == FILLED_WITH_BG_BODYCOLOR ) { - aPlotter->set_color( ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) ); + aPlotter->SetColor( ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) ); aPlotter->PlotPoly( cornerList, FILLED_WITH_BG_BODYCOLOR, 0 ); aFill = false; // body is now filled, do not fill it later. } bool already_filled = m_Fill == FILLED_WITH_BG_BODYCOLOR; - aPlotter->set_color( ReturnLayerColor( LAYER_DEVICE ) ); + aPlotter->SetColor( ReturnLayerColor( LAYER_DEVICE ) ); aPlotter->PlotPoly( cornerList, already_filled ? NO_FILL : m_Fill, GetPenSize() ); } diff --git a/eeschema/lib_rectangle.cpp b/eeschema/lib_rectangle.cpp index e06db81831..016a93ffe5 100644 --- a/eeschema/lib_rectangle.cpp +++ b/eeschema/lib_rectangle.cpp @@ -178,13 +178,13 @@ void LIB_RECTANGLE::Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill, if( aFill && m_Fill == FILLED_WITH_BG_BODYCOLOR ) { - aPlotter->set_color( ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) ); - aPlotter->rect( pos, end, FILLED_WITH_BG_BODYCOLOR, 0 ); + aPlotter->SetColor( ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) ); + aPlotter->Rect( pos, end, FILLED_WITH_BG_BODYCOLOR, 0 ); } bool already_filled = m_Fill == FILLED_WITH_BG_BODYCOLOR; - aPlotter->set_color( ReturnLayerColor( LAYER_DEVICE ) ); - aPlotter->rect( pos, end, already_filled ? NO_FILL : m_Fill, GetPenSize() ); + aPlotter->SetColor( ReturnLayerColor( LAYER_DEVICE ) ); + aPlotter->Rect( pos, end, already_filled ? NO_FILL : m_Fill, GetPenSize() ); } diff --git a/eeschema/lib_text.cpp b/eeschema/lib_text.cpp index b36f1c0cce..b2367ba3eb 100644 --- a/eeschema/lib_text.cpp +++ b/eeschema/lib_text.cpp @@ -318,7 +318,7 @@ void LIB_TEXT::Plot( PLOTTER* plotter, const wxPoint& offset, bool fill, int t1 = ( aTransform.x1 != 0 ) ^ ( m_Orient != 0 ); wxPoint pos = aTransform.TransformCoordinate( m_Pos ) + offset; - plotter->text( pos, UNSPECIFIED, m_Text, + plotter->Text( pos, UNSPECIFIED, m_Text, t1 ? TEXT_ORIENT_HORIZ : TEXT_ORIENT_VERT, m_Size, GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, GetPenSize(), m_Italic, m_Bold ); diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index d60032fb5c..0cd6864d5a 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -147,6 +147,12 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() _( "Plot schematic sheet in PostScript format" ), KiBitmap( plot_ps_xpm ) ); + // Plot PDF + AddMenuItem( choice_plot_fmt, ID_GEN_PLOT_PDF, + _( "Plot PDF" ), + _( "Plot schematic sheet in PDF format" ), + KiBitmap( plot_ps_xpm ) ); + // Plot HPGL AddMenuItem( choice_plot_fmt, ID_GEN_PLOT_HPGL, diff --git a/eeschema/sch_bus_entry.cpp b/eeschema/sch_bus_entry.cpp index a3b7b136db..48b317f8d0 100644 --- a/eeschema/sch_bus_entry.cpp +++ b/eeschema/sch_bus_entry.cpp @@ -281,10 +281,10 @@ bool SCH_BUS_ENTRY::HitTest( const EDA_RECT& aRect, bool aContained, int aAccura void SCH_BUS_ENTRY::Plot( PLOTTER* aPlotter ) { - aPlotter->set_current_line_width( GetPenSize() ); - aPlotter->set_color( ReturnLayerColor( GetLayer() ) ); - aPlotter->move_to( m_pos ); - aPlotter->finish_to( m_End() ); + aPlotter->SetCurrentLineWidth( GetPenSize() ); + aPlotter->SetColor( ReturnLayerColor( GetLayer() ) ); + aPlotter->MoveTo( m_pos ); + aPlotter->FinishTo( m_End() ); } /* SetBusEntryShape: diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp index e4102e6716..37ec64a63f 100644 --- a/eeschema/sch_field.cpp +++ b/eeschema/sch_field.cpp @@ -579,7 +579,7 @@ void SCH_FIELD::Plot( PLOTTER* aPlotter ) if( (parent->GetPartCount() <= 1) || (m_id != REFERENCE) ) { - aPlotter->text( textpos, color, m_Text, orient, m_Size, hjustify, vjustify, + aPlotter->Text( textpos, color, m_Text, orient, m_Size, hjustify, vjustify, thickness, m_Italic, m_Bold ); } else /* We plot the reference, for a multiple parts per package */ @@ -587,7 +587,7 @@ void SCH_FIELD::Plot( PLOTTER* aPlotter ) /* Adding A, B ... to the reference */ wxString Text = m_Text + LIB_COMPONENT::ReturnSubReference( parent->GetUnit() ); - aPlotter->text( textpos, color, Text, orient, m_Size, hjustify, vjustify, + aPlotter->Text( textpos, color, Text, orient, m_Size, hjustify, vjustify, thickness, m_Italic, m_Bold ); } } diff --git a/eeschema/sch_junction.cpp b/eeschema/sch_junction.cpp index ab0bbb252d..b9e80e253f 100644 --- a/eeschema/sch_junction.cpp +++ b/eeschema/sch_junction.cpp @@ -238,6 +238,6 @@ bool SCH_JUNCTION::doIsConnected( const wxPoint& aPosition ) const void SCH_JUNCTION::Plot( PLOTTER* aPlotter ) { - aPlotter->set_color( ReturnLayerColor( GetLayer() ) ); - aPlotter->circle( m_pos, m_size.x, FILLED_SHAPE ); + aPlotter->SetColor( ReturnLayerColor( GetLayer() ) ); + aPlotter->Circle( m_pos, m_size.x, FILLED_SHAPE ); } diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp index ec43fb5872..3ec6a62982 100644 --- a/eeschema/sch_line.cpp +++ b/eeschema/sch_line.cpp @@ -603,17 +603,17 @@ bool SCH_LINE::doIsConnected( const wxPoint& aPosition ) const void SCH_LINE::Plot( PLOTTER* aPlotter ) { - aPlotter->set_color( ReturnLayerColor( GetLayer() ) ); - aPlotter->set_current_line_width( GetPenSize() ); + aPlotter->SetColor( ReturnLayerColor( GetLayer() ) ); + aPlotter->SetCurrentLineWidth( GetPenSize() ); if( m_Layer == LAYER_NOTES ) - aPlotter->set_dash( true ); + aPlotter->SetDash( true ); - aPlotter->move_to( m_start ); - aPlotter->finish_to( m_end ); + aPlotter->MoveTo( m_start ); + aPlotter->FinishTo( m_end ); if( m_Layer == LAYER_NOTES ) - aPlotter->set_dash( false ); + aPlotter->SetDash( false ); } diff --git a/eeschema/sch_no_connect.cpp b/eeschema/sch_no_connect.cpp index 3a397a7f17..47302ec251 100644 --- a/eeschema/sch_no_connect.cpp +++ b/eeschema/sch_no_connect.cpp @@ -241,10 +241,11 @@ void SCH_NO_CONNECT::Plot( PLOTTER* aPlotter ) pX = m_pos.x; pY = m_pos.y; - aPlotter->set_current_line_width( GetPenSize() ); - aPlotter->set_color( ReturnLayerColor( GetLayer() ) ); - aPlotter->move_to( wxPoint( pX - delta, pY - delta ) ); - aPlotter->finish_to( wxPoint( pX + delta, pY + delta ) ); - aPlotter->move_to( wxPoint( pX + delta, pY - delta ) ); - aPlotter->finish_to( wxPoint( pX - delta, pY + delta ) ); + aPlotter->SetCurrentLineWidth( GetPenSize() ); + aPlotter->SetColor( ReturnLayerColor( GetLayer() ) ); + aPlotter->MoveTo( wxPoint( pX - delta, pY - delta ) ); + aPlotter->FinishTo( wxPoint( pX + delta, pY + delta ) ); + aPlotter->MoveTo( wxPoint( pX + delta, pY - delta ) ); + aPlotter->FinishTo( wxPoint( pX - delta, pY + delta ) ); } + diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp index 725c637a16..edebba2571 100644 --- a/eeschema/sch_screen.cpp +++ b/eeschema/sch_screen.cpp @@ -554,7 +554,7 @@ void SCH_SCREEN::Plot( PLOTTER* aPlotter ) { for( SCH_ITEM* item = m_drawList.begin(); item; item = item->Next() ) { - aPlotter->set_current_line_width( item->GetPenSize() ); + aPlotter->SetCurrentLineWidth( item->GetPenSize() ); item->Plot( aPlotter ); } } diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp index 066924b628..061dc4f4d1 100644 --- a/eeschema/sch_sheet.cpp +++ b/eeschema/sch_sheet.cpp @@ -1111,24 +1111,24 @@ void SCH_SHEET::Plot( PLOTTER* aPlotter ) wxPoint pos_sheetname, pos_filename; wxPoint pos; - aPlotter->set_color( ReturnLayerColor( GetLayer() ) ); + aPlotter->SetColor( ReturnLayerColor( GetLayer() ) ); int thickness = GetPenSize(); - aPlotter->set_current_line_width( thickness ); + aPlotter->SetCurrentLineWidth( thickness ); - aPlotter->move_to( m_pos ); + aPlotter->MoveTo( m_pos ); pos = m_pos; pos.x += m_size.x; - aPlotter->line_to( pos ); + aPlotter->LineTo( pos ); pos.y += m_size.y; - aPlotter->line_to( pos ); + aPlotter->LineTo( pos ); pos = m_pos; pos.y += m_size.y; - aPlotter->line_to( pos ); - aPlotter->finish_to( m_pos ); + aPlotter->LineTo( pos ); + aPlotter->FinishTo( m_pos ); if( IsVerticalOrientation() ) { @@ -1151,10 +1151,10 @@ void SCH_SHEET::Plot( PLOTTER* aPlotter ) thickness = g_DrawDefaultLineThickness; thickness = Clamp_Text_PenSize( thickness, size, false ); - aPlotter->set_color( ReturnLayerColor( LAYER_SHEETNAME ) ); + aPlotter->SetColor( ReturnLayerColor( LAYER_SHEETNAME ) ); bool italic = false; - aPlotter->text( pos_sheetname, txtcolor, Text, name_orientation, size, + aPlotter->Text( pos_sheetname, txtcolor, Text, name_orientation, size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_BOTTOM, thickness, italic, false ); @@ -1164,13 +1164,13 @@ void SCH_SHEET::Plot( PLOTTER* aPlotter ) thickness = g_DrawDefaultLineThickness; thickness = Clamp_Text_PenSize( thickness, size, false ); - aPlotter->set_color( ReturnLayerColor( LAYER_SHEETFILENAME ) ); + aPlotter->SetColor( ReturnLayerColor( LAYER_SHEETFILENAME ) ); - aPlotter->text( pos_filename, txtcolor, Text, name_orientation, size, + aPlotter->Text( pos_filename, txtcolor, Text, name_orientation, size, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_TOP, thickness, italic, false ); - aPlotter->set_color( ReturnLayerColor( GetLayer() ) ); + aPlotter->SetColor( ReturnLayerColor( GetLayer() ) ); /* Draw texts : SheetLabel */ for( size_t i = 0; i < m_pins.size(); i++ ) diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp index 08e54bb310..157e58df67 100644 --- a/eeschema/sch_text.cpp +++ b/eeschema/sch_text.cpp @@ -691,7 +691,7 @@ void SCH_TEXT::Plot( PLOTTER* aPlotter ) wxPoint textpos = m_Pos + GetSchematicTextOffset(); int thickness = GetPenSize(); - aPlotter->set_current_line_width( thickness ); + aPlotter->SetCurrentLineWidth( thickness ); if( m_MultilineAllowed ) { @@ -706,7 +706,7 @@ void SCH_TEXT::Plot( PLOTTER* aPlotter ) for( unsigned i = 0; iCount(); i++ ) { wxString txt = list->Item( i ); - aPlotter->text( pos, color, txt, m_Orient, m_Size, m_HJustify, + aPlotter->Text( pos, color, txt, m_Orient, m_Size, m_HJustify, m_VJustify, thickness, m_Italic, m_Bold ); pos += offset; } @@ -715,14 +715,14 @@ void SCH_TEXT::Plot( PLOTTER* aPlotter ) } else { - aPlotter->text( textpos, color, m_Text, m_Orient, m_Size, m_HJustify, + aPlotter->Text( textpos, color, m_Text, m_Orient, m_Size, m_HJustify, m_VJustify, thickness, m_Italic, m_Bold ); } /* Draw graphic symbol for global or hierarchical labels */ CreateGraphicShape( Poly, m_Pos ); - aPlotter->set_current_line_width( GetPenSize() ); + aPlotter->SetCurrentLineWidth( GetPenSize() ); if( Poly.size() ) aPlotter->PlotPoly( Poly, NO_FILL ); diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp index d2a9a35a49..1a146a72da 100644 --- a/eeschema/schframe.cpp +++ b/eeschema/schframe.cpp @@ -86,6 +86,7 @@ BEGIN_EVENT_TABLE( SCH_EDIT_FRAME, EDA_DRAW_FRAME ) EVT_MENU( ID_GEN_PLOT_HPGL, SCH_EDIT_FRAME::ToPlot_HPGL ) EVT_MENU( ID_GEN_PLOT_SVG, SCH_EDIT_FRAME::SVG_Print ) EVT_MENU( ID_GEN_PLOT_DXF, SCH_EDIT_FRAME::ToPlot_DXF ) + EVT_MENU( ID_GEN_PLOT_PDF, SCH_EDIT_FRAME::ToPlot_PDF ) EVT_MENU( ID_GEN_COPY_SHEET_TO_CLIPBOARD, EDA_DRAW_FRAME::CopyToClipboard ) EVT_MENU( wxID_EXIT, SCH_EDIT_FRAME::OnExit ) diff --git a/include/class_bitmap_base.h b/include/class_bitmap_base.h index 25319fac20..1ba129ca8e 100644 --- a/include/class_bitmap_base.h +++ b/include/class_bitmap_base.h @@ -191,7 +191,8 @@ public: BITMAP_BASE( const wxPoint& pos = wxPoint( 0, 0 ) ); * @param aDefaultColor = the color used to plot the rectangle when bitmap is not supported * @param aDefaultPensize = the pen size used to plot the rectangle when bitmap is not supported */ - void PlotImage( PLOTTER* aPlotter, wxPoint aPos, int aDefaultColor, int aDefaultPensize ); + void PlotImage( PLOTTER* aPlotter, const wxPoint& aPos, + EDA_COLOR_T aDefaultColor, int aDefaultPensize ); }; diff --git a/include/convert_to_biu.h b/include/convert_to_biu.h index a4e9d62f19..8cae47d000 100644 --- a/include/convert_to_biu.h +++ b/include/convert_to_biu.h @@ -1,67 +1,68 @@ -#ifndef CONVERT_TO_BIU_H -#define CONVERT_TO_BIU_H - -#include // USE_PCBNEW_NANOMETRES is defined here - -/** - * @file convert_to_biu.h - */ - - -/** - * @brief some define and functions to convert a value in mils, decimils or mm - * to the internal unit used in pcbnew, cvpcb or gerbview (nanometer or decimil) - * depending on compil option - */ - - - -/// Scaling factor to convert mils to internal units. -#if defined(PCBNEW) || defined(CVPCB) || defined(GERBVIEW) - #if defined( USE_PCBNEW_NANOMETRES ) - #if defined(GERBVIEW) - #define IU_PER_MM 1e5 // Gerbview uses 10 micrometer. - #else - #define IU_PER_MM 1e6 // Pcbnew uses nanometers. - #endif - #define IU_PER_MILS ( IU_PER_MM * 0.0254 ) - #define IU_PER_DECIMILS (IU_PER_MM * 0.00254 ) - #else // Pcbnew in deci-mils. - #define IU_PER_DECIMILS 1 - #define IU_PER_MILS 10.0 - #define IU_PER_MM (1e4 / 25.4) - #endif - -/// Convert mils to PCBNEW internal units (iu). -inline int Mils2iu( int mils ) -{ -#if defined( USE_PCBNEW_NANOMETRES ) - double x = mils * IU_PER_MILS; - return int( x < 0 ? x - 0.5 : x + 0.5 ); -#else - return mils * IU_PER_MILS; -#endif -} - -/// Convert deci-mils to PCBNEW internal units (iu). -inline int DMils2iu( int dmils ) -{ -#if defined( USE_PCBNEW_NANOMETRES ) - double x = dmils * IU_PER_DECIMILS; - return int( x < 0 ? x - 0.5 : x + 0.5 ); -#else - return dmils; -#endif -} - -#else // Eeschema and anything else. -#define IU_PER_MILS 1.0 -#define IU_PER_MM (IU_PER_MILS / 0.0254) - -inline int Mils2iu( int mils ) -{ - return mils; -} -#endif - -#endif // #define CONVERT_TO_BIU_H +#ifndef CONVERT_TO_BIU_H +#define CONVERT_TO_BIU_H + +#include // USE_PCBNEW_NANOMETRES is defined here + +/** + * @file convert_to_biu.h + */ + + +/** + * @brief some define and functions to convert a value in mils, decimils or mm + * to the internal unit used in pcbnew, cvpcb or gerbview (nanometer or decimil) + * depending on compil option + */ + + + +/// Scaling factor to convert mils to internal units. +#if defined(PCBNEW) || defined(CVPCB) || defined(GERBVIEW) + #if defined( USE_PCBNEW_NANOMETRES ) + #if defined(GERBVIEW) + #define IU_PER_MM 1e5 // Gerbview uses 10 micrometer. + #else + #define IU_PER_MM 1e6 // Pcbnew uses nanometers. + #endif + #define IU_PER_MILS ( IU_PER_MM * 0.0254 ) + #define IU_PER_DECIMILS (IU_PER_MM * 0.00254 ) + #else // Pcbnew in deci-mils. + #define IU_PER_DECIMILS 1 + #define IU_PER_MILS 10.0 + #define IU_PER_MM (1e4 / 25.4) + #endif + +/// Convert mils to PCBNEW internal units (iu). +inline int Mils2iu( int mils ) +{ +#if defined( USE_PCBNEW_NANOMETRES ) + double x = mils * IU_PER_MILS; + return int( x < 0 ? x - 0.5 : x + 0.5 ); +#else + return mils * IU_PER_MILS; +#endif +} + +/// Convert deci-mils to PCBNEW internal units (iu). +inline int DMils2iu( int dmils ) +{ +#if defined( USE_PCBNEW_NANOMETRES ) + double x = dmils * IU_PER_DECIMILS; + return int( x < 0 ? x - 0.5 : x + 0.5 ); +#else + return dmils; +#endif +} + +#else // Eeschema and anything else. +#define IU_PER_DECIMILS 0.1 +#define IU_PER_MILS 1.0 +#define IU_PER_MM (IU_PER_MILS / 0.0254) + +inline int Mils2iu( int mils ) +{ + return mils; +} +#endif + +#endif // #define CONVERT_TO_BIU_H diff --git a/include/id.h b/include/id.h index bf4af18c12..8ec230b236 100644 --- a/include/id.h +++ b/include/id.h @@ -82,6 +82,7 @@ enum main_id ID_GEN_PLOT_GERBER, ID_GEN_PLOT_SVG, ID_GEN_PLOT_DXF, + ID_GEN_PLOT_PDF, ID_GEN_COPY_SHEET_TO_CLIPBOARD, ID_GEN_COPY_BLOCK_TO_CLIPBOARD, diff --git a/include/plot_common.h b/include/plot_common.h index 0a5beecafb..dd5ff393f3 100644 --- a/include/plot_common.h +++ b/include/plot_common.h @@ -1,6 +1,6 @@ /** * Common plot library \n - * Plot settings, postscript plotting, gerber plotting. + * Plot settings, and plotting engines (Postscript, Gerber, HPGL and DXF) * * @file plot_common.h */ @@ -9,6 +9,7 @@ #define PLOT_COMMON_H_ #include +#include #include #include // PAGE_INFO #include // FILL_T @@ -22,99 +23,179 @@ enum PlotFormat { PLOT_FORMAT_HPGL, PLOT_FORMAT_GERBER, PLOT_FORMAT_POST, - PLOT_FORMAT_DXF + PLOT_FORMAT_DXF, + PLOT_FORMAT_PDF +}; + +/** + * Enum for choosing which kind of text to output with the PSLIKE + * plotters. You can: + * 1) only use the internal vector font + * 2) only use native postscript fonts + * 3) use the internal vector font and add 'phantom' text to aid + * searching + */ +enum PostscriptTextMode { + PSTEXTMODE_STROKE, + PSTEXTMODE_NATIVE, + PSTEXTMODE_PHANTOM }; +/** + * Base plotter engine class. General rule: all the interface with the caller + * is done in IU, the IU size is specified with SetViewport. Internal and + * output processing is usually done in decimils (or whatever unit the + * effective engine class need to use) + */ class PLOTTER { public: - PLOTTER( PlotFormat aPlotType ); + PLOTTER( ); virtual ~PLOTTER() { // Emergency cleanup - if( output_file ) + if( outputFile ) { - fclose( output_file ); + fclose( outputFile ); } } + /** + * Returns the effective plot engine in use. It's not very OO but for + * now is required since some things are only done with some output devices + * (like drill marks, emitted only for postscript + */ + virtual PlotFormat GetPlotterType() const = 0; + + virtual bool StartPlot( FILE* fout ) = 0; + virtual bool EndPlot() = 0; + + virtual void SetNegative( bool _negative ) + { + negativeMode = _negative; + } + + virtual void SetColorMode( bool _color_mode ) + { + colorMode = _color_mode; + } + + bool GetColorMode() const + { + return colorMode; + } + + virtual void SetPageSettings( const PAGE_INFO& aPageSettings ); /** - * Function GetPlotterType - * @return the format of the plot file + * Set the line width for the next drawing. + * @param width is specified in IUs */ - PlotFormat GetPlotterType() { return m_PlotType; } + virtual void SetCurrentLineWidth( int width ) = 0; - virtual bool start_plot( FILE* fout ) = 0; - virtual bool end_plot() = 0; + /** + * Set the default line width. Used at the beginning and when a width + * of -1 is requested. + * @param width is specified in IUs + */ + virtual void SetDefaultLineWidth( int width ) = 0; - virtual void set_negative( bool _negative ) + virtual int GetCurrentLineWidth() const { - negative_mode = _negative; + return currentPenWidth; } - virtual void set_color_mode( bool _color_mode ) - { - color_mode = _color_mode; - } + virtual void SetColor( EDA_COLOR_T color ) = 0; - bool get_color_mode() const - { - return color_mode; - } + virtual void SetDash( bool dashed ) = 0; - void SetPageSettings( const PAGE_INFO& aPageSettings ); - - virtual void set_current_line_width( int width ) = 0; - virtual void set_default_line_width( int width ) = 0; - virtual void set_color( int color ) = 0; - virtual void set_dash( bool dashed ) = 0; - - virtual int get_current_line_width() - { - return current_pen_width; - } - - virtual void set_plot_width_adj( double width ) + /** PLEASE NOTE: the plot width adjustment is actually done by the + * pcbnew routines, the plotter class only carry it along! + * XXX In fact it's only used during postscript plot, I'd move this + * variable as a static in pcbnew/plot_rtn.cpp. Also: why it's double? + * it's added to pad/track size and it's specified in IU, so it should + * be an int */ + virtual void SetPlotWidthAdj( double width ) { } - virtual double get_plot_width_adj() + virtual double GetPlotWidthAdj() { return 0.; } - virtual void set_creator( const wxString& _creator ) + virtual void SetCreator( const wxString& _creator ) { creator = _creator; } - virtual void set_filename( const wxString& _filename ) + virtual void SetFilename( const wxString& _filename ) { filename = _filename; } - /// Set the plot offset for the current plotting - virtual void set_viewport( wxPoint aOffset, double aScale, bool aMirror ) = 0; + /** + * Set the plot offset and scaling for the current plot + * @param aIusPerDecimil gives the scaling factor from IUs to device + * units + * @param aScale is the user set plot scaling factor (either explicitly + * or using 'fit to A4') + * @param aMirror flips the plot in the Y direction (useful for toner + * transfers or some kind of film) + */ + virtual void SetViewport( const wxPoint& aOffset, double aIusPerDecimil, + double aScale, bool aMirror ) = 0; - // Standard primitives - virtual void rect( wxPoint p1, wxPoint p2, FILL_T fill, + // Low level primitives + virtual void Rect( const wxPoint& p1, const wxPoint& p2, FILL_T fill, int width = -1 ) = 0; - virtual void circle( wxPoint pos, int diametre, FILL_T fill, + virtual void Circle( const wxPoint& pos, int diametre, FILL_T fill, int width = -1 ) = 0; - virtual void arc( wxPoint centre, int StAngle, int EndAngle, int rayon, + virtual void Arc( const wxPoint& centre, int StAngle, int EndAngle, int rayon, FILL_T fill, int width = -1 ); + /** + * moveto/lineto primitive, moves the 'pen' to the specified direction + * @param plume specifies the kind of motion: 'U' only moves the pen, + * 'D' draw a line from the current position and 'Z' finish + * the drawing and returns the 'pen' to rest (flushes the trace) + */ + virtual void PenTo( const wxPoint& pos, char plume ) = 0; + + // Convenience functions for PenTo + void MoveTo( const wxPoint& pos ) + { + PenTo( pos, 'U' ); + } + + void LineTo( const wxPoint& pos ) + { + PenTo( pos, 'D' ); + } + + void FinishTo( const wxPoint& pos ) + { + PenTo( pos, 'D' ); + PenTo( pos, 'Z' ); + } + + void PenFinish() + { + // The point is not important with Z motion + PenTo( wxPoint( 0, 0 ), 'Z' ); + } + /** * Function PlotPoly * @brief Draw a polygon ( filled or not ) * @param aCornerList = corners list - * @param aFill :if true : filled polygon + * @param aFill = type of fill * @param aWidth = line width */ - virtual void PlotPoly( std::vector< wxPoint >& aCornerList, FILL_T aFill, int aWidth = -1 ) = 0; + virtual void PlotPoly( const std::vector< wxPoint >& aCornerList, FILL_T aFill, + int aWidth = -1 ) = 0; /** * Function PlotImage @@ -126,298 +207,426 @@ public: * @param aScaleFactor = the scale factor to apply to the bitmap size * (this is not the plot scale factor) */ - virtual void PlotImage( wxImage & aImage, wxPoint aPos, double aScaleFactor ) = 0; + virtual void PlotImage( const wxImage & aImage, const wxPoint& aPos, + double aScaleFactor ); - virtual void thick_segment( wxPoint start, wxPoint end, int width, - EDA_DRAW_MODE_T tracemode ); - virtual void thick_arc( wxPoint centre, int StAngle, int EndAngle, int rayon, - int width, EDA_DRAW_MODE_T tracemode ); - virtual void thick_rect( wxPoint p1, wxPoint p2, int width, - EDA_DRAW_MODE_T tracemode ); - virtual void thick_circle( wxPoint pos, int diametre, int width, + // Higher level primitives -- can be drawn as line, sketch or 'filled' + virtual void ThickSegment( const wxPoint& start, const wxPoint& end, int width, EDA_DRAW_MODE_T tracemode ); - virtual void pen_to( wxPoint pos, char plume ) = 0; + virtual void ThickArc( const wxPoint& centre, int StAngle, int EndAngle, int rayon, + int width, EDA_DRAW_MODE_T tracemode ); + virtual void ThickRect( const wxPoint& p1, const wxPoint& p2, int width, + EDA_DRAW_MODE_T tracemode ); + virtual void ThickCircle( const wxPoint& pos, int diametre, int width, + EDA_DRAW_MODE_T tracemode ); // Flash primitives - virtual void flash_pad_circle( wxPoint pos, int diametre, - EDA_DRAW_MODE_T trace_mode ) = 0; - virtual void flash_pad_oval( wxPoint pos, wxSize size, int orient, + virtual void FlashPadCircle( const wxPoint& pos, int diametre, EDA_DRAW_MODE_T trace_mode ) = 0; - virtual void flash_pad_rect( wxPoint pos, wxSize size, - int orient, EDA_DRAW_MODE_T trace_mode ) = 0; + virtual void FlashPadOval( const wxPoint& pos, const wxSize& size, int orient, + EDA_DRAW_MODE_T trace_mode ) = 0; + virtual void FlashPadRect( const wxPoint& pos, const wxSize& size, + int orient, EDA_DRAW_MODE_T trace_mode ) = 0; - /** virtual function flash_pad_trapez + /** virtual function FlashPadTrapez * flash a trapezoidal pad * @param aPadPos = the position of the shape - * @param aCorners = the list of 4 corners positions, relative to the shape position, pad orientation 0 + * @param aCorners = the list of 4 corners positions, + * relative to the shape position, pad orientation 0 * @param aPadOrient = the rotation of the shape * @param aTrace_Mode = FILLED or SKETCH */ - virtual void flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], - int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ) = 0; + virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, + int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ) = 0; - // Convenience functions - void move_to( wxPoint pos ) - { - pen_to( pos, 'U' ); - } - void line_to( wxPoint pos ) - { - pen_to( pos, 'D' ); - } + /** + * Draws text with the plotter. For convenience it accept the color to use + */ + virtual void Text( const wxPoint& aPos, + enum EDA_COLOR_T aColor, + const wxString& aText, + int aOrient, + const wxSize& aSize, + enum EDA_TEXT_HJUSTIFY_T aH_justify, + enum EDA_TEXT_VJUSTIFY_T aV_justify, + int aWidth, + bool aItalic, + bool aBold ); - void finish_to( wxPoint pos ) - { - pen_to( pos, 'D' ); - pen_to( pos, 'Z' ); - } - - void pen_finish() - { - // Shortcut - pen_to( wxPoint( 0, 0 ), 'Z' ); - } - - void text( const wxPoint& aPos, - enum EDA_COLOR_T aColor, - const wxString& aText, - int aOrient, - const wxSize& aSize, - enum EDA_TEXT_HJUSTIFY_T aH_justify, - enum EDA_TEXT_VJUSTIFY_T aV_justify, - int aWidth, - bool aItalic, - bool aBold ); - - void marker( const wxPoint& position, int diametre, int aShapeId ); + /** + * Draw a marker (used for the drill map) + */ + static const unsigned MARKER_COUNT = 58; + void Marker( const wxPoint& position, int diametre, unsigned aShapeId ); /** * Function SetLayerPolarity * sets current Gerber layer polarity to positive or negative * by writing \%LPD*\% or \%LPC*\% to the Gerber file, respectively. + * (obviously starts a new Gerber layer, too) * @param aPositive is the layer polarity and true for positive. + * It's not useful with most other plotter since they can't 'scratch' + * the film like photoplotter imagers do */ - virtual void SetLayerPolarity( bool aPositive ) = 0; + virtual void SetLayerPolarity( bool aPositive ) + { + // NOP for most plotters + } protected: // These are marker subcomponents - void center_square( const wxPoint& position, int diametre, FILL_T fill ); - void center_lozenge( const wxPoint& position, int diametre, FILL_T fill ); + void markerCircle( const wxPoint& pos, int radius ); + void markerHBar( const wxPoint& pos, int radius ); + void markerSlash( const wxPoint& pos, int radius ); + void markerBackSlash( const wxPoint& pos, int radius ); + void markerVBar( const wxPoint& pos, int radius ); + void markerSquare( const wxPoint& position, int radius ); + void markerLozenge( const wxPoint& position, int radius ); // Helper function for sketched filler segment - void segment_as_oval( wxPoint start, wxPoint end, int width, - EDA_DRAW_MODE_T tracemode ); - void sketch_oval( wxPoint pos, wxSize size, int orient, int width ); + void segmentAsOval( const wxPoint& start, const wxPoint& end, int width, + EDA_DRAW_MODE_T tracemode ); + void sketchOval( const wxPoint& pos, const wxSize& size, int orient, + int width ); - virtual void user_to_device_coordinates( wxPoint& pos ); - virtual void user_to_device_size( wxSize& size ); - virtual double user_to_device_size( double size ); + // Coordinate and scaling conversion functions + virtual DPOINT userToDeviceCoordinates( const wxPoint& pos ); + virtual DPOINT userToDeviceSize( const wxSize& size ); + virtual double userToDeviceSize( double size ); - PlotFormat m_PlotType; + /// Plot scale - chosen by the user (even implicitly with 'fit in a4') + double plotScale; - /// Plot scale - double plot_scale; + /// Device scale (from IUs to device units - usually decimils) + double iuPerDeviceUnit; - /// Device scale (from decimils to device units) - double device_scale; - - /// Plot offset (in decimils) - wxPoint plot_offset; + /// Plot offset (in IUs) + wxPoint plotOffset; /// Output file - FILE* output_file; + FILE* outputFile; // Pen handling - bool color_mode, negative_mode; - int default_pen_width; - int current_pen_width; - char pen_state; - wxPoint pen_lastpos; + bool colorMode, negativeMode; + int defaultPenWidth; + int currentPenWidth; + /// Current pen state: 'U', 'D' or 'Z' (see PenTo) + char penState; + /// Last pen positions; set to -1,-1 when the pen is at rest + wxPoint penLastpos; bool plotMirror; wxString creator; wxString filename; PAGE_INFO pageInfo; - wxSize paper_size; + /// Paper size in IU - not in mils + wxSize paperSize; }; class HPGL_PLOTTER : public PLOTTER { public: - HPGL_PLOTTER() : - PLOTTER( PLOT_FORMAT_HPGL ) + HPGL_PLOTTER() { } - virtual bool start_plot( FILE* fout ); - virtual bool end_plot(); - - // HPGL doesn't handle line thickness or color - virtual void set_current_line_width( int width ) + virtual PlotFormat GetPlotterType() const { - // Handy override - current_pen_width = KiROUND( pen_diameter ); + return PLOT_FORMAT_HPGL; } - virtual void set_default_line_width( int width ) {}; - virtual void set_dash( bool dashed ); + virtual bool StartPlot( FILE* fout ); + virtual bool EndPlot(); - virtual void set_color( int color ) {}; - - virtual void set_pen_speed( int speed ) + /// HPGL doesn't handle line thickness or color + virtual void SetCurrentLineWidth( int width ) { - wxASSERT( output_file == 0 ); - pen_speed = speed; + // This is the truth + currentPenWidth = userToDeviceSize( penDiameter ); } - virtual void set_pen_number( int number ) + virtual void SetDefaultLineWidth( int width ) {}; + virtual void SetDash( bool dashed ); + + virtual void SetColor( EDA_COLOR_T color ) {}; + + virtual void SetPenSpeed( int speed ) { - wxASSERT( output_file == 0 ); - pen_number = number; + wxASSERT( outputFile == 0 ); + penSpeed = speed; } - virtual void set_pen_diameter( double diameter ) + virtual void SetPenNumber( int number ) { - wxASSERT( output_file == 0 ); - pen_diameter = diameter; + wxASSERT( outputFile == 0 ); + penNumber = number; } - virtual void set_pen_overlap( double overlap ) + virtual void SetPenDiameter( double diameter ) { - wxASSERT( output_file == 0 ); - pen_overlap = overlap; + wxASSERT( outputFile == 0 ); + penDiameter = diameter; } - virtual void set_viewport( wxPoint aOffset, double aScale, bool aMirror ); - virtual void rect( wxPoint p1, wxPoint p2, FILL_T fill, int width = -1 ); - virtual void circle( wxPoint pos, int diametre, FILL_T fill, int width = -1 ); + virtual void SetPenOverlap( double overlap ) + { + wxASSERT( outputFile == 0 ); + penOverlap = overlap; + } - /* - * Function PlotPoly - * Draw a polygon (filled or not) in HPGL format - * param aCornerList = corners list - * param aFill :if true : filled polygon - * param aWidth = line width - */ - virtual void PlotPoly( std::vector< wxPoint >& aCornerList, FILL_T aFill, int aWidth = -1); + virtual void SetViewport( const wxPoint& aOffset, double aIusPerDecimil, + double aScale, bool aMirror ); + virtual void Rect( const wxPoint& p1, const wxPoint& p2, FILL_T fill, + int width = -1 ); + virtual void Circle( const wxPoint& pos, int diametre, FILL_T fill, + int width = -1 ); + virtual void PlotPoly( const std::vector< wxPoint >& aCornerList, + FILL_T aFill, int aWidth = -1); - /* - * Function PlotImage - * Only Postscript plotters can plot bitmaps - * for plotters that cannot plot a bitmap, a rectangle is plotted - * Draw an image bitmap - * param aImage = the bitmap - * param aPos = position of the center of the bitmap - * param aScaleFactor = the scale factor to apply to the bitmap size - * (this is not the plot scale factor) - */ - virtual void PlotImage( wxImage & aImage, wxPoint aPos, double aScaleFactor ); - - virtual void thick_segment( wxPoint start, wxPoint end, int width, - EDA_DRAW_MODE_T tracemode ); - virtual void arc( wxPoint centre, int StAngle, int EndAngle, int rayon, + virtual void ThickSegment( const wxPoint& start, const wxPoint& end, int width, + EDA_DRAW_MODE_T tracemode ); + virtual void Arc( const wxPoint& centre, int StAngle, int EndAngle, int rayon, FILL_T fill, int width = -1 ); - virtual void pen_to( wxPoint pos, char plume ); - virtual void flash_pad_circle( wxPoint pos, int diametre, - EDA_DRAW_MODE_T trace_mode ); - virtual void flash_pad_oval( wxPoint pos, wxSize size, int orient, + virtual void PenTo( const wxPoint& pos, char plume ); + virtual void FlashPadCircle( const wxPoint& pos, int diametre, EDA_DRAW_MODE_T trace_mode ); - virtual void flash_pad_rect( wxPoint pos, wxSize size, - int orient, EDA_DRAW_MODE_T trace_mode ); - - virtual void flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], - int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ); - - virtual void SetLayerPolarity( bool aPositive ) {} + virtual void FlashPadOval( const wxPoint& pos, const wxSize& size, int orient, + EDA_DRAW_MODE_T trace_mode ); + virtual void FlashPadRect( const wxPoint& pos, const wxSize& size, + int orient, EDA_DRAW_MODE_T trace_mode ); + virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, + int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ); protected: - void pen_control( int plume ); + void penControl( char plume ); - int pen_speed; - int pen_number; - double pen_diameter; - double pen_overlap; + int penSpeed; + int penNumber; + double penDiameter; + double penOverlap; +}; + +/** + * The PSLIKE_PLOTTER class is an intermediate class to handle common + * routines for engines working more or less with the postscript imaging + * model + */ +class PSLIKE_PLOTTER : public PLOTTER +{ +public: + PSLIKE_PLOTTER() : plotScaleAdjX( 1 ), plotScaleAdjY( 1 ), plotWidthAdj( 0 ), + psTextMode( PSTEXTMODE_PHANTOM ) + { + } + + /** + * Change the current postscript text mode + */ + void SetPsTextMode( PostscriptTextMode mode ) + { + psTextMode = mode; + } + + virtual void SetDefaultLineWidth( int width ); + + /** + * Set the 'fine' scaling for the postscript engine + */ + void SetScaleAdjust( double scaleX, double scaleY ) + { + plotScaleAdjX = scaleX; + plotScaleAdjY = scaleY; + } + + /** + * Set the 'width adjustment' for the postscript engine + * (useful for controlling toner bleeding during direct transfer) + */ + virtual void SetPlotWidthAdj( double width ) + { + plotWidthAdj = width; + } + + virtual double GetPlotWidthAdj() const + { + return plotWidthAdj; + } + + // Pad routines are handled with lower level primitives + virtual void FlashPadCircle( const wxPoint& pos, int diametre, + EDA_DRAW_MODE_T trace_mode ); + virtual void FlashPadOval( const wxPoint& pos, const wxSize& size, int orient, + EDA_DRAW_MODE_T trace_mode ); + virtual void FlashPadRect( const wxPoint& pos, const wxSize& size, + int orient, EDA_DRAW_MODE_T trace_mode ); + virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, + int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ); + + /** The SetColor implementation is split with the subclasses: + * The PSLIKE computes the rgb values, the subclass emits the + * operator to actually do it + */ + virtual void SetColor( EDA_COLOR_T color ); + +protected: + void computeTextParameters( const wxPoint& aPos, + const wxString& aText, + int aOrient, + const wxSize& aSize, + enum EDA_TEXT_HJUSTIFY_T aH_justify, + enum EDA_TEXT_VJUSTIFY_T aV_justify, + int aWidth, + bool aItalic, + bool aBold, + double *wideningFactor, + double *ctm_a, + double *ctm_b, + double *ctm_c, + double *ctm_d, + double *ctm_e, + double *ctm_f, + double *heightFactor ); + void postscriptOverlinePositions( const wxString& aText, int aXSize, + bool aItalic, bool aBold, + std::vector *pos_pairs ); + void fputsPostscriptString(FILE *fout, const wxString& txt); + + /// Virtual primitive for emitting the setrgbcolor operator + virtual void emitSetRGBColor( double r, double g, double b ) = 0; + + /// Height of the postscript font (from the AFM) + static const double postscriptTextAscent = 0.718; + + int returnPostscriptTextWidth( const wxString& aText, int aXSize, + bool aItalic, bool aBold ); + + /// Fine user scale + double plotScaleAdjX, plotScaleAdjY; + + /** Plot width adjust XXX should be moved in the PCB plotting + * routines! + */ + double plotWidthAdj; + + /// How to draw text + PostscriptTextMode psTextMode; }; -class PS_PLOTTER : public PLOTTER +class PS_PLOTTER : public PSLIKE_PLOTTER { public: - PS_PLOTTER() : - PLOTTER( PLOT_FORMAT_POST ) + PS_PLOTTER() { - plot_scale_adjX = 1; - plot_scale_adjY = 1; } - virtual bool start_plot( FILE* fout ); - virtual bool end_plot(); - virtual void set_current_line_width( int width ); - virtual void set_default_line_width( int width ); - virtual void set_dash( bool dashed ); - virtual void set_color( int color ); - - void set_scale_adjust( double scaleX, double scaleY ) + virtual PlotFormat GetPlotterType() const { - plot_scale_adjX = scaleX; - plot_scale_adjY = scaleY; + return PLOT_FORMAT_POST; } - virtual void set_plot_width_adj( double width ) + virtual bool StartPlot( FILE* fout ); + virtual bool EndPlot(); + virtual void SetCurrentLineWidth( int width ); + virtual void SetDash( bool dashed ); + + virtual void SetViewport( const wxPoint& aOffset, double aIusPerDecimil, + double aScale, bool aMirror ); + virtual void Rect( const wxPoint& p1, const wxPoint& p2, FILL_T fill, + int width = -1 ); + virtual void Circle( const wxPoint& pos, int diametre, FILL_T fill, + int width = -1 ); + virtual void Arc( const wxPoint& centre, int StAngle, int EndAngle, + int rayon, FILL_T fill, int width = -1 ); + + virtual void PlotPoly( const std::vector< wxPoint >& aCornerList, + FILL_T aFill, int aWidth = -1); + + virtual void PlotImage( const wxImage& aImage, const wxPoint& aPos, + double aScaleFactor ); + + virtual void PenTo( const wxPoint& pos, char plume ); + virtual void Text( const wxPoint& aPos, + enum EDA_COLOR_T aColor, + const wxString& aText, + int aOrient, + const wxSize& aSize, + enum EDA_TEXT_HJUSTIFY_T aH_justify, + enum EDA_TEXT_VJUSTIFY_T aV_justify, + int aWidth, + bool aItalic, + bool aBold ); +protected: + virtual void emitSetRGBColor( double r, double g, double b ); +}; + +class PDF_PLOTTER : public PSLIKE_PLOTTER +{ +public: + PDF_PLOTTER() : pageStreamHandle( 0 ), workFile( NULL ) { - plot_width_adj = width; } - virtual double get_plot_width_adj() + virtual PlotFormat GetPlotterType() const { - return plot_width_adj; + return PLOT_FORMAT_PDF; } - virtual void set_viewport( wxPoint aOffset, double aScale, bool aMirror ); - virtual void rect( wxPoint p1, wxPoint p2, FILL_T fill, int width = -1 ); - virtual void circle( wxPoint pos, int diametre, FILL_T fill, int width = -1 ); - virtual void arc( wxPoint centre, int StAngle, int EndAngle, int rayon, - FILL_T fill, int width = -1 ); - /* - * Function PlotPoly - * Draw a polygon (filled or not) in POSTSCRIPT format - * param aCornerList = corners list - * param aFill :if true : filled polygon - * param aWidth = line width - */ - virtual void PlotPoly( std::vector< wxPoint >& aCornerList, FILL_T aFill, int aWidth = -1); + virtual bool StartPlot( FILE* fout ); + virtual bool EndPlot(); + virtual void StartPage(); + virtual void ClosePage(); + virtual void SetCurrentLineWidth( int width ); + virtual void SetDash( bool dashed ); - /* - * Function PlotImage - * Only Postscript plotters can plot bitmaps - * for plotters that cannot plot a bitmap, a rectangle is plotted - * Draw an image bitmap - * param aImage = the bitmap - * param aPos = position of the center of the bitmap - * param aScaleFactor = the scale factor to apply to the bitmap size - * (this is not the plot scale factor) - */ - virtual void PlotImage( wxImage & aImage, wxPoint aPos, double aScaleFactor ); + /** PDF can have multiple pages, so SetPageSettings can be called + * with the outputFile open (but not inside a page stream!) */ + virtual void SetPageSettings( const PAGE_INFO& aPageSettings ); + virtual void SetViewport( const wxPoint& aOffset, double aIusPerDecimil, + double aScale, bool aMirror ); + virtual void Rect( const wxPoint& p1, const wxPoint& p2, FILL_T fill, + int width = -1 ); + virtual void Circle( const wxPoint& pos, int diametre, FILL_T fill, + int width = -1 ); + virtual void Arc( const wxPoint& centre, int StAngle, int EndAngle, + int rayon, FILL_T fill, int width = -1 ); - virtual void pen_to( wxPoint pos, char plume ); - virtual void flash_pad_circle( wxPoint pos, int diametre, - EDA_DRAW_MODE_T trace_mode ); - virtual void flash_pad_oval( wxPoint pos, wxSize size, int orient, - EDA_DRAW_MODE_T trace_mode ); - virtual void flash_pad_rect( wxPoint pos, wxSize size, - int orient, EDA_DRAW_MODE_T trace_mode ); + virtual void PlotPoly( const std::vector< wxPoint >& aCornerList, + FILL_T aFill, int aWidth = -1); - virtual void flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], - int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ); + virtual void PenTo( const wxPoint& pos, char plume ); - virtual void SetLayerPolarity( bool aPositive ) {} + virtual void Text( const wxPoint& aPos, + enum EDA_COLOR_T aColor, + const wxString& aText, + int aOrient, + const wxSize& aSize, + enum EDA_TEXT_HJUSTIFY_T aH_justify, + enum EDA_TEXT_VJUSTIFY_T aV_justify, + int aWidth, + bool aItalic, + bool aBold ); + + virtual void PlotImage( const wxImage& aImage, const wxPoint& aPos, + double aScaleFactor ); - void user_to_device_coordinates( wxPoint& pos ); // overload protected: - double plot_scale_adjX, plot_scale_adjY; - double plot_width_adj; + virtual void emitSetRGBColor( double r, double g, double b ); + int allocPdfObject(); + int startPdfObject(int handle = -1); + void closePdfObject(); + int startPdfStream(int handle = -1); + void closePdfStream(); + int pageTreeHandle; /// Handle to the root of the page tree object + int fontResDictHandle; /// Font resource dictionary + std::vector pageHandles;/// Handles to the page objects + int pageStreamHandle; /// Handle of the page content object + int streamLengthHandle; /// Handle to the deferred stream length + wxString workFilename; + FILE* workFile; /// Temporary file to costruct the stream before zipping + std::vector xrefTable; /// The PDF xref offset table }; /* Class to handle a D_CODE when plotting a board : */ @@ -425,166 +634,158 @@ protected: struct APERTURE { - enum Aperture_Type { + enum APERTURE_TYPE { Circle = 1, Rect = 2, Plotting = 3, Oval = 4 }; - wxSize size; // horiz and Vert size - Aperture_Type type; // Type ( Line, rect , circulaire , ovale .. ) - int D_code; // code number ( >= 10 ); + wxSize Size; // horiz and Vert size + APERTURE_TYPE Type; // Type ( Line, rect , circulaire , ovale .. ) + int DCode; // code number ( >= 10 ); /* Trivia question: WHY Gerber decided to use D instead of the usual T for - * tool change? */ + * tool change? */ }; class GERBER_PLOTTER : public PLOTTER { public: - GERBER_PLOTTER() : - PLOTTER( PLOT_FORMAT_GERBER ) + GERBER_PLOTTER() { - work_file = 0; - final_file = 0; - current_aperture = apertures.end(); + workFile = 0; + finalFile = 0; + currentAperture = apertures.end(); } - virtual bool start_plot( FILE* fout ); - virtual bool end_plot(); - virtual void set_current_line_width( int width ); - virtual void set_default_line_width( int width ); + virtual PlotFormat GetPlotterType() const + { + return PLOT_FORMAT_GERBER; + } + + virtual bool StartPlot( FILE* fout ); + virtual bool EndPlot(); + virtual void SetCurrentLineWidth( int width ); + virtual void SetDefaultLineWidth( int width ); // RS274X has no dashing, nor colours - virtual void set_dash( bool dashed ) {}; - virtual void set_color( int color ) {}; - virtual void set_viewport( wxPoint aOffset, double aScale, bool aMirror ); - virtual void rect( wxPoint p1, wxPoint p2, FILL_T fill, int width = -1 ); - virtual void circle( wxPoint pos, int diametre, FILL_T fill, int width = -1 ); - /* - * Function PlotPoly - * Draw a polygon (filled or not) in GERBER format - * param aCornerList = corners list - * param aFill :if true : filled polygon - * param aWidth = line width - */ - virtual void PlotPoly( std::vector< wxPoint >& aCornerList, FILL_T aFill, int aWidth = -1); + virtual void SetDash( bool dashed ) {}; + virtual void SetColor( EDA_COLOR_T color ) {}; + virtual void SetViewport( const wxPoint& aOffset, double aIusPerDecimil, + double aScale, bool aMirror ); + virtual void Rect( const wxPoint& p1, const wxPoint& p2, FILL_T fill, + int width = -1 ); + virtual void Circle( const wxPoint& pos, int diametre, FILL_T fill, + int width = -1 ); + virtual void PlotPoly( const std::vector< wxPoint >& aCornerList, + FILL_T aFill, int aWidth = -1); - /* - * Function PlotImage - * Only Postscript plotters can plot bitmaps - * for plotters that cannot plot a bitmap, a rectangle is plotted - * Draw an image bitmap - * param aImage = the bitmap - * param aPos = position of the center of the bitmap - * param aScaleFactor = the scale factor to apply to the bitmap size - * (this is not the plot scale factor) - */ - virtual void PlotImage( wxImage & aImage, wxPoint aPos, double aScaleFactor ); - - virtual void pen_to( wxPoint pos, char plume ); - virtual void flash_pad_circle( wxPoint pos, int diametre, - EDA_DRAW_MODE_T trace_mode ); - virtual void flash_pad_oval( wxPoint pos, wxSize size, int orient, + virtual void PenTo( const wxPoint& pos, char plume ); + virtual void FlashPadCircle( const wxPoint& pos, int diametre, EDA_DRAW_MODE_T trace_mode ); - virtual void flash_pad_rect( wxPoint pos, wxSize size, - int orient, EDA_DRAW_MODE_T trace_mode ); + virtual void FlashPadOval( const wxPoint& pos, const wxSize& size, int orient, + EDA_DRAW_MODE_T trace_mode ); + virtual void FlashPadRect( const wxPoint& pos, const wxSize& size, + int orient, EDA_DRAW_MODE_T trace_mode ); - virtual void flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], - int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ); + virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, + int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ); - virtual void SetLayerPolarity( bool aPositive ); + virtual void SetLayerPolarity( bool aPositive ); protected: - void select_aperture( const wxSize& size, APERTURE::Aperture_Type type ); + void selectAperture( const wxSize& size, APERTURE::APERTURE_TYPE type ); + void emitDcode( const DPOINT& pt, int dcode ); std::vector::iterator - get_aperture( const wxSize& size, APERTURE::Aperture_Type type ); + getAperture( const wxSize& size, APERTURE::APERTURE_TYPE type ); - FILE* work_file, * final_file; + FILE* workFile; + FILE* finalFile; wxString m_workFilename; - void write_aperture_list(); + void writeApertureList(); std::vector apertures; - std::vector::iterator current_aperture; + std::vector::iterator currentAperture; }; class DXF_PLOTTER : public PLOTTER { public: - DXF_PLOTTER() : - PLOTTER( PLOT_FORMAT_DXF ) + DXF_PLOTTER() : textAsLines( false ) { } + virtual PlotFormat GetPlotterType() const + { + return PLOT_FORMAT_DXF; + } - virtual bool start_plot( FILE* fout ); - virtual bool end_plot(); + /// We can plot text as strokes or as TEXT entities + void SetDXFTextMode( bool aTextAsLines ) + { + textAsLines = aTextAsLines; + } + + virtual bool StartPlot( FILE* fout ); + virtual bool EndPlot(); // For now we don't use 'thick' primitives, so no line width - virtual void set_current_line_width( int width ) + virtual void SetCurrentLineWidth( int width ) { - // Handy override - current_pen_width = 0; + currentPenWidth = 0; } - virtual void set_default_line_width( int width ) + virtual void SetDefaultLineWidth( int width ) { // DXF lines are infinitesimal - default_pen_width = 0; + defaultPenWidth = 0; } - virtual void set_dash( bool dashed ); + virtual void SetDash( bool dashed ); - virtual void set_color( int color ); + virtual void SetColor( EDA_COLOR_T color ); - virtual void set_viewport( wxPoint aOffset, double aScale, bool aMirror ); - virtual void rect( wxPoint p1, wxPoint p2, FILL_T fill, int width = -1 ); - virtual void circle( wxPoint pos, int diametre, FILL_T fill, int width = -1 ); - /* - * Function PlotPoly - * Draw a polygon (filled or not) in DXF format - * param aCornerList = corners list - * param aFill :if true : filled polygon - * param aWidth = line width - */ - virtual void PlotPoly( std::vector< wxPoint >& aCornerList, FILL_T aFill, int aWidth = -1 ); - - /* - * Function PlotImage - * Only Postscript plotters can plot bitmaps - * for plotters that cannot plot a bitmap, a rectangle is plotted - * Draw an image bitmap - * param aImage = the bitmap - * param aPos = position of the center of the bitmap - * param aScaleFactor = the scale factor to apply to the bitmap size - * (this is not the plot scale factor) - */ - virtual void PlotImage( wxImage & aImage, wxPoint aPos, double aScaleFactor ); - - virtual void thick_segment( wxPoint start, wxPoint end, int width, - EDA_DRAW_MODE_T tracemode ); - virtual void arc( wxPoint centre, int StAngle, int EndAngle, int rayon, + virtual void SetViewport( const wxPoint& aOffset, double aIusPerDecimil, + double aScale, bool aMirror ); + virtual void Rect( const wxPoint& p1, const wxPoint& p2, FILL_T fill, + int width = -1 ); + virtual void Circle( const wxPoint& pos, int diametre, FILL_T fill, + int width = -1 ); + virtual void PlotPoly( const std::vector< wxPoint >& aCornerList, + FILL_T aFill, int aWidth = -1 ); + virtual void ThickSegment( const wxPoint& start, const wxPoint& end, int width, + EDA_DRAW_MODE_T tracemode ); + virtual void Arc( const wxPoint& centre, int StAngle, int EndAngle, int rayon, FILL_T fill, int width = -1 ); - virtual void pen_to( wxPoint pos, char plume ); - virtual void flash_pad_circle( wxPoint pos, int diametre, - EDA_DRAW_MODE_T trace_mode ); - virtual void flash_pad_oval( wxPoint pos, wxSize size, int orient, + virtual void PenTo( const wxPoint& pos, char plume ); + virtual void FlashPadCircle( const wxPoint& pos, int diametre, EDA_DRAW_MODE_T trace_mode ); - virtual void flash_pad_rect( wxPoint pos, wxSize size, - int orient, EDA_DRAW_MODE_T trace_mode ); + virtual void FlashPadOval( const wxPoint& pos, const wxSize& size, int orient, + EDA_DRAW_MODE_T trace_mode ); + virtual void FlashPadRect( const wxPoint& pos, const wxSize& size, + int orient, EDA_DRAW_MODE_T trace_mode ); + virtual void FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCorners, + int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ); - virtual void flash_pad_trapez( wxPoint aPadPos, wxPoint aCorners[4], - int aPadOrient, EDA_DRAW_MODE_T aTrace_Mode ); - - virtual void SetLayerPolarity( bool aPositive ) {} + virtual void Text( const wxPoint& aPos, + enum EDA_COLOR_T aColor, + const wxString& aText, + int aOrient, + const wxSize& aSize, + enum EDA_TEXT_HJUSTIFY_T aH_justify, + enum EDA_TEXT_VJUSTIFY_T aV_justify, + int aWidth, + bool aItalic, + bool aBold ); protected: - int current_color; + bool textAsLines; + int currentColor; }; #endif // PLOT_COMMON_H_ diff --git a/include/wxEeschemaStruct.h b/include/wxEeschemaStruct.h index 4413fb3709..2297ec52f6 100644 --- a/include/wxEeschemaStruct.h +++ b/include/wxEeschemaStruct.h @@ -596,6 +596,7 @@ public: // Plot functions: void ToPlot_PS( wxCommandEvent& event ); + void ToPlot_PDF( wxCommandEvent& event ); void ToPlot_HPGL( wxCommandEvent& event ); void ToPlot_DXF( wxCommandEvent& event ); void ToPostProcess( wxCommandEvent& event ); diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 104a46e3e2..d137f6feed 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -291,6 +291,7 @@ target_link_libraries(pcbnew ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${GDI_PLUS_LIBRARIES} + zlib ) ### diff --git a/pcbnew/export_gencad.cpp b/pcbnew/export_gencad.cpp index bd795dc8d2..5bcc2ce502 100644 --- a/pcbnew/export_gencad.cpp +++ b/pcbnew/export_gencad.cpp @@ -97,7 +97,7 @@ static int GencadOffsetX, GencadOffsetY; /* GerbTool chokes on units different than INCH so this is the conversion * factor */ -const static double SCALE_FACTOR = 10000.0; +const static double SCALE_FACTOR = 10000.0 * IU_PER_DECIMILS; /* Two helper functions to calculate coordinates of modules in gencad values diff --git a/pcbnew/gen_drill_report_files.cpp b/pcbnew/gen_drill_report_files.cpp index 27acfa0f9c..9895277c4f 100644 --- a/pcbnew/gen_drill_report_files.cpp +++ b/pcbnew/gen_drill_report_files.cpp @@ -18,6 +18,17 @@ #include #include +/* Conversion utilities - these will be used often in there... */ +static double diameter_in_inches(double ius) +{ + return ius * 0.001 / IU_PER_MILS; +} + +static double diameter_in_mm(double ius) +{ + return ius / IU_PER_MM; +} + void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName, const PAGE_INFO& aSheet, @@ -57,7 +68,7 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName, scale = 1; offset = auxoffset; plotter = new GERBER_PLOTTER(); - plotter->set_viewport( offset, scale, 0 ); + plotter->SetViewport( offset, IU_PER_DECIMILS, scale, 0 ); break; case PLOT_FORMAT_HPGL: // Scale for HPGL format. @@ -67,11 +78,11 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName, scale = 1; HPGL_PLOTTER* hpgl_plotter = new HPGL_PLOTTER; plotter = hpgl_plotter; - hpgl_plotter->set_pen_number( plot_opts.m_HPGLPenNum ); - hpgl_plotter->set_pen_speed( plot_opts.m_HPGLPenSpeed ); - hpgl_plotter->set_pen_overlap( 0 ); + hpgl_plotter->SetPenNumber( plot_opts.m_HPGLPenNum ); + hpgl_plotter->SetPenSpeed( plot_opts.m_HPGLPenSpeed ); + hpgl_plotter->SetPenOverlap( 0 ); plotter->SetPageSettings( aSheet ); - plotter->set_viewport( offset, scale, 0 ); + plotter->SetViewport( offset, IU_PER_DECIMILS, scale, 0 ); } break; @@ -93,7 +104,7 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName, PS_PLOTTER* ps_plotter = new PS_PLOTTER; plotter = ps_plotter; ps_plotter->SetPageSettings( pageA4 ); - plotter->set_viewport( offset, scale, 0 ); + plotter->SetViewport( offset, IU_PER_DECIMILS, scale, 0 ); } break; @@ -105,7 +116,7 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName, DXF_PLOTTER* dxf_plotter = new DXF_PLOTTER; plotter = dxf_plotter; plotter->SetPageSettings( aSheet ); - plotter->set_viewport( offset, scale, 0 ); + plotter->SetViewport( offset, IU_PER_DECIMILS, scale, 0 ); } break; @@ -113,10 +124,10 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName, wxASSERT( false ); } - plotter->set_creator( wxT( "PCBNEW" ) ); - plotter->set_filename( aFullFileName ); - plotter->set_default_line_width( 10 ); - plotter->start_plot( aFile ); + plotter->SetCreator( wxT( "PCBNEW" ) ); + plotter->SetFilename( aFullFileName ); + plotter->SetDefaultLineWidth( 10 * IU_PER_DECIMILS ); + plotter->StartPlot( aFile ); // Draw items on edge layer @@ -150,14 +161,14 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName, } // Set Drill Symbols width in 1/10000 mils - plotter->set_default_line_width( 10 ); - plotter->set_current_line_width( -1 ); + plotter->SetDefaultLineWidth( 10 * IU_PER_DECIMILS ); + plotter->SetCurrentLineWidth( -1 ); // Plot board outlines and drill map Gen_Drill_PcbMap( aPcb, plotter, aHoleListBuffer, aToolListBuffer ); // Print a list of symbols used. - CharSize = 800; // text size in 1/10000 mils + CharSize = 50 * IU_PER_MILS; // text size in IUs double CharScale = 1.0 / scale; /* real scale will be CharScale * scale_x, because the global * plot scale is scale_x */ @@ -165,12 +176,12 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName, intervalle = (int) ( CharSize * CharScale ) + TextWidth; // Trace information. - plotX = (int) ( (double) bbbox.GetX() + 200.0 * CharScale ); + plotX = (int) ( (double) bbbox.GetX() + 20 * IU_PER_MILS * CharScale ); plotY = bbbox.GetBottom() + intervalle; // Plot title "Info" wxString Text = wxT( "Drill Map:" ); - plotter->text( wxPoint( plotX, plotY ), BLACK, Text, 0, + plotter->Text( wxPoint( plotX, plotY ), BLACK, Text, 0, wxSize( (int) ( CharSize * CharScale ), (int) ( CharSize * CharScale ) ), GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, @@ -186,9 +197,10 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName, plotY += intervalle; plot_diam = (int) aToolListBuffer[ii].m_Diameter; - x = (int) ( (double) plotX - 200.0 * CharScale - (double)plot_diam / 2.0 ); + x = (int) ( (double) plotX - 20.0 * IU_PER_MILS * CharScale + - (double)plot_diam / 2.0 ); y = (int) ( (double) plotY + (double) CharSize * CharScale ); - plotter->marker( wxPoint( x, y ), plot_diam, ii ); + plotter->Marker( wxPoint( x, y ), plot_diam, ii ); // Trace the legends. @@ -196,12 +208,12 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName, // and then its diameter in the other Drill Unit. if( aUnit_Drill_is_Inch ) sprintf( line, "%2.3f\" / %2.2fmm ", - double (aToolListBuffer[ii].m_Diameter) * 0.0001, - double (aToolListBuffer[ii].m_Diameter) * 0.00254 ); + diameter_in_inches( aToolListBuffer[ii].m_Diameter ), + diameter_in_mm( aToolListBuffer[ii].m_Diameter ) ); else sprintf( line, "%2.2fmm / %2.3f\" ", - double (aToolListBuffer[ii].m_Diameter) * 0.00254, - double (aToolListBuffer[ii].m_Diameter) * 0.0001 ); + diameter_in_mm( aToolListBuffer[ii].m_Diameter ), + diameter_in_inches( aToolListBuffer[ii].m_Diameter ) ); msg = FROM_UTF8( line ); @@ -222,7 +234,7 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName, aToolListBuffer[ii].m_OvalCount ); msg += FROM_UTF8( line ); - plotter->text( wxPoint( plotX, y ), BLACK, + plotter->Text( wxPoint( plotX, y ), BLACK, msg, 0, wxSize( (int) ( CharSize * CharScale ), (int) ( CharSize * CharScale ) ), GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_CENTER, @@ -235,7 +247,7 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName, intervalle = plot_diam + 200 + TextWidth; } - plotter->end_plot(); + plotter->EndPlot(); delete plotter; } @@ -253,10 +265,10 @@ void Gen_Drill_PcbMap( BOARD* aPcb, PLOTTER* aPlotter, wxPoint pos; // create the drill list - if( aToolListBuffer.size() > 13 ) + if( aToolListBuffer.size() > PLOTTER::MARKER_COUNT ) { DisplayInfoMessage( NULL, - _( " Drill map: Too many diameter values to draw to draw one symbol per drill value (max 13)\nPlot uses circle shape for some drill values" ), + _( " Drill map: Too many diameter values to draw to draw one symbol per drill value\nPlot will use circle shape for some drill values" ), 10 ); } @@ -267,15 +279,15 @@ void Gen_Drill_PcbMap( BOARD* aPcb, PLOTTER* aPlotter, /* Always plot the drill symbol (for slots identifies the needed * cutter!) */ - aPlotter->marker( pos, aHoleListBuffer[ii].m_Hole_Diameter, + aPlotter->Marker( pos, aHoleListBuffer[ii].m_Hole_Diameter, aHoleListBuffer[ii].m_Tool_Reference - 1 ); if( aHoleListBuffer[ii].m_Hole_Shape != 0 ) { wxSize oblong_size; oblong_size = aHoleListBuffer[ii].m_Hole_Size; - aPlotter->flash_pad_oval( pos, oblong_size, - aHoleListBuffer[ii].m_Hole_Orient, LINE ); + aPlotter->FlashPadOval( pos, oblong_size, + aHoleListBuffer[ii].m_Hole_Orient, LINE ); } } } @@ -304,7 +316,7 @@ void GenDrillReportFile( FILE* aFile, BOARD* aPcb, // List which Drill Unit option had been selected for the associated // drill aFile. if( aUnit_Drill_is_Inch ) - fputs( "Selected Drill Unit: Imperial (\")\n\n", aFile ); + fputs( "Selected Drill Unit: Imperial (inches)\n\n", aFile ); else fputs( "Selected Drill Unit: Metric (mm)\n\n", aFile ); @@ -327,12 +339,12 @@ void GenDrillReportFile( FILE* aFile, BOARD* aPcb, if( gen_NPTH_holes ) { - sprintf( line, "Drill report for Not Plated through holes :\n" ); + sprintf( line, "Drill report for unplated through holes :\n" ); } else if( gen_through_holes ) { - sprintf( line, "Drill report for through holes :\n" ); + sprintf( line, "Drill report for plated through holes :\n" ); } else { @@ -342,7 +354,7 @@ void GenDrillReportFile( FILE* aFile, BOARD* aPcb, fputs( line, aFile ); } - sprintf( line, "Drill report for holes from layer %s to layer %s\n", + sprintf( line, "Drill report for holes from layer %s to layer %s :\n", TO_UTF8( aPcb->GetLayerName( layer1 ) ), TO_UTF8( aPcb->GetLayerName( layer2 ) ) ); } @@ -355,15 +367,19 @@ void GenDrillReportFile( FILE* aFile, BOARD* aPcb, // then its diameter in the selected Drill Unit, // and then its diameter in the other Drill Unit. if( aUnit_Drill_is_Inch ) + { sprintf( line, "T%d %2.3f\" %2.2fmm ", ii + 1, - double (aToolListBuffer[ii].m_Diameter) * 0.0001, - double (aToolListBuffer[ii].m_Diameter) * 0.00254 ); + diameter_in_inches( aToolListBuffer[ii].m_Diameter ), + diameter_in_mm( aToolListBuffer[ii].m_Diameter ) ); + } else + { sprintf( line, "T%d %2.2fmm %2.3f\" ", ii + 1, - double (aToolListBuffer[ii].m_Diameter) * 0.00254, - double (aToolListBuffer[ii].m_Diameter) * 0.0001 ); + diameter_in_mm( aToolListBuffer[ii].m_Diameter ), + diameter_in_inches( aToolListBuffer[ii].m_Diameter ) ); + } fputs( line, aFile ); @@ -372,13 +388,13 @@ void GenDrillReportFile( FILE* aFile, BOARD* aPcb, && ( aToolListBuffer[ii].m_OvalCount == 0 ) ) sprintf( line, "(1 hole)\n" ); else if( aToolListBuffer[ii].m_TotalCount == 1 ) - sprintf( line, "(1 hole) (with 1 oblong)\n" ); + sprintf( line, "(1 hole) (with 1 slot)\n" ); else if( aToolListBuffer[ii].m_OvalCount == 0 ) sprintf( line, "(%d holes)\n", aToolListBuffer[ii].m_TotalCount ); else if( aToolListBuffer[ii].m_OvalCount == 1 ) - sprintf( line, "(%d holes) (with 1 oblong)\n", aToolListBuffer[ii].m_TotalCount ); + sprintf( line, "(%d holes) (with 1 slot)\n", aToolListBuffer[ii].m_TotalCount ); else // if ( buffer[ii]m_OvalCount > 1 ) - sprintf( line, "(%d holes) (with %d oblongs)\n", + sprintf( line, "(%d holes) (with %d slots)\n", aToolListBuffer[ii].m_TotalCount, aToolListBuffer[ii].m_OvalCount ); @@ -388,9 +404,9 @@ void GenDrillReportFile( FILE* aFile, BOARD* aPcb, } if( gen_NPTH_holes ) - sprintf( line, "\ntotal Not Plated holes count %d\n\n\n", TotalHoleCount ); + sprintf( line, "\nTotal unplated holes count %d\n\n\n", TotalHoleCount ); else - sprintf( line, "\ntotal plated holes count %d\n\n\n", TotalHoleCount ); + sprintf( line, "\nTotal plated holes count %d\n\n\n", TotalHoleCount ); fputs( line, aFile ); diff --git a/pcbnew/gen_modules_placefile.cpp b/pcbnew/gen_modules_placefile.cpp index 9d47667a62..4e65b009ce 100644 --- a/pcbnew/gen_modules_placefile.cpp +++ b/pcbnew/gen_modules_placefile.cpp @@ -212,10 +212,10 @@ bool DIALOG_GEN_MODULE_POSITION::CreateFiles() if( singleFile ) { side = 2; - fn.SetName( fn.GetName() + wxT( "_" ) + wxT("all") ); + fn.SetName( fn.GetName() + wxT( "-" ) + wxT("all") ); } else - fn.SetName( fn.GetName() + wxT( "_" ) + frontLayerName ); + fn.SetName( fn.GetName() + wxT( "-" ) + frontLayerName ); fn.SetExt( FootprintPlaceFileExtension ); @@ -252,7 +252,7 @@ bool DIALOG_GEN_MODULE_POSITION::CreateFiles() side = 0; fn = screen->GetFileName(); fn.SetPath( GetOutputDirectory() ); - fn.SetName( fn.GetName() + wxT( "_" ) + backLayerName ); + fn.SetName( fn.GetName() + wxT( "-" ) + backLayerName ); fn.SetExt( wxT( "pos" ) ); fpcount = m_parent->DoGenFootprintsPositionFile( fn.GetFullPath(), UnitsMM(), @@ -286,10 +286,10 @@ bool DIALOG_GEN_MODULE_POSITION::CreateFiles() } // Defined values to write coordinates using inches or mm: -static const double conv_unit_inch = 0.0001; // units = INCHES +static const double conv_unit_inch = 0.001 / IU_PER_MILS ; // units = INCHES static const char unit_text_inch[] = "## Unit = inches, Angle = deg.\n"; -static const double conv_unit_mm = 0.00254; // units = mm +static const double conv_unit_mm = 1.0 / IU_PER_MM; // units = mm static const char unit_text_mm[] = "## Unit = mm, Angle = deg.\n"; static wxPoint File_Place_Offset; // Offset coordinates for generated file. @@ -451,23 +451,27 @@ int PCB_EDIT_FRAME::DoGenFootprintsPositionFile( const wxString& aFullFileName, fputs( line, file ); sprintf( line, - "# Ref Val PosX PosY Rot Side\n" ); + "# Ref Val Package PosX PosY Rot Side\n" ); fputs( line, file ); for( int ii = 0; ii < moduleCount; ii++ ) { wxPoint module_pos; - wxString ref = list[ii].m_Reference; - wxString val = list[ii].m_Value; - sprintf( line, "%-8.8s %-16.16s ", TO_UTF8( ref ), TO_UTF8( val ) ); + const wxString& ref = list[ii].m_Reference; + const wxString& val = list[ii].m_Value; + const wxString& pkg = list[ii].m_Module->m_LibRef; + sprintf( line, "%-8.8s %-16.16s %-16.16s", + TO_UTF8( ref ), TO_UTF8( val ), TO_UTF8( pkg ) ); module_pos = list[ii].m_Module->m_Pos; module_pos -= File_Place_Offset; char* text = line + strlen( line ); + /* Keep the coordinates in the first quadrant, like the gerbers + * (i.e. change sign to y) */ sprintf( text, " %9.4f %9.4f %8.1f ", module_pos.x * conv_unit, - module_pos.y * conv_unit, + -module_pos.y * conv_unit, double(list[ii].m_Module->m_Orient) / 10 ); int layer = list[ii].m_Module->GetLayer(); diff --git a/pcbnew/gendrill.cpp b/pcbnew/gendrill.cpp index 0aed12bb46..83d032eef4 100644 --- a/pcbnew/gendrill.cpp +++ b/pcbnew/gendrill.cpp @@ -405,9 +405,9 @@ void EXCELLON_WRITER::SetFormat( bool aMetric, /* Set conversion scale depending on drill file units */ if( m_unitsDecimal ) - m_conversionUnits = 0.00254; // EXCELLON units = mm + m_conversionUnits = 1.0 / IU_PER_MM; // EXCELLON units = mm else - m_conversionUnits = 0.0001; // EXCELLON units = INCHES + m_conversionUnits = 0.001 / IU_PER_MILS; // EXCELLON units = INCHES m_precision.m_lhs = aLeftDigits; m_precision.m_rhs = aRightDigits; diff --git a/pcbnew/pcb_plot_params.cpp b/pcbnew/pcb_plot_params.cpp index 5dbe6909c0..8f9dc45a8c 100644 --- a/pcbnew/pcb_plot_params.cpp +++ b/pcbnew/pcb_plot_params.cpp @@ -31,9 +31,9 @@ #define PLOT_LINEWIDTH_MIN 0 -#define PLOT_LINEWIDTH_MAX 200 +#define PLOT_LINEWIDTH_MAX (200*IU_PER_DECIMILS) #define HPGL_PEN_DIAMETER_MIN 0 -#define HPGL_PEN_DIAMETER_MAX 100 +#define HPGL_PEN_DIAMETER_MAX (100*IU_PER_DECIMILS) #define HPGL_PEN_SPEED_MIN 0 #define HPGL_PEN_SPEED_MAX 1000 #define HPGL_PEN_NUMBER_MIN 1 diff --git a/pcbnew/pcbnew.h b/pcbnew/pcbnew.h index 9759ee4b4c..2e8eb04d4a 100644 --- a/pcbnew/pcbnew.h +++ b/pcbnew/pcbnew.h @@ -10,8 +10,6 @@ #include // IS_DRAGGED and IN_EDIT definitions. #include // to define DMils2iu() conversion function -#define U_PCB (PCB_INTERNAL_UNIT / EESCHEMA_INTERNAL_UNIT) - // Arcs are approximated by segments: define the number of segments per 360 deg (KiCad uses 0.1 // deg approximation). Be aware 3600 / ARC_APPROX_SEGMENTS_COUNT_LOW_DEF is an integer. #define ARC_APPROX_SEGMENTS_COUNT_LOW_DEF 16 diff --git a/pcbnew/plot_rtn.cpp b/pcbnew/plot_rtn.cpp index a6e2e610ad..2a431c719f 100644 --- a/pcbnew/plot_rtn.cpp +++ b/pcbnew/plot_rtn.cpp @@ -98,24 +98,27 @@ void PCB_BASE_FRAME::PlotSilkScreen( PLOTTER* aPlotter, int aLayerMask, EDA_DRAW switch( pad->GetShape() ) { case PAD_CIRCLE: - aPlotter->flash_pad_circle( shape_pos, pad->GetSize().x, LINE ); + aPlotter->FlashPadCircle( shape_pos, pad->GetSize().x, LINE ); break; case PAD_OVAL: - aPlotter->flash_pad_oval( shape_pos, pad->GetSize(), pad->GetOrientation(), LINE ); + aPlotter->FlashPadOval( shape_pos, pad->GetSize(), + pad->GetOrientation(), LINE ); break; case PAD_TRAPEZOID: { wxPoint coord[4]; pad->BuildPadPolygon( coord, wxSize(0,0), 0 ); - aPlotter->flash_pad_trapez( shape_pos, coord, pad->GetOrientation(), LINE ); + aPlotter->FlashPadTrapez( shape_pos, coord, + pad->GetOrientation(), LINE ); } break; case PAD_RECT: default: - aPlotter->flash_pad_rect( shape_pos, pad->GetSize(), pad->GetOrientation(), LINE ); + aPlotter->FlashPadRect( shape_pos, pad->GetSize(), + pad->GetOrientation(), LINE ); break; } } @@ -228,7 +231,7 @@ for module\n %s's \"module text\" text of %s." ), if( ( ( 1 << seg->GetLayer() ) & aLayerMask ) == 0 ) continue; - aPlotter->thick_segment( seg->m_Start, seg->m_End, seg->m_Width, trace_mode ); + aPlotter->ThickSegment( seg->m_Start, seg->m_End, seg->m_Width, trace_mode ); } } @@ -259,7 +262,7 @@ static void PlotTextModule( PLOTTER* aPlotter, TEXTE_MODULE* pt_texte, EDA_DRAW_ // So we set bold flag to true bool allow_bold = pt_texte->m_Bold || thickness; - aPlotter->text( pos, BLACK, + aPlotter->Text( pos, BLACK, pt_texte->m_Text, orient, size, pt_texte->m_HJustify, pt_texte->m_VJustify, @@ -396,13 +399,13 @@ void Plot_1_EdgeModule( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, switch( type_trace ) { case S_SEGMENT: - aPlotter->thick_segment( pos, end, thickness, trace_mode ); + aPlotter->ThickSegment( pos, end, thickness, trace_mode ); break; case S_CIRCLE: radius = (int) hypot( (double) ( end.x - pos.x ), (double) ( end.y - pos.y ) ); - aPlotter->thick_circle( pos, radius * 2, thickness, trace_mode ); + aPlotter->ThickCircle( pos, radius * 2, thickness, trace_mode ); break; case S_ARC: @@ -416,19 +419,11 @@ void Plot_1_EdgeModule( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, if ( ( aPlotOpts.GetPlotFormat() == PLOT_FORMAT_DXF ) && ( masque_layer & ( SILKSCREEN_LAYER_BACK | DRAW_LAYER | COMMENT_LAYER ) ) ) - aPlotter->thick_arc( pos, - -startAngle, - -endAngle, - radius, - thickness, - trace_mode ); + aPlotter->ThickArc( pos, -startAngle, -endAngle, radius, + thickness, trace_mode ); else - aPlotter->thick_arc( pos, - -endAngle, - -startAngle, - radius, - thickness, - trace_mode ); + aPlotter->ThickArc( pos, -endAngle, -startAngle, radius, + thickness, trace_mode ); } break; @@ -507,9 +502,7 @@ void PlotTextePcb( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, TEXTE_PC for( unsigned i = 0; i < list->Count(); i++ ) { wxString txt = list->Item( i ); - aPlotter->text( pos, BLACK, - txt, - orient, size, + aPlotter->Text( pos, BLACK, txt, orient, size, pt_texte->m_HJustify, pt_texte->m_VJustify, thickness, pt_texte->m_Italic, allow_bold ); pos += offset; @@ -519,9 +512,7 @@ void PlotTextePcb( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, TEXTE_PC } else { - aPlotter->text( pos, BLACK, - pt_texte->m_Text, - orient, size, + aPlotter->Text( pos, BLACK, pt_texte->m_Text, orient, size, pt_texte->m_HJustify, pt_texte->m_VJustify, thickness, pt_texte->m_Italic, allow_bold ); } @@ -574,8 +565,7 @@ void PlotFilledAreas( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, ZONE_ { wxPoint start = aZone->m_FillSegmList[iseg].m_Start; wxPoint end = aZone->m_FillSegmList[iseg].m_End; - aPlotter->thick_segment( start, - end, + aPlotter->ThickSegment( start, end, aZone->m_ZoneMinThickness, trace_mode ); } @@ -590,12 +580,12 @@ void PlotFilledAreas( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, ZONE_ if( aZone->m_ZoneMinThickness > 0 ) { for( unsigned jj = 1; jjthick_segment( cornerList[jj -1], cornerList[jj], + aPlotter->ThickSegment( cornerList[jj -1], cornerList[jj], ( trace_mode == LINE ) ? -1 : aZone->m_ZoneMinThickness, trace_mode ); } - aPlotter->set_current_line_width( -1 ); + aPlotter->SetCurrentLineWidth( -1 ); } cornerList.clear(); @@ -623,14 +613,14 @@ void PlotDrawSegment( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, DRAWS wxPoint start( aSeg->GetStart() ); wxPoint end( aSeg->GetEnd() ); - aPlotter->set_current_line_width( thickness ); + aPlotter->SetCurrentLineWidth( thickness ); switch( aSeg->GetShape() ) { case S_CIRCLE: radius = (int) hypot( (double) ( end.x - start.x ), (double) ( end.y - start.y ) ); - aPlotter->thick_circle( start, radius * 2, thickness, trace_mode ); + aPlotter->ThickCircle( start, radius * 2, thickness, trace_mode ); break; case S_ARC: @@ -638,7 +628,7 @@ void PlotDrawSegment( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, DRAWS (double) ( end.y - start.y ) ); StAngle = ArcTangente( end.y - start.y, end.x - start.x ); EndAngle = StAngle + aSeg->GetAngle(); - aPlotter->thick_arc( start, -EndAngle, -StAngle, radius, thickness, trace_mode ); + aPlotter->ThickArc( start, -EndAngle, -StAngle, radius, thickness, trace_mode ); break; case S_CURVE: @@ -646,7 +636,7 @@ void PlotDrawSegment( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, DRAWS const std::vector& bezierPoints = aSeg->GetBezierPoints(); for( unsigned i = 1; i < bezierPoints.size(); i++ ) - aPlotter->thick_segment( bezierPoints[i - 1], + aPlotter->ThickSegment( bezierPoints[i - 1], bezierPoints[i], thickness, trace_mode ); @@ -654,7 +644,7 @@ void PlotDrawSegment( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, DRAWS break; default: - aPlotter->thick_segment( start, end, thickness, trace_mode ); + aPlotter->ThickSegment( start, end, thickness, trace_mode ); } } @@ -827,7 +817,7 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER* aPlotter, if( aLayerMask & ALL_CU_LAYERS ) { - width_adj = aPlotter->get_plot_width_adj(); + width_adj = aPlotter->GetPlotWidthAdj(); } switch( aLayerMask & @@ -863,7 +853,7 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER* aPlotter, (pad->GetAttribute() == PAD_HOLE_NOT_PLATED) ) break; - aPlotter->flash_pad_circle( pos, size.x, aPlotMode ); + aPlotter->FlashPadCircle( pos, size.x, aPlotMode ); break; case PAD_OVAL: @@ -872,20 +862,20 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER* aPlotter, (pad->GetAttribute() == PAD_HOLE_NOT_PLATED) ) break; - aPlotter->flash_pad_oval( pos, size, pad->GetOrientation(), aPlotMode ); + aPlotter->FlashPadOval( pos, size, pad->GetOrientation(), aPlotMode ); break; case PAD_TRAPEZOID: { wxPoint coord[4]; pad->BuildPadPolygon( coord, margin, 0 ); - aPlotter->flash_pad_trapez( pos, coord, pad->GetOrientation(), aPlotMode ); + aPlotter->FlashPadTrapez( pos, coord, pad->GetOrientation(), aPlotMode ); } break; case PAD_RECT: default: - aPlotter->flash_pad_rect( pos, size, pad->GetOrientation(), aPlotMode ); + aPlotter->FlashPadRect( pos, size, pad->GetOrientation(), aPlotMode ); break; } } @@ -925,7 +915,7 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER* aPlotter, if( aLayerMask & ALL_CU_LAYERS ) { - width_adj = aPlotter->get_plot_width_adj(); + width_adj = aPlotter->GetPlotWidthAdj(); } pos = Via->m_Start; @@ -935,7 +925,7 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER* aPlotter, if( size.x <= 0 ) continue; - aPlotter->flash_pad_circle( pos, size.x, aPlotMode ); + aPlotter->FlashPadCircle( pos, size.x, aPlotMode ); } } @@ -950,11 +940,11 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER* aPlotter, if( (GetLayerMask( track->GetLayer() ) & aLayerMask) == 0 ) continue; - size.x = size.y = track->m_Width + aPlotter->get_plot_width_adj(); + size.x = size.y = track->m_Width + aPlotter->GetPlotWidthAdj(); pos = track->m_Start; end = track->m_End; - aPlotter->thick_segment( pos, end, size.x, aPlotMode ); + aPlotter->ThickSegment( pos, end, size.x, aPlotMode ); } // Plot zones (outdated, for old boards compatibility): @@ -965,11 +955,11 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER* aPlotter, if( (GetLayerMask( track->GetLayer() ) & aLayerMask) == 0 ) continue; - size.x = size.y = track->m_Width + aPlotter->get_plot_width_adj(); + size.x = size.y = track->m_Width + aPlotter->GetPlotWidthAdj(); pos = track->m_Start; end = track->m_End; - aPlotter->thick_segment( pos, end, size.x, aPlotMode ); + aPlotter->ThickSegment( pos, end, size.x, aPlotMode ); } // Plot filled ares @@ -1010,7 +1000,7 @@ void PCB_BASE_FRAME::PlotDrillMark( PLOTTER* aPlotter, if( aTraceMode == FILLED ) { - aPlotter->set_color( WHITE ); + aPlotter->SetColor( WHITE ); } for( pts = m_Pcb->m_Track; pts != NULL; pts = pts->Next() ) @@ -1026,9 +1016,9 @@ void PCB_BASE_FRAME::PlotDrillMark( PLOTTER* aPlotter, else diam.x = diam.y = pts->GetDrillValue(); - diam.x -= aPlotter->get_plot_width_adj(); + diam.x -= aPlotter->GetPlotWidthAdj(); diam.x = Clamp( 1, diam.x, pts->m_Width - 1 ); - aPlotter->flash_pad_circle( pos, diam.x, aTraceMode ); + aPlotter->FlashPadCircle( pos, diam.x, aTraceMode ); } for( Module = m_Pcb->m_Modules; Module != NULL; Module = Module->Next() ) @@ -1044,25 +1034,25 @@ void PCB_BASE_FRAME::PlotDrillMark( PLOTTER* aPlotter, if( pad->GetDrillShape() == PAD_OVAL ) { diam = pad->GetDrillSize(); - diam.x -= aPlotter->get_plot_width_adj(); + diam.x -= aPlotter->GetPlotWidthAdj(); diam.x = Clamp( 1, diam.x, pad->GetSize().x - 1 ); - diam.y -= aPlotter->get_plot_width_adj(); + diam.y -= aPlotter->GetPlotWidthAdj(); diam.y = Clamp( 1, diam.y, pad->GetSize().y - 1 ); - aPlotter->flash_pad_oval( pos, diam, pad->GetOrientation(), aTraceMode ); + aPlotter->FlashPadOval( pos, diam, pad->GetOrientation(), aTraceMode ); } else { // It is quite possible that the real pad drill value is less then small drill value. diam.x = aSmallDrillShape ? MIN( SMALL_DRILL, pad->GetDrillSize().x ) : pad->GetDrillSize().x; - diam.x -= aPlotter->get_plot_width_adj(); + diam.x -= aPlotter->GetPlotWidthAdj(); diam.x = Clamp( 1, diam.x, pad->GetSize().x - 1 ); - aPlotter->flash_pad_circle( pos, diam.x, aTraceMode ); + aPlotter->FlashPadCircle( pos, diam.x, aTraceMode ); } } } if( aTraceMode == FILLED ) { - aPlotter->set_color( BLACK ); + aPlotter->SetColor( BLACK ); } } diff --git a/pcbnew/plotdxf.cpp b/pcbnew/plotdxf.cpp index 7e35020a89..68eb1109fe 100644 --- a/pcbnew/plotdxf.cpp +++ b/pcbnew/plotdxf.cpp @@ -31,16 +31,16 @@ bool PCB_BASE_FRAME::ExportToDxfFile( const wxString& aFullFileName, int aLayer, DXF_PLOTTER* plotter = new DXF_PLOTTER(); plotter->SetPageSettings( GetPageSettings() ); - plotter->set_viewport( wxPoint( 0, 0 ), 1, 0 ); - plotter->set_creator( wxT( "PCBNEW-DXF" ) ); - plotter->set_filename( aFullFileName ); - plotter->start_plot( output_file ); + plotter->SetViewport( wxPoint( 0, 0 ), IU_PER_DECIMILS, 1, 0 ); + plotter->SetCreator( wxT( "PCBNEW-DXF" ) ); + plotter->SetFilename( aFullFileName ); + plotter->StartPlot( output_file ); if( plot_opts.m_PlotFrameRef ) PlotWorkSheet( plotter, GetScreen() ); Plot_Layer( plotter, aLayer, aTraceMode ); - plotter->end_plot(); + plotter->EndPlot(); delete plotter; return true; } diff --git a/pcbnew/plotgerb.cpp b/pcbnew/plotgerb.cpp index 3fb3f43866..cd28252698 100644 --- a/pcbnew/plotgerb.cpp +++ b/pcbnew/plotgerb.cpp @@ -54,12 +54,12 @@ bool PCB_BASE_FRAME::ExportToGerberFile( const wxString& aFullFileName, int aLay PLOTTER* plotter = new GERBER_PLOTTER(); // No mirror and scaling for gerbers! - plotter->set_viewport( offset, scale, 0 ); - plotter->set_default_line_width( plot_opts.m_PlotLineWidth ); - plotter->set_creator( wxT( "PCBNEW-RS274X" ) ); - plotter->set_filename( aFullFileName ); + plotter->SetViewport( offset, IU_PER_DECIMILS, scale, 0 ); + plotter->SetDefaultLineWidth( plot_opts.m_PlotLineWidth ); + plotter->SetCreator( wxT( "PCBNEW-RS274X" ) ); + plotter->SetFilename( aFullFileName ); - if( plotter->start_plot( output_file ) ) + if( plotter->StartPlot( output_file ) ) { // Skip NPTH pads on copper layers // ( only if hole size == pad size ): @@ -74,7 +74,7 @@ bool PCB_BASE_FRAME::ExportToGerberFile( const wxString& aFullFileName, int aLay Plot_Layer( plotter, aLayer, aTraceMode ); - plotter->end_plot(); + plotter->EndPlot(); plot_opts.m_SkipNPTH_Pads = false; diff --git a/pcbnew/plothpgl.cpp b/pcbnew/plothpgl.cpp index f5177aec7e..3c8faca4c6 100644 --- a/pcbnew/plothpgl.cpp +++ b/pcbnew/plothpgl.cpp @@ -38,7 +38,7 @@ bool PCB_BASE_FRAME::ExportToHpglFile( const wxString& aFullFileName, int aLayer // Compute pen_dim (from g_m_HPGLPenDiam in mils) in pcb units, // with plot scale (if Scale is 2, pen diameter is always g_m_HPGLPenDiam // so apparent pen diam is real pen diam / Scale - int pen_diam = KiROUND( (plot_opts.m_HPGLPenDiam * U_PCB) / + int pen_diam = KiROUND( plot_opts.m_HPGLPenDiam / plot_opts.m_PlotScale ); // compute pen_overlay (from g_m_HPGLPenOvr in mils) with plot scale @@ -100,22 +100,23 @@ bool PCB_BASE_FRAME::ExportToHpglFile( const wxString& aFullFileName, int aLayer // why did we have to change these settings above? SetPlotSettings( plot_opts ); - plotter->set_viewport( offset, scale, plot_opts.m_PlotMirror ); - plotter->set_default_line_width( plot_opts.m_PlotLineWidth ); - plotter->set_creator( wxT( "PCBNEW-HPGL" ) ); - plotter->set_filename( aFullFileName ); - plotter->set_pen_speed( plot_opts.m_HPGLPenSpeed ); - plotter->set_pen_number( plot_opts.m_HPGLPenNum ); - plotter->set_pen_overlap( pen_overlay ); - plotter->set_pen_diameter( pen_diam ); - plotter->start_plot( output_file ); + plotter->SetViewport( offset, IU_PER_DECIMILS, scale, + plot_opts.m_PlotMirror ); + plotter->SetDefaultLineWidth( plot_opts.m_PlotLineWidth ); + plotter->SetCreator( wxT( "PCBNEW-HPGL" ) ); + plotter->SetFilename( aFullFileName ); + plotter->SetPenSpeed( plot_opts.m_HPGLPenSpeed ); + plotter->SetPenNumber( plot_opts.m_HPGLPenNum ); + plotter->SetPenOverlap( pen_overlay ); + plotter->SetPenDiameter( pen_diam ); + plotter->StartPlot( output_file ); // The worksheet is not significant with scale!=1... It is with paperscale!=1, anyway if( plot_opts.m_PlotFrameRef && !center ) PlotWorkSheet( plotter, GetScreen() ); Plot_Layer( plotter, aLayer, aTraceMode ); - plotter->end_plot(); + plotter->EndPlot(); delete plotter; return true; diff --git a/pcbnew/plotps.cpp b/pcbnew/plotps.cpp index eb518d4782..835930200f 100644 --- a/pcbnew/plotps.cpp +++ b/pcbnew/plotps.cpp @@ -108,14 +108,16 @@ bool PCB_BASE_FRAME::ExportToPostScriptFile( const wxString& aFullFileName, int // why did we have to change these settings? SetPlotSettings( plotOpts ); - plotter->set_scale_adjust( plotOpts.m_FineScaleAdjustX, + plotter->SetScaleAdjust( plotOpts.m_FineScaleAdjustX, plotOpts.m_FineScaleAdjustY ); - plotter->set_plot_width_adj( plotOpts.m_FineWidthAdjust ); - plotter->set_viewport( offset, scale, plotOpts.m_PlotMirror ); - plotter->set_default_line_width( plotOpts.m_PlotLineWidth ); - plotter->set_creator( wxT( "PCBNEW-PS" ) ); - plotter->set_filename( aFullFileName ); - plotter->start_plot( output_file ); + plotter->SetPlotWidthAdj( plotOpts.m_FineWidthAdjust ); + plotter->SetViewport( offset, IU_PER_DECIMILS, scale, + plotOpts.m_PlotMirror ); + plotter->SetDefaultLineWidth( plotOpts.m_PlotLineWidth ); + plotter->SetCreator( wxT( "PCBNEW-PS" ) ); + plotter->SetFilename( aFullFileName ); + plotter->SetPsTextMode( PSTEXTMODE_PHANTOM ); + plotter->StartPlot( output_file ); /* The worksheet is not significant with scale!=1... It is with paperscale!=1, anyway */ if( plotOpts.m_PlotFrameRef && !center ) @@ -127,18 +129,18 @@ bool PCB_BASE_FRAME::ExportToPostScriptFile( const wxString& aFullFileName, int if( plotOpts.m_PlotPSNegative ) { int margin = 500; // Add a 0.5 inch margin around the board - plotter->set_negative( true ); - plotter->set_color( WHITE ); // Which will be plotted as black - plotter->rect( wxPoint( bbbox.GetX() - margin, + plotter->SetNegative( true ); + plotter->SetColor( WHITE ); // Which will be plotted as black + plotter->Rect( wxPoint( bbbox.GetX() - margin, bbbox.GetY() - margin ), wxPoint( bbbox.GetRight() + margin, bbbox.GetBottom() + margin ), FILLED_SHAPE ); - plotter->set_color( BLACK ); + plotter->SetColor( BLACK ); } Plot_Layer( plotter, aLayer, aTraceMode ); - plotter->end_plot(); + plotter->EndPlot(); delete plotter; return true; diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt new file mode 100644 index 0000000000..60fbc3f1e4 --- /dev/null +++ b/zlib/CMakeLists.txt @@ -0,0 +1,15 @@ +set(ZLIB_SRCS + compress.c + crc32.c + deflate.c + gzio.c + infback.c + inffast.c + inflate.c + inftrees.c + trees.c + uncompr.c + zutil.c + ) + +add_library(zlib STATIC ${ZLIB_SRCS}) diff --git a/zlib/ChangeLog b/zlib/ChangeLog new file mode 100644 index 0000000000..1ac946309b --- /dev/null +++ b/zlib/ChangeLog @@ -0,0 +1,855 @@ + + ChangeLog file for zlib + +Changes in 1.2.3 (18 July 2005) +- Apply security vulnerability fixes to contrib/infback9 as well +- Clean up some text files (carriage returns, trailing space) +- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant] + +Changes in 1.2.2.4 (11 July 2005) +- Add inflatePrime() function for starting inflation at bit boundary +- Avoid some Visual C warnings in deflate.c +- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit + compile +- Fix some spelling errors in comments [Betts] +- Correct inflateInit2() error return documentation in zlib.h +- Added zran.c example of compressed data random access to examples + directory, shows use of inflatePrime() +- Fix cast for assignments to strm->state in inflate.c and infback.c +- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer] +- Move declarations of gf2 functions to right place in crc32.c [Oberhumer] +- Add cast in trees.c t avoid a warning [Oberhumer] +- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer] +- Update make_vms.com [Zinser] +- Initialize state->write in inflateReset() since copied in inflate_fast() +- Be more strict on incomplete code sets in inflate_table() and increase + ENOUGH and MAXD -- this repairs a possible security vulnerability for + invalid inflate input. Thanks to Tavis Ormandy and Markus Oberhumer for + discovering the vulnerability and providing test cases. +- Add ia64 support to configure for HP-UX [Smith] +- Add error return to gzread() for format or i/o error [Levin] +- Use malloc.h for OS/2 [Necasek] + +Changes in 1.2.2.3 (27 May 2005) +- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile +- Typecast fread() return values in gzio.c [Vollant] +- Remove trailing space in minigzip.c outmode (VC++ can't deal with it) +- Fix crc check bug in gzread() after gzungetc() [Heiner] +- Add the deflateTune() function to adjust internal compression parameters +- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack) +- Remove an incorrect assertion in examples/zpipe.c +- Add C++ wrapper in infback9.h [Donais] +- Fix bug in inflateCopy() when decoding fixed codes +- Note in zlib.h how much deflateSetDictionary() actually uses +- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used) +- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer] +- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer] +- Add gzdirect() function to indicate transparent reads +- Update contrib/minizip [Vollant] +- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer] +- Add casts in crc32.c to avoid warnings [Oberhumer] +- Add contrib/masmx64 [Vollant] +- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant] + +Changes in 1.2.2.2 (30 December 2004) +- Replace structure assignments in deflate.c and inflate.c with zmemcpy to + avoid implicit memcpy calls (portability for no-library compilation) +- Increase sprintf() buffer size in gzdopen() to allow for large numbers +- Add INFLATE_STRICT to check distances against zlib header +- Improve WinCE errno handling and comments [Chang] +- Remove comment about no gzip header processing in FAQ +- Add Z_FIXED strategy option to deflateInit2() to force fixed trees +- Add updated make_vms.com [Coghlan], update README +- Create a new "examples" directory, move gzappend.c there, add zpipe.c, + fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html. +- Add FAQ entry and comments in deflate.c on uninitialized memory access +- Add Solaris 9 make options in configure [Gilbert] +- Allow strerror() usage in gzio.c for STDC +- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer] +- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant] +- Use z_off_t for adler32_combine() and crc32_combine() lengths +- Make adler32() much faster for small len +- Use OS_CODE in deflate() default gzip header + +Changes in 1.2.2.1 (31 October 2004) +- Allow inflateSetDictionary() call for raw inflate +- Fix inflate header crc check bug for file names and comments +- Add deflateSetHeader() and gz_header structure for custom gzip headers +- Add inflateGetheader() to retrieve gzip headers +- Add crc32_combine() and adler32_combine() functions +- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list +- Use zstreamp consistently in zlib.h (inflate_back functions) +- Remove GUNZIP condition from definition of inflate_mode in inflate.h + and in contrib/inflate86/inffast.S [Truta, Anderson] +- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson] +- Update projects/README.projects and projects/visualc6 [Truta] +- Update win32/DLL_FAQ.txt [Truta] +- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta] +- Deprecate Z_ASCII; use Z_TEXT instead [Truta] +- Use a new algorithm for setting strm->data_type in trees.c [Truta] +- Do not define an exit() prototype in zutil.c unless DEBUG defined +- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta] +- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate() +- Fix Darwin build version identification [Peterson] + +Changes in 1.2.2 (3 October 2004) +- Update zlib.h comments on gzip in-memory processing +- Set adler to 1 in inflateReset() to support Java test suite [Walles] +- Add contrib/dotzlib [Ravn] +- Update win32/DLL_FAQ.txt [Truta] +- Update contrib/minizip [Vollant] +- Move contrib/visual-basic.txt to old/ [Truta] +- Fix assembler builds in projects/visualc6/ [Truta] + +Changes in 1.2.1.2 (9 September 2004) +- Update INDEX file +- Fix trees.c to update strm->data_type (no one ever noticed!) +- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown] +- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE) +- Add limited multitasking protection to DYNAMIC_CRC_TABLE +- Add NO_vsnprintf for VMS in zutil.h [Mozilla] +- Don't declare strerror() under VMS [Mozilla] +- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize +- Update contrib/ada [Anisimkov] +- Update contrib/minizip [Vollant] +- Fix configure to not hardcode directories for Darwin [Peterson] +- Fix gzio.c to not return error on empty files [Brown] +- Fix indentation; update version in contrib/delphi/ZLib.pas and + contrib/pascal/zlibpas.pas [Truta] +- Update mkasm.bat in contrib/masmx86 [Truta] +- Update contrib/untgz [Truta] +- Add projects/README.projects [Truta] +- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta] +- Update win32/DLL_FAQ.txt [Truta] +- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta] +- Remove an unnecessary assignment to curr in inftrees.c [Truta] +- Add OS/2 to exe builds in configure [Poltorak] +- Remove err dummy parameter in zlib.h [Kientzle] + +Changes in 1.2.1.1 (9 January 2004) +- Update email address in README +- Several FAQ updates +- Fix a big fat bug in inftrees.c that prevented decoding valid + dynamic blocks with only literals and no distance codes -- + Thanks to "Hot Emu" for the bug report and sample file +- Add a note to puff.c on no distance codes case. + +Changes in 1.2.1 (17 November 2003) +- Remove a tab in contrib/gzappend/gzappend.c +- Update some interfaces in contrib for new zlib functions +- Update zlib version number in some contrib entries +- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta] +- Support shared libraries on Hurd and KFreeBSD [Brown] +- Fix error in NO_DIVIDE option of adler32.c + +Changes in 1.2.0.8 (4 November 2003) +- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas +- Add experimental NO_DIVIDE #define in adler32.c + - Possibly faster on some processors (let me know if it is) +- Correct Z_BLOCK to not return on first inflate call if no wrap +- Fix strm->data_type on inflate() return to correctly indicate EOB +- Add deflatePrime() function for appending in the middle of a byte +- Add contrib/gzappend for an example of appending to a stream +- Update win32/DLL_FAQ.txt [Truta] +- Delete Turbo C comment in README [Truta] +- Improve some indentation in zconf.h [Truta] +- Fix infinite loop on bad input in configure script [Church] +- Fix gzeof() for concatenated gzip files [Johnson] +- Add example to contrib/visual-basic.txt [Michael B.] +- Add -p to mkdir's in Makefile.in [vda] +- Fix configure to properly detect presence or lack of printf functions +- Add AS400 support [Monnerat] +- Add a little Cygwin support [Wilson] + +Changes in 1.2.0.7 (21 September 2003) +- Correct some debug formats in contrib/infback9 +- Cast a type in a debug statement in trees.c +- Change search and replace delimiter in configure from % to # [Beebe] +- Update contrib/untgz to 0.2 with various fixes [Truta] +- Add build support for Amiga [Nikl] +- Remove some directories in old that have been updated to 1.2 +- Add dylib building for Mac OS X in configure and Makefile.in +- Remove old distribution stuff from Makefile +- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X +- Update links in README + +Changes in 1.2.0.6 (13 September 2003) +- Minor FAQ updates +- Update contrib/minizip to 1.00 [Vollant] +- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta] +- Update POSTINC comment for 68060 [Nikl] +- Add contrib/infback9 with deflate64 decoding (unsupported) +- For MVS define NO_vsnprintf and undefine FAR [van Burik] +- Add pragma for fdopen on MVS [van Burik] + +Changes in 1.2.0.5 (8 September 2003) +- Add OF to inflateBackEnd() declaration in zlib.h +- Remember start when using gzdopen in the middle of a file +- Use internal off_t counters in gz* functions to properly handle seeks +- Perform more rigorous check for distance-too-far in inffast.c +- Add Z_BLOCK flush option to return from inflate at block boundary +- Set strm->data_type on return from inflate + - Indicate bits unused, if at block boundary, and if in last block +- Replace size_t with ptrdiff_t in crc32.c, and check for correct size +- Add condition so old NO_DEFLATE define still works for compatibility +- FAQ update regarding the Windows DLL [Truta] +- INDEX update: add qnx entry, remove aix entry [Truta] +- Install zlib.3 into mandir [Wilson] +- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta] +- Adapt the zlib interface to the new DLL convention guidelines [Truta] +- Introduce ZLIB_WINAPI macro to allow the export of functions using + the WINAPI calling convention, for Visual Basic [Vollant, Truta] +- Update msdos and win32 scripts and makefiles [Truta] +- Export symbols by name, not by ordinal, in win32/zlib.def [Truta] +- Add contrib/ada [Anisimkov] +- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta] +- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant] +- Add contrib/masm686 [Truta] +- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm + [Truta, Vollant] +- Update contrib/delphi; rename to contrib/pascal; add example [Truta] +- Remove contrib/delphi2; add a new contrib/delphi [Truta] +- Avoid inclusion of the nonstandard in contrib/iostream, + and fix some method prototypes [Truta] +- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip + [Truta] +- Avoid the use of backslash (\) in contrib/minizip [Vollant] +- Fix file time handling in contrib/untgz; update makefiles [Truta] +- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines + [Vollant] +- Remove contrib/vstudio/vc15_16 [Vollant] +- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta] +- Update README.contrib [Truta] +- Invert the assignment order of match_head and s->prev[...] in + INSERT_STRING [Truta] +- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings + [Truta] +- Compare function pointers with 0, not with NULL or Z_NULL [Truta] +- Fix prototype of syncsearch in inflate.c [Truta] +- Introduce ASMINF macro to be enabled when using an ASM implementation + of inflate_fast [Truta] +- Change NO_DEFLATE to NO_GZCOMPRESS [Truta] +- Modify test_gzio in example.c to take a single file name as a + parameter [Truta] +- Exit the example.c program if gzopen fails [Truta] +- Add type casts around strlen in example.c [Truta] +- Remove casting to sizeof in minigzip.c; give a proper type + to the variable compared with SUFFIX_LEN [Truta] +- Update definitions of STDC and STDC99 in zconf.h [Truta] +- Synchronize zconf.h with the new Windows DLL interface [Truta] +- Use SYS16BIT instead of __32BIT__ to distinguish between + 16- and 32-bit platforms [Truta] +- Use far memory allocators in small 16-bit memory models for + Turbo C [Truta] +- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in + zlibCompileFlags [Truta] +- Cygwin has vsnprintf [Wilson] +- In Windows16, OS_CODE is 0, as in MSDOS [Truta] +- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson] + +Changes in 1.2.0.4 (10 August 2003) +- Minor FAQ updates +- Be more strict when checking inflateInit2's windowBits parameter +- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well +- Add gzip wrapper option to deflateInit2 using windowBits +- Add updated QNX rule in configure and qnx directory [Bonnefoy] +- Make inflate distance-too-far checks more rigorous +- Clean up FAR usage in inflate +- Add casting to sizeof() in gzio.c and minigzip.c + +Changes in 1.2.0.3 (19 July 2003) +- Fix silly error in gzungetc() implementation [Vollant] +- Update contrib/minizip and contrib/vstudio [Vollant] +- Fix printf format in example.c +- Correct cdecl support in zconf.in.h [Anisimkov] +- Minor FAQ updates + +Changes in 1.2.0.2 (13 July 2003) +- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons +- Attempt to avoid warnings in crc32.c for pointer-int conversion +- Add AIX to configure, remove aix directory [Bakker] +- Add some casts to minigzip.c +- Improve checking after insecure sprintf() or vsprintf() calls +- Remove #elif's from crc32.c +- Change leave label to inf_leave in inflate.c and infback.c to avoid + library conflicts +- Remove inflate gzip decoding by default--only enable gzip decoding by + special request for stricter backward compatibility +- Add zlibCompileFlags() function to return compilation information +- More typecasting in deflate.c to avoid warnings +- Remove leading underscore from _Capital #defines [Truta] +- Fix configure to link shared library when testing +- Add some Windows CE target adjustments [Mai] +- Remove #define ZLIB_DLL in zconf.h [Vollant] +- Add zlib.3 [Rodgers] +- Update RFC URL in deflate.c and algorithm.txt [Mai] +- Add zlib_dll_FAQ.txt to contrib [Truta] +- Add UL to some constants [Truta] +- Update minizip and vstudio [Vollant] +- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h +- Expand use of NO_DUMMY_DECL to avoid all dummy structures +- Added iostream3 to contrib [Schwardt] +- Replace rewind() with fseek() for WinCE [Truta] +- Improve setting of zlib format compression level flags + - Report 0 for huffman and rle strategies and for level == 0 or 1 + - Report 2 only for level == 6 +- Only deal with 64K limit when necessary at compile time [Truta] +- Allow TOO_FAR check to be turned off at compile time [Truta] +- Add gzclearerr() function [Souza] +- Add gzungetc() function + +Changes in 1.2.0.1 (17 March 2003) +- Add Z_RLE strategy for run-length encoding [Truta] + - When Z_RLE requested, restrict matches to distance one + - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE +- Correct FASTEST compilation to allow level == 0 +- Clean up what gets compiled for FASTEST +- Incorporate changes to zconf.in.h [Vollant] + - Refine detection of Turbo C need for dummy returns + - Refine ZLIB_DLL compilation + - Include additional header file on VMS for off_t typedef +- Try to use _vsnprintf where it supplants vsprintf [Vollant] +- Add some casts in inffast.c +- Enchance comments in zlib.h on what happens if gzprintf() tries to + write more than 4095 bytes before compression +- Remove unused state from inflateBackEnd() +- Remove exit(0) from minigzip.c, example.c +- Get rid of all those darn tabs +- Add "check" target to Makefile.in that does the same thing as "test" +- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in +- Update contrib/inflate86 [Anderson] +- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant] +- Add msdos and win32 directories with makefiles [Truta] +- More additions and improvements to the FAQ + +Changes in 1.2.0 (9 March 2003) +- New and improved inflate code + - About 20% faster + - Does not allocate 32K window unless and until needed + - Automatically detects and decompresses gzip streams + - Raw inflate no longer needs an extra dummy byte at end + - Added inflateBack functions using a callback interface--even faster + than inflate, useful for file utilities (gzip, zip) + - Added inflateCopy() function to record state for random access on + externally generated deflate streams (e.g. in gzip files) + - More readable code (I hope) +- New and improved crc32() + - About 50% faster, thanks to suggestions from Rodney Brown +- Add deflateBound() and compressBound() functions +- Fix memory leak in deflateInit2() +- Permit setting dictionary for raw deflate (for parallel deflate) +- Fix const declaration for gzwrite() +- Check for some malloc() failures in gzio.c +- Fix bug in gzopen() on single-byte file 0x1f +- Fix bug in gzread() on concatenated file with 0x1f at end of buffer + and next buffer doesn't start with 0x8b +- Fix uncompress() to return Z_DATA_ERROR on truncated input +- Free memory at end of example.c +- Remove MAX #define in trees.c (conflicted with some libraries) +- Fix static const's in deflate.c, gzio.c, and zutil.[ch] +- Declare malloc() and free() in gzio.c if STDC not defined +- Use malloc() instead of calloc() in zutil.c if int big enough +- Define STDC for AIX +- Add aix/ with approach for compiling shared library on AIX +- Add HP-UX support for shared libraries in configure +- Add OpenUNIX support for shared libraries in configure +- Use $cc instead of gcc to build shared library +- Make prefix directory if needed when installing +- Correct Macintosh avoidance of typedef Byte in zconf.h +- Correct Turbo C memory allocation when under Linux +- Use libz.a instead of -lz in Makefile (assure use of compiled library) +- Update configure to check for snprintf or vsnprintf functions and their + return value, warn during make if using an insecure function +- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that + is lost when library is used--resolution is to build new zconf.h +- Documentation improvements (in zlib.h): + - Document raw deflate and inflate + - Update RFCs URL + - Point out that zlib and gzip formats are different + - Note that Z_BUF_ERROR is not fatal + - Document string limit for gzprintf() and possible buffer overflow + - Note requirement on avail_out when flushing + - Note permitted values of flush parameter of inflate() +- Add some FAQs (and even answers) to the FAQ +- Add contrib/inflate86/ for x86 faster inflate +- Add contrib/blast/ for PKWare Data Compression Library decompression +- Add contrib/puff/ simple inflate for deflate format description + +Changes in 1.1.4 (11 March 2002) +- ZFREE was repeated on same allocation on some error conditions. + This creates a security problem described in + http://www.zlib.org/advisory-2002-03-11.txt +- Returned incorrect error (Z_MEM_ERROR) on some invalid data +- Avoid accesses before window for invalid distances with inflate window + less than 32K. +- force windowBits > 8 to avoid a bug in the encoder for a window size + of 256 bytes. (A complete fix will be available in 1.1.5). + +Changes in 1.1.3 (9 July 1998) +- fix "an inflate input buffer bug that shows up on rare but persistent + occasions" (Mark) +- fix gzread and gztell for concatenated .gz files (Didier Le Botlan) +- fix gzseek(..., SEEK_SET) in write mode +- fix crc check after a gzeek (Frank Faubert) +- fix miniunzip when the last entry in a zip file is itself a zip file + (J Lillge) +- add contrib/asm586 and contrib/asm686 (Brian Raiter) + See http://www.muppetlabs.com/~breadbox/software/assembly.html +- add support for Delphi 3 in contrib/delphi (Bob Dellaca) +- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti) +- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren) +- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks) +- added a FAQ file + +- Support gzdopen on Mac with Metrowerks (Jason Linhart) +- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart) +- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young) +- avoid some warnings with Borland C (Tom Tanner) +- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant) +- emulate utime() for WIN32 in contrib/untgz (Gilles Vollant) +- allow several arguments to configure (Tim Mooney, Frodo Looijaard) +- use libdir and includedir in Makefile.in (Tim Mooney) +- support shared libraries on OSF1 V4 (Tim Mooney) +- remove so_locations in "make clean" (Tim Mooney) +- fix maketree.c compilation error (Glenn, Mark) +- Python interface to zlib now in Python 1.5 (Jeremy Hylton) +- new Makefile.riscos (Rich Walker) +- initialize static descriptors in trees.c for embedded targets (Nick Smith) +- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith) +- add the OS/2 files in Makefile.in too (Andrew Zabolotny) +- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane) +- fix maketree.c to allow clean compilation of inffixed.h (Mark) +- fix parameter check in deflateCopy (Gunther Nikl) +- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler) +- Many portability patches by Christian Spieler: + . zutil.c, zutil.h: added "const" for zmem* + . Make_vms.com: fixed some typos + . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists + . msdos/Makefile.msc: remove "default rtl link library" info from obj files + . msdos/Makefile.*: use model-dependent name for the built zlib library + . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc: + new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT) +- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane) +- replace __far with _far for better portability (Christian Spieler, Tom Lane) +- fix test for errno.h in configure (Tim Newsham) + +Changes in 1.1.2 (19 March 98) +- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant) + See http://www.winimage.com/zLibDll/unzip.html +- preinitialize the inflate tables for fixed codes, to make the code + completely thread safe (Mark) +- some simplifications and slight speed-up to the inflate code (Mark) +- fix gzeof on non-compressed files (Allan Schrum) +- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs) +- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn) +- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny) +- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori) +- do not wrap extern "C" around system includes (Tom Lane) +- mention zlib binding for TCL in README (Andreas Kupries) +- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert) +- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson) +- allow "configure --prefix $HOME" (Tim Mooney) +- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson) +- move Makefile.sas to amiga/Makefile.sas + +Changes in 1.1.1 (27 Feb 98) +- fix macros _tr_tally_* in deflate.h for debug mode (Glenn Randers-Pehrson) +- remove block truncation heuristic which had very marginal effect for zlib + (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the + compression ratio on some files. This also allows inlining _tr_tally for + matches in deflate_slow. +- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier) + +Changes in 1.1.0 (24 Feb 98) +- do not return STREAM_END prematurely in inflate (John Bowler) +- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler) +- compile with -DFASTEST to get compression code optimized for speed only +- in minigzip, try mmap'ing the input file first (Miguel Albrecht) +- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain + on Sun but significant on HP) + +- add a pointer to experimental unzip library in README (Gilles Vollant) +- initialize variable gcc in configure (Chris Herborth) + +Changes in 1.0.9 (17 Feb 1998) +- added gzputs and gzgets functions +- do not clear eof flag in gzseek (Mark Diekhans) +- fix gzseek for files in transparent mode (Mark Diekhans) +- do not assume that vsprintf returns the number of bytes written (Jens Krinke) +- replace EXPORT with ZEXPORT to avoid conflict with other programs +- added compress2 in zconf.h, zlib.def, zlib.dnt +- new asm code from Gilles Vollant in contrib/asm386 +- simplify the inflate code (Mark): + . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new() + . ZALLOC the length list in inflate_trees_fixed() instead of using stack + . ZALLOC the value area for huft_build() instead of using stack + . Simplify Z_FINISH check in inflate() + +- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8 +- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi) +- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with + the declaration of FAR (Gilles VOllant) +- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann) +- read_buf buf parameter of type Bytef* instead of charf* +- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout) +- do not redeclare unlink in minigzip.c for WIN32 (John Bowler) +- fix check for presence of directories in "make install" (Ian Willis) + +Changes in 1.0.8 (27 Jan 1998) +- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant) +- fix gzgetc and gzputc for big endian systems (Markus Oberhumer) +- added compress2() to allow setting the compression level +- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong) +- use constant arrays for the static trees in trees.c instead of computing + them at run time (thanks to Ken Raeburn for this suggestion). To create + trees.h, compile with GEN_TREES_H and run "make test". +- check return code of example in "make test" and display result +- pass minigzip command line options to file_compress +- simplifying code of inflateSync to avoid gcc 2.8 bug + +- support CC="gcc -Wall" in configure -s (QingLong) +- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn) +- fix test for shared library support to avoid compiler warnings +- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant) +- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit) +- do not use fdopen for Metrowerks on Mac (Brad Pettit)) +- add checks for gzputc and gzputc in example.c +- avoid warnings in gzio.c and deflate.c (Andreas Kleinert) +- use const for the CRC table (Ken Raeburn) +- fixed "make uninstall" for shared libraries +- use Tracev instead of Trace in infblock.c +- in example.c use correct compressed length for test_sync +- suppress +vnocompatwarnings in configure for HPUX (not always supported) + +Changes in 1.0.7 (20 Jan 1998) +- fix gzseek which was broken in write mode +- return error for gzseek to negative absolute position +- fix configure for Linux (Chun-Chung Chen) +- increase stack space for MSC (Tim Wegner) +- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant) +- define EXPORTVA for gzprintf (Gilles Vollant) +- added man page zlib.3 (Rick Rodgers) +- for contrib/untgz, fix makedir() and improve Makefile + +- check gzseek in write mode in example.c +- allocate extra buffer for seeks only if gzseek is actually called +- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant) +- add inflateSyncPoint in zconf.h +- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def + +Changes in 1.0.6 (19 Jan 1998) +- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and + gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code) +- Fix a deflate bug occurring only with compression level 0 (thanks to + Andy Buckler for finding this one). +- In minigzip, pass transparently also the first byte for .Z files. +- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress() +- check Z_FINISH in inflate (thanks to Marc Schluper) +- Implement deflateCopy (thanks to Adam Costello) +- make static libraries by default in configure, add --shared option. +- move MSDOS or Windows specific files to directory msdos +- suppress the notion of partial flush to simplify the interface + (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4) +- suppress history buffer provided by application to simplify the interface + (this feature was not implemented anyway in 1.0.4) +- next_in and avail_in must be initialized before calling inflateInit or + inflateInit2 +- add EXPORT in all exported functions (for Windows DLL) +- added Makefile.nt (thanks to Stephen Williams) +- added the unsupported "contrib" directory: + contrib/asm386/ by Gilles Vollant + 386 asm code replacing longest_match(). + contrib/iostream/ by Kevin Ruland + A C++ I/O streams interface to the zlib gz* functions + contrib/iostream2/ by Tyge Løvset + Another C++ I/O streams interface + contrib/untgz/ by "Pedro A. Aranda Guti\irrez" + A very simple tar.gz file extractor using zlib + contrib/visual-basic.txt by Carlos Rios + How to use compress(), uncompress() and the gz* functions from VB. +- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression + level) in minigzip (thanks to Tom Lane) + +- use const for rommable constants in deflate +- added test for gzseek and gztell in example.c +- add undocumented function inflateSyncPoint() (hack for Paul Mackerras) +- add undocumented function zError to convert error code to string + (for Tim Smithers) +- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code. +- Use default memcpy for Symantec MSDOS compiler. +- Add EXPORT keyword for check_func (needed for Windows DLL) +- add current directory to LD_LIBRARY_PATH for "make test" +- create also a link for libz.so.1 +- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura) +- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX) +- added -soname for Linux in configure (Chun-Chung Chen, +- assign numbers to the exported functions in zlib.def (for Windows DLL) +- add advice in zlib.h for best usage of deflateSetDictionary +- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn) +- allow compilation with ANSI keywords only enabled for TurboC in large model +- avoid "versionString"[0] (Borland bug) +- add NEED_DUMMY_RETURN for Borland +- use variable z_verbose for tracing in debug mode (L. Peter Deutsch). +- allow compilation with CC +- defined STDC for OS/2 (David Charlap) +- limit external names to 8 chars for MVS (Thomas Lund) +- in minigzip.c, use static buffers only for 16-bit systems +- fix suffix check for "minigzip -d foo.gz" +- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee) +- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau) +- added makelcc.bat for lcc-win32 (Tom St Denis) +- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe) +- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion. +- check for unistd.h in configure (for off_t) +- remove useless check parameter in inflate_blocks_free +- avoid useless assignment of s->check to itself in inflate_blocks_new +- do not flush twice in gzclose (thanks to Ken Raeburn) +- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h +- use NO_ERRNO_H instead of enumeration of operating systems with errno.h +- work around buggy fclose on pipes for HP/UX +- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson) +- fix configure if CC is already equal to gcc + +Changes in 1.0.5 (3 Jan 98) +- Fix inflate to terminate gracefully when fed corrupted or invalid data +- Use const for rommable constants in inflate +- Eliminate memory leaks on error conditions in inflate +- Removed some vestigial code in inflate +- Update web address in README + +Changes in 1.0.4 (24 Jul 96) +- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF + bit, so the decompressor could decompress all the correct data but went + on to attempt decompressing extra garbage data. This affected minigzip too. +- zlibVersion and gzerror return const char* (needed for DLL) +- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno) +- use z_error only for DEBUG (avoid problem with DLLs) + +Changes in 1.0.3 (2 Jul 96) +- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS + small and medium models; this makes the library incompatible with previous + versions for these models. (No effect in large model or on other systems.) +- return OK instead of BUF_ERROR if previous deflate call returned with + avail_out as zero but there is nothing to do +- added memcmp for non STDC compilers +- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly) +- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO) +- better check for 16-bit mode MSC (avoids problem with Symantec) + +Changes in 1.0.2 (23 May 96) +- added Windows DLL support +- added a function zlibVersion (for the DLL support) +- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model) +- Bytef is define's instead of typedef'd only for Borland C +- avoid reading uninitialized memory in example.c +- mention in README that the zlib format is now RFC1950 +- updated Makefile.dj2 +- added algorithm.doc + +Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion] +- fix array overlay in deflate.c which sometimes caused bad compressed data +- fix inflate bug with empty stored block +- fix MSDOS medium model which was broken in 0.99 +- fix deflateParams() which could generated bad compressed data. +- Bytef is define'd instead of typedef'ed (work around Borland bug) +- added an INDEX file +- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32), + Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas) +- speed up adler32 for modern machines without auto-increment +- added -ansi for IRIX in configure +- static_init_done in trees.c is an int +- define unlink as delete for VMS +- fix configure for QNX +- add configure branch for SCO and HPUX +- avoid many warnings (unused variables, dead assignments, etc...) +- no fdopen for BeOS +- fix the Watcom fix for 32 bit mode (define FAR as empty) +- removed redefinition of Byte for MKWERKS +- work around an MWKERKS bug (incorrect merge of all .h files) + +Changes in 0.99 (27 Jan 96) +- allow preset dictionary shared between compressor and decompressor +- allow compression level 0 (no compression) +- add deflateParams in zlib.h: allow dynamic change of compression level + and compression strategy. +- test large buffers and deflateParams in example.c +- add optional "configure" to build zlib as a shared library +- suppress Makefile.qnx, use configure instead +- fixed deflate for 64-bit systems (detected on Cray) +- fixed inflate_blocks for 64-bit systems (detected on Alpha) +- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2) +- always return Z_BUF_ERROR when deflate() has nothing to do +- deflateInit and inflateInit are now macros to allow version checking +- prefix all global functions and types with z_ with -DZ_PREFIX +- make falloc completely reentrant (inftrees.c) +- fixed very unlikely race condition in ct_static_init +- free in reverse order of allocation to help memory manager +- use zlib-1.0/* instead of zlib/* inside the tar.gz +- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith + -Wconversion -Wstrict-prototypes -Wmissing-prototypes" +- allow gzread on concatenated .gz files +- deflateEnd now returns Z_DATA_ERROR if it was premature +- deflate is finally (?) fully deterministic (no matches beyond end of input) +- Document Z_SYNC_FLUSH +- add uninstall in Makefile +- Check for __cpluplus in zlib.h +- Better test in ct_align for partial flush +- avoid harmless warnings for Borland C++ +- initialize hash_head in deflate.c +- avoid warning on fdopen (gzio.c) for HP cc -Aa +- include stdlib.h for STDC compilers +- include errno.h for Cray +- ignore error if ranlib doesn't exist +- call ranlib twice for NeXTSTEP +- use exec_prefix instead of prefix for libz.a +- renamed ct_* as _tr_* to avoid conflict with applications +- clear z->msg in inflateInit2 before any error return +- initialize opaque in example.c, gzio.c, deflate.c and inflate.c +- fixed typo in zconf.h (_GNUC__ => __GNUC__) +- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode) +- fix typo in Make_vms.com (f$trnlnm -> f$getsyi) +- in fcalloc, normalize pointer if size > 65520 bytes +- don't use special fcalloc for 32 bit Borland C++ +- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc... +- use Z_BINARY instead of BINARY +- document that gzclose after gzdopen will close the file +- allow "a" as mode in gzopen. +- fix error checking in gzread +- allow skipping .gz extra-field on pipes +- added reference to Perl interface in README +- put the crc table in FAR data (I dislike more and more the medium model :) +- added get_crc_table +- added a dimension to all arrays (Borland C can't count). +- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast +- guard against multiple inclusion of *.h (for precompiled header on Mac) +- Watcom C pretends to be Microsoft C small model even in 32 bit mode. +- don't use unsized arrays to avoid silly warnings by Visual C++: + warning C4746: 'inflate_mask' : unsized array treated as '__far' + (what's wrong with far data in far model?). +- define enum out of inflate_blocks_state to allow compilation with C++ + +Changes in 0.95 (16 Aug 95) +- fix MSDOS small and medium model (now easier to adapt to any compiler) +- inlined send_bits +- fix the final (:-) bug for deflate with flush (output was correct but + not completely flushed in rare occasions). +- default window size is same for compression and decompression + (it's now sufficient to set MAX_WBITS in zconf.h). +- voidp -> voidpf and voidnp -> voidp (for consistency with other + typedefs and because voidnp was not near in large model). + +Changes in 0.94 (13 Aug 95) +- support MSDOS medium model +- fix deflate with flush (could sometimes generate bad output) +- fix deflateReset (zlib header was incorrectly suppressed) +- added support for VMS +- allow a compression level in gzopen() +- gzflush now calls fflush +- For deflate with flush, flush even if no more input is provided. +- rename libgz.a as libz.a +- avoid complex expression in infcodes.c triggering Turbo C bug +- work around a problem with gcc on Alpha (in INSERT_STRING) +- don't use inline functions (problem with some gcc versions) +- allow renaming of Byte, uInt, etc... with #define. +- avoid warning about (unused) pointer before start of array in deflate.c +- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c +- avoid reserved word 'new' in trees.c + +Changes in 0.93 (25 June 95) +- temporarily disable inline functions +- make deflate deterministic +- give enough lookahead for PARTIAL_FLUSH +- Set binary mode for stdin/stdout in minigzip.c for OS/2 +- don't even use signed char in inflate (not portable enough) +- fix inflate memory leak for segmented architectures + +Changes in 0.92 (3 May 95) +- don't assume that char is signed (problem on SGI) +- Clear bit buffer when starting a stored block +- no memcpy on Pyramid +- suppressed inftest.c +- optimized fill_window, put longest_match inline for gcc +- optimized inflate on stored blocks. +- untabify all sources to simplify patches + +Changes in 0.91 (2 May 95) +- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h +- Document the memory requirements in zconf.h +- added "make install" +- fix sync search logic in inflateSync +- deflate(Z_FULL_FLUSH) now works even if output buffer too short +- after inflateSync, don't scare people with just "lo world" +- added support for DJGPP + +Changes in 0.9 (1 May 95) +- don't assume that zalloc clears the allocated memory (the TurboC bug + was Mark's bug after all :) +- let again gzread copy uncompressed data unchanged (was working in 0.71) +- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented +- added a test of inflateSync in example.c +- moved MAX_WBITS to zconf.h because users might want to change that. +- document explicitly that zalloc(64K) on MSDOS must return a normalized + pointer (zero offset) +- added Makefiles for Microsoft C, Turbo C, Borland C++ +- faster crc32() + +Changes in 0.8 (29 April 95) +- added fast inflate (inffast.c) +- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this + is incompatible with previous versions of zlib which returned Z_OK. +- work around a TurboC compiler bug (bad code for b << 0, see infutil.h) + (actually that was not a compiler bug, see 0.81 above) +- gzread no longer reads one extra byte in certain cases +- In gzio destroy(), don't reference a freed structure +- avoid many warnings for MSDOS +- avoid the ERROR symbol which is used by MS Windows + +Changes in 0.71 (14 April 95) +- Fixed more MSDOS compilation problems :( There is still a bug with + TurboC large model. + +Changes in 0.7 (14 April 95) +- Added full inflate support. +- Simplified the crc32() interface. The pre- and post-conditioning + (one's complement) is now done inside crc32(). WARNING: this is + incompatible with previous versions; see zlib.h for the new usage. + +Changes in 0.61 (12 April 95) +- workaround for a bug in TurboC. example and minigzip now work on MSDOS. + +Changes in 0.6 (11 April 95) +- added minigzip.c +- added gzdopen to reopen a file descriptor as gzFile +- added transparent reading of non-gziped files in gzread. +- fixed bug in gzread (don't read crc as data) +- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose). +- don't allocate big arrays in the stack (for MSDOS) +- fix some MSDOS compilation problems + +Changes in 0.5: +- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but + not yet Z_FULL_FLUSH. +- support decompression but only in a single step (forced Z_FINISH) +- added opaque object for zalloc and zfree. +- added deflateReset and inflateReset +- added a variable zlib_version for consistency checking. +- renamed the 'filter' parameter of deflateInit2 as 'strategy'. + Added Z_FILTERED and Z_HUFFMAN_ONLY constants. + +Changes in 0.4: +- avoid "zip" everywhere, use zlib instead of ziplib. +- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush + if compression method == 8. +- added adler32 and crc32 +- renamed deflateOptions as deflateInit2, call one or the other but not both +- added the method parameter for deflateInit2. +- added inflateInit2 +- simplied considerably deflateInit and inflateInit by not supporting + user-provided history buffer. This is supported only in deflateInit2 + and inflateInit2. + +Changes in 0.3: +- prefix all macro names with Z_ +- use Z_FINISH instead of deflateEnd to finish compression. +- added Z_HUFFMAN_ONLY +- added gzerror() diff --git a/zlib/README b/zlib/README new file mode 100644 index 0000000000..80f71ae856 --- /dev/null +++ b/zlib/README @@ -0,0 +1,125 @@ +ZLIB DATA COMPRESSION LIBRARY + +zlib 1.2.3 is a general purpose data compression library. All the code is +thread safe. The data format used by the zlib library is described by RFCs +(Request for Comments) 1950 to 1952 in the files +http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) +and rfc1952.txt (gzip format). These documents are also available in other +formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html + +All functions of the compression library are documented in the file zlib.h +(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example +of the library is given in the file example.c which also tests that the library +is working correctly. Another example is given in the file minigzip.c. The +compression library itself is composed of all source files except example.c and +minigzip.c. + +To compile all files and run the test program, follow the instructions given at +the top of Makefile. In short "make test; make install" should work for most +machines. For Unix: "./configure; make test; make install". For MSDOS, use one +of the special makefiles such as Makefile.msc. For VMS, use make_vms.com. + +Questions about zlib should be sent to , or to Gilles Vollant + for the Windows DLL version. The zlib home page is +http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem, +please check this site to verify that you have the latest version of zlib; +otherwise get the latest version and check whether the problem still exists or +not. + +PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking +for help. + +Mark Nelson wrote an article about zlib for the Jan. 1997 +issue of Dr. Dobb's Journal; a copy of the article is available in +http://dogma.net/markn/articles/zlibtool/zlibtool.htm + +The changes made in version 1.2.3 are documented in the file ChangeLog. + +Unsupported third party contributions are provided in directory "contrib". + +A Java implementation of zlib is available in the Java Development Kit +http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html +See the zlib home page http://www.zlib.org for details. + +A Perl interface to zlib written by Paul Marquess is in the +CPAN (Comprehensive Perl Archive Network) sites +http://www.cpan.org/modules/by-module/Compress/ + +A Python interface to zlib written by A.M. Kuchling is +available in Python 1.5 and later versions, see +http://www.python.org/doc/lib/module-zlib.html + +A zlib binding for TCL written by Andreas Kupries is +availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html + +An experimental package to read and write files in .zip format, written on top +of zlib by Gilles Vollant , is available in the +contrib/minizip directory of zlib. + + +Notes for some targets: + +- For Windows DLL versions, please see win32/DLL_FAQ.txt + +- For 64-bit Irix, deflate.c must be compiled without any optimization. With + -O, one libpng test fails. The test works in 32 bit mode (with the -n32 + compiler flag). The compiler bug has been reported to SGI. + +- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works + when compiled with cc. + +- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is + necessary to get gzprintf working correctly. This is done by configure. + +- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with + other compilers. Use "make test" to check your compiler. + +- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers. + +- For PalmOs, see http://palmzlib.sourceforge.net/ + +- When building a shared, i.e. dynamic library on Mac OS X, the library must be + installed before testing (do "make install" before "make test"), since the + library location is specified in the library. + + +Acknowledgments: + + The deflate format used by zlib was defined by Phil Katz. The deflate + and zlib specifications were written by L. Peter Deutsch. Thanks to all the + people who reported problems and suggested various improvements in zlib; + they are too numerous to cite here. + +Copyright notice: + + (C) 1995-2004 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + +If you use the zlib library in a product, we would appreciate *not* +receiving lengthy legal documents to sign. The sources are provided +for free but without warranty of any kind. The library has been +entirely written by Jean-loup Gailly and Mark Adler; it does not +include third-party code. + +If you redistribute modified sources, we would appreciate that you include +in the file ChangeLog history information documenting your changes. Please +read the FAQ for more information on the distribution of modified source +versions. diff --git a/zlib/adler32.c b/zlib/adler32.c new file mode 100644 index 0000000000..f201d6701e --- /dev/null +++ b/zlib/adler32.c @@ -0,0 +1,149 @@ +/* adler32.c -- compute the Adler-32 checksum of a data stream + * Copyright (C) 1995-2004 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#define ZLIB_INTERNAL +#include "zlib.h" + +#define BASE 65521UL /* largest prime smaller than 65536 */ +#define NMAX 5552 +/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ + +#define DO1(buf,i) {adler += (buf)[i]; sum2 += adler;} +#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); +#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); +#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); +#define DO16(buf) DO8(buf,0); DO8(buf,8); + +/* use NO_DIVIDE if your processor does not do division in hardware */ +#ifdef NO_DIVIDE +# define MOD(a) \ + do { \ + if (a >= (BASE << 16)) a -= (BASE << 16); \ + if (a >= (BASE << 15)) a -= (BASE << 15); \ + if (a >= (BASE << 14)) a -= (BASE << 14); \ + if (a >= (BASE << 13)) a -= (BASE << 13); \ + if (a >= (BASE << 12)) a -= (BASE << 12); \ + if (a >= (BASE << 11)) a -= (BASE << 11); \ + if (a >= (BASE << 10)) a -= (BASE << 10); \ + if (a >= (BASE << 9)) a -= (BASE << 9); \ + if (a >= (BASE << 8)) a -= (BASE << 8); \ + if (a >= (BASE << 7)) a -= (BASE << 7); \ + if (a >= (BASE << 6)) a -= (BASE << 6); \ + if (a >= (BASE << 5)) a -= (BASE << 5); \ + if (a >= (BASE << 4)) a -= (BASE << 4); \ + if (a >= (BASE << 3)) a -= (BASE << 3); \ + if (a >= (BASE << 2)) a -= (BASE << 2); \ + if (a >= (BASE << 1)) a -= (BASE << 1); \ + if (a >= BASE) a -= BASE; \ + } while (0) +# define MOD4(a) \ + do { \ + if (a >= (BASE << 4)) a -= (BASE << 4); \ + if (a >= (BASE << 3)) a -= (BASE << 3); \ + if (a >= (BASE << 2)) a -= (BASE << 2); \ + if (a >= (BASE << 1)) a -= (BASE << 1); \ + if (a >= BASE) a -= BASE; \ + } while (0) +#else +# define MOD(a) a %= BASE +# define MOD4(a) a %= BASE +#endif + +/* ========================================================================= */ +uLong ZEXPORT adler32(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +{ + unsigned long sum2; + unsigned n; + + /* split Adler-32 into component sums */ + sum2 = (adler >> 16) & 0xffff; + adler &= 0xffff; + + /* in case user likes doing a byte at a time, keep it fast */ + if (len == 1) { + adler += buf[0]; + if (adler >= BASE) + adler -= BASE; + sum2 += adler; + if (sum2 >= BASE) + sum2 -= BASE; + return adler | (sum2 << 16); + } + + /* initial Adler-32 value (deferred check for len == 1 speed) */ + if (buf == Z_NULL) + return 1L; + + /* in case short lengths are provided, keep it somewhat fast */ + if (len < 16) { + while (len--) { + adler += *buf++; + sum2 += adler; + } + if (adler >= BASE) + adler -= BASE; + MOD4(sum2); /* only added so many BASE's */ + return adler | (sum2 << 16); + } + + /* do length NMAX blocks -- requires just one modulo operation */ + while (len >= NMAX) { + len -= NMAX; + n = NMAX / 16; /* NMAX is divisible by 16 */ + do { + DO16(buf); /* 16 sums unrolled */ + buf += 16; + } while (--n); + MOD(adler); + MOD(sum2); + } + + /* do remaining bytes (less than NMAX, still just one modulo) */ + if (len) { /* avoid modulos if none remaining */ + while (len >= 16) { + len -= 16; + DO16(buf); + buf += 16; + } + while (len--) { + adler += *buf++; + sum2 += adler; + } + MOD(adler); + MOD(sum2); + } + + /* return recombined sums */ + return adler | (sum2 << 16); +} + +/* ========================================================================= */ +uLong ZEXPORT adler32_combine(adler1, adler2, len2) + uLong adler1; + uLong adler2; + z_off_t len2; +{ + unsigned long sum1; + unsigned long sum2; + unsigned rem; + + /* the derivation of this formula is left as an exercise for the reader */ + rem = (unsigned)(len2 % BASE); + sum1 = adler1 & 0xffff; + sum2 = rem * sum1; + MOD(sum2); + sum1 += (adler2 & 0xffff) + BASE - 1; + sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; + if (sum1 > BASE) sum1 -= BASE; + if (sum1 > BASE) sum1 -= BASE; + if (sum2 > (BASE << 1)) sum2 -= (BASE << 1); + if (sum2 > BASE) sum2 -= BASE; + return sum1 | (sum2 << 16); +} diff --git a/zlib/algorithm.txt b/zlib/algorithm.txt new file mode 100644 index 0000000000..9f6b06808c --- /dev/null +++ b/zlib/algorithm.txt @@ -0,0 +1,209 @@ +1. Compression algorithm (deflate) + +The deflation algorithm used by gzip (also zip and zlib) is a variation of +LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in +the input data. The second occurrence of a string is replaced by a +pointer to the previous string, in the form of a pair (distance, +length). Distances are limited to 32K bytes, and lengths are limited +to 258 bytes. When a string does not occur anywhere in the previous +32K bytes, it is emitted as a sequence of literal bytes. (In this +description, `string' must be taken as an arbitrary sequence of bytes, +and is not restricted to printable characters.) + +Literals or match lengths are compressed with one Huffman tree, and +match distances are compressed with another tree. The trees are stored +in a compact form at the start of each block. The blocks can have any +size (except that the compressed data for one block must fit in +available memory). A block is terminated when deflate() determines that +it would be useful to start another block with fresh trees. (This is +somewhat similar to the behavior of LZW-based _compress_.) + +Duplicated strings are found using a hash table. All input strings of +length 3 are inserted in the hash table. A hash index is computed for +the next 3 bytes. If the hash chain for this index is not empty, all +strings in the chain are compared with the current input string, and +the longest match is selected. + +The hash chains are searched starting with the most recent strings, to +favor small distances and thus take advantage of the Huffman encoding. +The hash chains are singly linked. There are no deletions from the +hash chains, the algorithm simply discards matches that are too old. + +To avoid a worst-case situation, very long hash chains are arbitrarily +truncated at a certain length, determined by a runtime option (level +parameter of deflateInit). So deflate() does not always find the longest +possible match but generally finds a match which is long enough. + +deflate() also defers the selection of matches with a lazy evaluation +mechanism. After a match of length N has been found, deflate() searches for +a longer match at the next input byte. If a longer match is found, the +previous match is truncated to a length of one (thus producing a single +literal byte) and the process of lazy evaluation begins again. Otherwise, +the original match is kept, and the next match search is attempted only N +steps later. + +The lazy match evaluation is also subject to a runtime parameter. If +the current match is long enough, deflate() reduces the search for a longer +match, thus speeding up the whole process. If compression ratio is more +important than speed, deflate() attempts a complete second search even if +the first match is already long enough. + +The lazy match evaluation is not performed for the fastest compression +modes (level parameter 1 to 3). For these fast modes, new strings +are inserted in the hash table only when no match was found, or +when the match is not too long. This degrades the compression ratio +but saves time since there are both fewer insertions and fewer searches. + + +2. Decompression algorithm (inflate) + +2.1 Introduction + +The key question is how to represent a Huffman code (or any prefix code) so +that you can decode fast. The most important characteristic is that shorter +codes are much more common than longer codes, so pay attention to decoding the +short codes fast, and let the long codes take longer to decode. + +inflate() sets up a first level table that covers some number of bits of +input less than the length of longest code. It gets that many bits from the +stream, and looks it up in the table. The table will tell if the next +code is that many bits or less and how many, and if it is, it will tell +the value, else it will point to the next level table for which inflate() +grabs more bits and tries to decode a longer code. + +How many bits to make the first lookup is a tradeoff between the time it +takes to decode and the time it takes to build the table. If building the +table took no time (and if you had infinite memory), then there would only +be a first level table to cover all the way to the longest code. However, +building the table ends up taking a lot longer for more bits since short +codes are replicated many times in such a table. What inflate() does is +simply to make the number of bits in the first table a variable, and then +to set that variable for the maximum speed. + +For inflate, which has 286 possible codes for the literal/length tree, the size +of the first table is nine bits. Also the distance trees have 30 possible +values, and the size of the first table is six bits. Note that for each of +those cases, the table ended up one bit longer than the ``average'' code +length, i.e. the code length of an approximately flat code which would be a +little more than eight bits for 286 symbols and a little less than five bits +for 30 symbols. + + +2.2 More details on the inflate table lookup + +Ok, you want to know what this cleverly obfuscated inflate tree actually +looks like. You are correct that it's not a Huffman tree. It is simply a +lookup table for the first, let's say, nine bits of a Huffman symbol. The +symbol could be as short as one bit or as long as 15 bits. If a particular +symbol is shorter than nine bits, then that symbol's translation is duplicated +in all those entries that start with that symbol's bits. For example, if the +symbol is four bits, then it's duplicated 32 times in a nine-bit table. If a +symbol is nine bits long, it appears in the table once. + +If the symbol is longer than nine bits, then that entry in the table points +to another similar table for the remaining bits. Again, there are duplicated +entries as needed. The idea is that most of the time the symbol will be short +and there will only be one table look up. (That's whole idea behind data +compression in the first place.) For the less frequent long symbols, there +will be two lookups. If you had a compression method with really long +symbols, you could have as many levels of lookups as is efficient. For +inflate, two is enough. + +So a table entry either points to another table (in which case nine bits in +the above example are gobbled), or it contains the translation for the symbol +and the number of bits to gobble. Then you start again with the next +ungobbled bit. + +You may wonder: why not just have one lookup table for how ever many bits the +longest symbol is? The reason is that if you do that, you end up spending +more time filling in duplicate symbol entries than you do actually decoding. +At least for deflate's output that generates new trees every several 10's of +kbytes. You can imagine that filling in a 2^15 entry table for a 15-bit code +would take too long if you're only decoding several thousand symbols. At the +other extreme, you could make a new table for every bit in the code. In fact, +that's essentially a Huffman tree. But then you spend two much time +traversing the tree while decoding, even for short symbols. + +So the number of bits for the first lookup table is a trade of the time to +fill out the table vs. the time spent looking at the second level and above of +the table. + +Here is an example, scaled down: + +The code being decoded, with 10 symbols, from 1 to 6 bits long: + +A: 0 +B: 10 +C: 1100 +D: 11010 +E: 11011 +F: 11100 +G: 11101 +H: 11110 +I: 111110 +J: 111111 + +Let's make the first table three bits long (eight entries): + +000: A,1 +001: A,1 +010: A,1 +011: A,1 +100: B,2 +101: B,2 +110: -> table X (gobble 3 bits) +111: -> table Y (gobble 3 bits) + +Each entry is what the bits decode as and how many bits that is, i.e. how +many bits to gobble. Or the entry points to another table, with the number of +bits to gobble implicit in the size of the table. + +Table X is two bits long since the longest code starting with 110 is five bits +long: + +00: C,1 +01: C,1 +10: D,2 +11: E,2 + +Table Y is three bits long since the longest code starting with 111 is six +bits long: + +000: F,2 +001: F,2 +010: G,2 +011: G,2 +100: H,2 +101: H,2 +110: I,3 +111: J,3 + +So what we have here are three tables with a total of 20 entries that had to +be constructed. That's compared to 64 entries for a single table. Or +compared to 16 entries for a Huffman tree (six two entry tables and one four +entry table). Assuming that the code ideally represents the probability of +the symbols, it takes on the average 1.25 lookups per symbol. That's compared +to one lookup for the single table, or 1.66 lookups per symbol for the +Huffman tree. + +There, I think that gives you a picture of what's going on. For inflate, the +meaning of a particular symbol is often more than just a letter. It can be a +byte (a "literal"), or it can be either a length or a distance which +indicates a base value and a number of bits to fetch after the code that is +added to the base value. Or it might be the special end-of-block code. The +data structures created in inftrees.c try to encode all that information +compactly in the tables. + + +Jean-loup Gailly Mark Adler +jloup@gzip.org madler@alumni.caltech.edu + + +References: + +[LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data +Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3, +pp. 337-343. + +``DEFLATE Compressed Data Format Specification'' available in +http://www.ietf.org/rfc/rfc1951.txt diff --git a/zlib/compress.c b/zlib/compress.c new file mode 100644 index 0000000000..d37e84f5e3 --- /dev/null +++ b/zlib/compress.c @@ -0,0 +1,79 @@ +/* compress.c -- compress a memory buffer + * Copyright (C) 1995-2003 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#define ZLIB_INTERNAL +#include "zlib.h" + +/* =========================================================================== + Compresses the source buffer into the destination buffer. The level + parameter has the same meaning as in deflateInit. sourceLen is the byte + length of the source buffer. Upon entry, destLen is the total size of the + destination buffer, which must be at least 0.1% larger than sourceLen plus + 12 bytes. Upon exit, destLen is the actual size of the compressed buffer. + + compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_BUF_ERROR if there was not enough room in the output buffer, + Z_STREAM_ERROR if the level parameter is invalid. +*/ +int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) + Bytef *dest; + uLongf *destLen; + const Bytef *source; + uLong sourceLen; + int level; +{ + z_stream stream; + int err; + + stream.next_in = (Bytef*)source; + stream.avail_in = (uInt)sourceLen; +#ifdef MAXSEG_64K + /* Check for source > 64K on 16-bit machine: */ + if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; +#endif + stream.next_out = dest; + stream.avail_out = (uInt)*destLen; + if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; + + stream.zalloc = (alloc_func)0; + stream.zfree = (free_func)0; + stream.opaque = (voidpf)0; + + err = deflateInit(&stream, level); + if (err != Z_OK) return err; + + err = deflate(&stream, Z_FINISH); + if (err != Z_STREAM_END) { + deflateEnd(&stream); + return err == Z_OK ? Z_BUF_ERROR : err; + } + *destLen = stream.total_out; + + err = deflateEnd(&stream); + return err; +} + +/* =========================================================================== + */ +int ZEXPORT compress (dest, destLen, source, sourceLen) + Bytef *dest; + uLongf *destLen; + const Bytef *source; + uLong sourceLen; +{ + return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION); +} + +/* =========================================================================== + If the default memLevel or windowBits for deflateInit() is changed, then + this function needs to be updated. + */ +uLong ZEXPORT compressBound (sourceLen) + uLong sourceLen; +{ + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11; +} diff --git a/zlib/crc32.c b/zlib/crc32.c new file mode 100644 index 0000000000..32814c20c8 --- /dev/null +++ b/zlib/crc32.c @@ -0,0 +1,423 @@ +/* crc32.c -- compute the CRC-32 of a data stream + * Copyright (C) 1995-2005 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + * + * Thanks to Rodney Brown for his contribution of faster + * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing + * tables for updating the shift register in one step with three exclusive-ors + * instead of four steps with four exclusive-ors. This results in about a + * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3. + */ + +/* @(#) $Id$ */ + +/* + Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore + protection on the static variables used to control the first-use generation + of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should + first call get_crc_table() to initialize the tables before allowing more than + one thread to use crc32(). + */ + +#ifdef MAKECRCH +# include +# ifndef DYNAMIC_CRC_TABLE +# define DYNAMIC_CRC_TABLE +# endif /* !DYNAMIC_CRC_TABLE */ +#endif /* MAKECRCH */ + +#include "zutil.h" /* for STDC and FAR definitions */ + +#define local static + +/* Find a four-byte integer type for crc32_little() and crc32_big(). */ +#ifndef NOBYFOUR +# ifdef STDC /* need ANSI C limits.h to determine sizes */ +# include +# define BYFOUR +# if (UINT_MAX == 0xffffffffUL) + typedef unsigned int u4; +# else +# if (ULONG_MAX == 0xffffffffUL) + typedef unsigned long u4; +# else +# if (USHRT_MAX == 0xffffffffUL) + typedef unsigned short u4; +# else +# undef BYFOUR /* can't find a four-byte integer type! */ +# endif +# endif +# endif +# endif /* STDC */ +#endif /* !NOBYFOUR */ + +/* Definitions for doing the crc four data bytes at a time. */ +#ifdef BYFOUR +# define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \ + (((w)&0xff00)<<8)+(((w)&0xff)<<24)) + local unsigned long crc32_little OF((unsigned long, + const unsigned char FAR *, unsigned)); + local unsigned long crc32_big OF((unsigned long, + const unsigned char FAR *, unsigned)); +# define TBLS 8 +#else +# define TBLS 1 +#endif /* BYFOUR */ + +/* Local functions for crc concatenation */ +local unsigned long gf2_matrix_times OF((unsigned long *mat, + unsigned long vec)); +local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat)); + +#ifdef DYNAMIC_CRC_TABLE + +local volatile int crc_table_empty = 1; +local unsigned long FAR crc_table[TBLS][256]; +local void make_crc_table OF((void)); +#ifdef MAKECRCH + local void write_table OF((FILE *, const unsigned long FAR *)); +#endif /* MAKECRCH */ +/* + Generate tables for a byte-wise 32-bit CRC calculation on the polynomial: + x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1. + + Polynomials over GF(2) are represented in binary, one bit per coefficient, + with the lowest powers in the most significant bit. Then adding polynomials + is just exclusive-or, and multiplying a polynomial by x is a right shift by + one. If we call the above polynomial p, and represent a byte as the + polynomial q, also with the lowest power in the most significant bit (so the + byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p, + where a mod b means the remainder after dividing a by b. + + This calculation is done using the shift-register method of multiplying and + taking the remainder. The register is initialized to zero, and for each + incoming bit, x^32 is added mod p to the register if the bit is a one (where + x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by + x (which is shifting right by one and adding x^32 mod p if the bit shifted + out is a one). We start with the highest power (least significant bit) of + q and repeat for all eight bits of q. + + The first table is simply the CRC of all possible eight bit values. This is + all the information needed to generate CRCs on data a byte at a time for all + combinations of CRC register values and incoming bytes. The remaining tables + allow for word-at-a-time CRC calculation for both big-endian and little- + endian machines, where a word is four bytes. +*/ +local void make_crc_table() +{ + unsigned long c; + int n, k; + unsigned long poly; /* polynomial exclusive-or pattern */ + /* terms of polynomial defining this crc (except x^32): */ + static volatile int first = 1; /* flag to limit concurrent making */ + static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26}; + + /* See if another task is already doing this (not thread-safe, but better + than nothing -- significantly reduces duration of vulnerability in + case the advice about DYNAMIC_CRC_TABLE is ignored) */ + if (first) { + first = 0; + + /* make exclusive-or pattern from polynomial (0xedb88320UL) */ + poly = 0UL; + for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++) + poly |= 1UL << (31 - p[n]); + + /* generate a crc for every 8-bit value */ + for (n = 0; n < 256; n++) { + c = (unsigned long)n; + for (k = 0; k < 8; k++) + c = c & 1 ? poly ^ (c >> 1) : c >> 1; + crc_table[0][n] = c; + } + +#ifdef BYFOUR + /* generate crc for each value followed by one, two, and three zeros, + and then the byte reversal of those as well as the first table */ + for (n = 0; n < 256; n++) { + c = crc_table[0][n]; + crc_table[4][n] = REV(c); + for (k = 1; k < 4; k++) { + c = crc_table[0][c & 0xff] ^ (c >> 8); + crc_table[k][n] = c; + crc_table[k + 4][n] = REV(c); + } + } +#endif /* BYFOUR */ + + crc_table_empty = 0; + } + else { /* not first */ + /* wait for the other guy to finish (not efficient, but rare) */ + while (crc_table_empty) + ; + } + +#ifdef MAKECRCH + /* write out CRC tables to crc32.h */ + { + FILE *out; + + out = fopen("crc32.h", "w"); + if (out == NULL) return; + fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n"); + fprintf(out, " * Generated automatically by crc32.c\n */\n\n"); + fprintf(out, "local const unsigned long FAR "); + fprintf(out, "crc_table[TBLS][256] =\n{\n {\n"); + write_table(out, crc_table[0]); +# ifdef BYFOUR + fprintf(out, "#ifdef BYFOUR\n"); + for (k = 1; k < 8; k++) { + fprintf(out, " },\n {\n"); + write_table(out, crc_table[k]); + } + fprintf(out, "#endif\n"); +# endif /* BYFOUR */ + fprintf(out, " }\n};\n"); + fclose(out); + } +#endif /* MAKECRCH */ +} + +#ifdef MAKECRCH +local void write_table(out, table) + FILE *out; + const unsigned long FAR *table; +{ + int n; + + for (n = 0; n < 256; n++) + fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ", table[n], + n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", ")); +} +#endif /* MAKECRCH */ + +#else /* !DYNAMIC_CRC_TABLE */ +/* ======================================================================== + * Tables of CRC-32s of all single-byte values, made by make_crc_table(). + */ +#include "crc32.h" +#endif /* DYNAMIC_CRC_TABLE */ + +/* ========================================================================= + * This function can be used by asm versions of crc32() + */ +const unsigned long FAR * ZEXPORT get_crc_table() +{ +#ifdef DYNAMIC_CRC_TABLE + if (crc_table_empty) + make_crc_table(); +#endif /* DYNAMIC_CRC_TABLE */ + return (const unsigned long FAR *)crc_table; +} + +/* ========================================================================= */ +#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8) +#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 + +/* ========================================================================= */ +unsigned long ZEXPORT crc32(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + unsigned len; +{ + if (buf == Z_NULL) return 0UL; + +#ifdef DYNAMIC_CRC_TABLE + if (crc_table_empty) + make_crc_table(); +#endif /* DYNAMIC_CRC_TABLE */ + +#ifdef BYFOUR + if (sizeof(void *) == sizeof(ptrdiff_t)) { + u4 endian; + + endian = 1; + if (*((unsigned char *)(&endian))) + return crc32_little(crc, buf, len); + else + return crc32_big(crc, buf, len); + } +#endif /* BYFOUR */ + crc = crc ^ 0xffffffffUL; + while (len >= 8) { + DO8; + len -= 8; + } + if (len) do { + DO1; + } while (--len); + return crc ^ 0xffffffffUL; +} + +#ifdef BYFOUR + +/* ========================================================================= */ +#define DOLIT4 c ^= *buf4++; \ + c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \ + crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24] +#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4 + +/* ========================================================================= */ +local unsigned long crc32_little(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + unsigned len; +{ + register u4 c; + register const u4 FAR *buf4; + + c = (u4)crc; + c = ~c; + while (len && ((ptrdiff_t)buf & 3)) { + c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); + len--; + } + + buf4 = (const u4 FAR *)(const void FAR *)buf; + while (len >= 32) { + DOLIT32; + len -= 32; + } + while (len >= 4) { + DOLIT4; + len -= 4; + } + buf = (const unsigned char FAR *)buf4; + + if (len) do { + c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); + } while (--len); + c = ~c; + return (unsigned long)c; +} + +/* ========================================================================= */ +#define DOBIG4 c ^= *++buf4; \ + c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \ + crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24] +#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4 + +/* ========================================================================= */ +local unsigned long crc32_big(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + unsigned len; +{ + register u4 c; + register const u4 FAR *buf4; + + c = REV((u4)crc); + c = ~c; + while (len && ((ptrdiff_t)buf & 3)) { + c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); + len--; + } + + buf4 = (const u4 FAR *)(const void FAR *)buf; + buf4--; + while (len >= 32) { + DOBIG32; + len -= 32; + } + while (len >= 4) { + DOBIG4; + len -= 4; + } + buf4++; + buf = (const unsigned char FAR *)buf4; + + if (len) do { + c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); + } while (--len); + c = ~c; + return (unsigned long)(REV(c)); +} + +#endif /* BYFOUR */ + +#define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */ + +/* ========================================================================= */ +local unsigned long gf2_matrix_times(mat, vec) + unsigned long *mat; + unsigned long vec; +{ + unsigned long sum; + + sum = 0; + while (vec) { + if (vec & 1) + sum ^= *mat; + vec >>= 1; + mat++; + } + return sum; +} + +/* ========================================================================= */ +local void gf2_matrix_square(square, mat) + unsigned long *square; + unsigned long *mat; +{ + int n; + + for (n = 0; n < GF2_DIM; n++) + square[n] = gf2_matrix_times(mat, mat[n]); +} + +/* ========================================================================= */ +uLong ZEXPORT crc32_combine(crc1, crc2, len2) + uLong crc1; + uLong crc2; + z_off_t len2; +{ + int n; + unsigned long row; + unsigned long even[GF2_DIM]; /* even-power-of-two zeros operator */ + unsigned long odd[GF2_DIM]; /* odd-power-of-two zeros operator */ + + /* degenerate case */ + if (len2 == 0) + return crc1; + + /* put operator for one zero bit in odd */ + odd[0] = 0xedb88320L; /* CRC-32 polynomial */ + row = 1; + for (n = 1; n < GF2_DIM; n++) { + odd[n] = row; + row <<= 1; + } + + /* put operator for two zero bits in even */ + gf2_matrix_square(even, odd); + + /* put operator for four zero bits in odd */ + gf2_matrix_square(odd, even); + + /* apply len2 zeros to crc1 (first square will put the operator for one + zero byte, eight zero bits, in even) */ + do { + /* apply zeros operator for this bit of len2 */ + gf2_matrix_square(even, odd); + if (len2 & 1) + crc1 = gf2_matrix_times(even, crc1); + len2 >>= 1; + + /* if no more bits set, then done */ + if (len2 == 0) + break; + + /* another iteration of the loop with odd and even swapped */ + gf2_matrix_square(odd, even); + if (len2 & 1) + crc1 = gf2_matrix_times(odd, crc1); + len2 >>= 1; + + /* if no more bits set, then done */ + } while (len2 != 0); + + /* return combined crc */ + crc1 ^= crc2; + return crc1; +} diff --git a/zlib/crc32.h b/zlib/crc32.h new file mode 100644 index 0000000000..5de49bc978 --- /dev/null +++ b/zlib/crc32.h @@ -0,0 +1,441 @@ +/* crc32.h -- tables for rapid CRC calculation + * Generated automatically by crc32.c + */ + +local const unsigned long FAR crc_table[TBLS][256] = +{ + { + 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, + 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL, + 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL, + 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL, + 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL, + 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL, + 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL, + 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL, + 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL, + 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL, + 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL, + 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL, + 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL, + 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL, + 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL, + 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL, + 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL, + 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL, + 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL, + 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL, + 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL, + 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL, + 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL, + 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL, + 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL, + 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL, + 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL, + 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL, + 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL, + 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL, + 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL, + 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL, + 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL, + 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL, + 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL, + 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL, + 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL, + 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL, + 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL, + 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL, + 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL, + 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL, + 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL, + 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL, + 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL, + 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL, + 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL, + 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL, + 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL, + 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, + 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, + 0x2d02ef8dUL +#ifdef BYFOUR + }, + { + 0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL, + 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL, + 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL, + 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL, + 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL, + 0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL, + 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL, + 0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL, + 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL, + 0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL, + 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL, + 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL, + 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL, + 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL, + 0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL, + 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL, + 0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL, + 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL, + 0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL, + 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL, + 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL, + 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL, + 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL, + 0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL, + 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL, + 0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL, + 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL, + 0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL, + 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL, + 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL, + 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL, + 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL, + 0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL, + 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL, + 0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL, + 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL, + 0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL, + 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL, + 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL, + 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL, + 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL, + 0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL, + 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL, + 0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL, + 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL, + 0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL, + 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL, + 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL, + 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL, + 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL, + 0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL, + 0x9324fd72UL + }, + { + 0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL, + 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL, + 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL, + 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL, + 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL, + 0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL, + 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL, + 0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL, + 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL, + 0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL, + 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL, + 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL, + 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL, + 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL, + 0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL, + 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL, + 0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL, + 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL, + 0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL, + 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL, + 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL, + 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL, + 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL, + 0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL, + 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL, + 0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL, + 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL, + 0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL, + 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL, + 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL, + 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL, + 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL, + 0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL, + 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL, + 0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL, + 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL, + 0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL, + 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL, + 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL, + 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL, + 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL, + 0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL, + 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL, + 0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL, + 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL, + 0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL, + 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL, + 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL, + 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL, + 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL, + 0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL, + 0xbe9834edUL + }, + { + 0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL, + 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL, + 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL, + 0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL, + 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL, + 0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL, + 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL, + 0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL, + 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL, + 0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL, + 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL, + 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL, + 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL, + 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL, + 0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL, + 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL, + 0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL, + 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL, + 0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL, + 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL, + 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL, + 0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL, + 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL, + 0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL, + 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL, + 0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL, + 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL, + 0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL, + 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL, + 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL, + 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL, + 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL, + 0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL, + 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL, + 0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL, + 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL, + 0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL, + 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL, + 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL, + 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL, + 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL, + 0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL, + 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL, + 0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL, + 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL, + 0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL, + 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL, + 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL, + 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL, + 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL, + 0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL, + 0xde0506f1UL + }, + { + 0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL, + 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL, + 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL, + 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL, + 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL, + 0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL, + 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL, + 0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL, + 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL, + 0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL, + 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL, + 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL, + 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL, + 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL, + 0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL, + 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL, + 0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL, + 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL, + 0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL, + 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL, + 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL, + 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL, + 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL, + 0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL, + 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL, + 0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL, + 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL, + 0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL, + 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL, + 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL, + 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL, + 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL, + 0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL, + 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL, + 0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL, + 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL, + 0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL, + 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL, + 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL, + 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL, + 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL, + 0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL, + 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL, + 0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL, + 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL, + 0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL, + 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL, + 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL, + 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL, + 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL, + 0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL, + 0x8def022dUL + }, + { + 0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL, + 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL, + 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL, + 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL, + 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL, + 0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL, + 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL, + 0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL, + 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL, + 0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL, + 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL, + 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL, + 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL, + 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL, + 0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL, + 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL, + 0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL, + 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL, + 0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL, + 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL, + 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL, + 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL, + 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL, + 0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL, + 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL, + 0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL, + 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL, + 0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL, + 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL, + 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL, + 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL, + 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL, + 0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL, + 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL, + 0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL, + 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL, + 0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL, + 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL, + 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL, + 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL, + 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL, + 0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL, + 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL, + 0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL, + 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL, + 0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL, + 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL, + 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL, + 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL, + 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL, + 0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL, + 0x72fd2493UL + }, + { + 0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL, + 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL, + 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL, + 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL, + 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL, + 0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL, + 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL, + 0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL, + 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL, + 0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL, + 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL, + 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL, + 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL, + 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL, + 0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL, + 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL, + 0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL, + 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL, + 0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL, + 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL, + 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL, + 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL, + 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL, + 0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL, + 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL, + 0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL, + 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL, + 0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL, + 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL, + 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL, + 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL, + 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL, + 0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL, + 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL, + 0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL, + 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL, + 0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL, + 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL, + 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL, + 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL, + 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL, + 0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL, + 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL, + 0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL, + 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL, + 0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL, + 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL, + 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL, + 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL, + 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL, + 0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL, + 0xed3498beUL + }, + { + 0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL, + 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL, + 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL, + 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL, + 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL, + 0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL, + 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL, + 0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL, + 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL, + 0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL, + 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL, + 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL, + 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL, + 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL, + 0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL, + 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL, + 0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL, + 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL, + 0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL, + 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL, + 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL, + 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL, + 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL, + 0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL, + 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL, + 0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL, + 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL, + 0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL, + 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL, + 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL, + 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL, + 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL, + 0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL, + 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL, + 0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL, + 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL, + 0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL, + 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL, + 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL, + 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL, + 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL, + 0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL, + 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL, + 0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL, + 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL, + 0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL, + 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL, + 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL, + 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL, + 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL, + 0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL, + 0xf10605deUL +#endif + } +}; diff --git a/zlib/deflate.c b/zlib/deflate.c new file mode 100644 index 0000000000..529f716b7a --- /dev/null +++ b/zlib/deflate.c @@ -0,0 +1,1736 @@ +/* deflate.c -- compress data using the deflation algorithm + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + * ALGORITHM + * + * The "deflation" process depends on being able to identify portions + * of the input text which are identical to earlier input (within a + * sliding window trailing behind the input currently being processed). + * + * The most straightforward technique turns out to be the fastest for + * most input files: try all possible matches and select the longest. + * The key feature of this algorithm is that insertions into the string + * dictionary are very simple and thus fast, and deletions are avoided + * completely. Insertions are performed at each input character, whereas + * string matches are performed only when the previous match ends. So it + * is preferable to spend more time in matches to allow very fast string + * insertions and avoid deletions. The matching algorithm for small + * strings is inspired from that of Rabin & Karp. A brute force approach + * is used to find longer strings when a small match has been found. + * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze + * (by Leonid Broukhis). + * A previous version of this file used a more sophisticated algorithm + * (by Fiala and Greene) which is guaranteed to run in linear amortized + * time, but has a larger average cost, uses more memory and is patented. + * However the F&G algorithm may be faster for some highly redundant + * files if the parameter max_chain_length (described below) is too large. + * + * ACKNOWLEDGEMENTS + * + * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and + * I found it in 'freeze' written by Leonid Broukhis. + * Thanks to many people for bug reports and testing. + * + * REFERENCES + * + * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification". + * Available in http://www.ietf.org/rfc/rfc1951.txt + * + * A description of the Rabin and Karp algorithm is given in the book + * "Algorithms" by R. Sedgewick, Addison-Wesley, p252. + * + * Fiala,E.R., and Greene,D.H. + * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595 + * + */ + +/* @(#) $Id$ */ + +#include "deflate.h" + +const char deflate_copyright[] = + " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly "; +/* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot + include such an acknowledgment, I would appreciate that you keep this + copyright string in the executable of your product. + */ + +/* =========================================================================== + * Function prototypes. + */ +typedef enum { + need_more, /* block not completed, need more input or more output */ + block_done, /* block flush performed */ + finish_started, /* finish started, need only more output at next deflate */ + finish_done /* finish done, accept no more input or output */ +} block_state; + +typedef block_state (*compress_func) OF((deflate_state *s, int flush)); +/* Compression function. Returns the block state after the call. */ + +local void fill_window OF((deflate_state *s)); +local block_state deflate_stored OF((deflate_state *s, int flush)); +local block_state deflate_fast OF((deflate_state *s, int flush)); +#ifndef FASTEST +local block_state deflate_slow OF((deflate_state *s, int flush)); +#endif +local void lm_init OF((deflate_state *s)); +local void putShortMSB OF((deflate_state *s, uInt b)); +local void flush_pending OF((z_streamp strm)); +local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); +#ifndef FASTEST +#ifdef ASMV + void match_init OF((void)); /* asm code initialization */ + uInt longest_match OF((deflate_state *s, IPos cur_match)); +#else +local uInt longest_match OF((deflate_state *s, IPos cur_match)); +#endif +#endif +local uInt longest_match_fast OF((deflate_state *s, IPos cur_match)); + +#ifdef DEBUG +local void check_match OF((deflate_state *s, IPos start, IPos match, + int length)); +#endif + +/* =========================================================================== + * Local data + */ + +#define NIL 0 +/* Tail of hash chains */ + +#ifndef TOO_FAR +# define TOO_FAR 4096 +#endif +/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ + +#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) +/* Minimum amount of lookahead, except at the end of the input file. + * See deflate.c for comments about the MIN_MATCH+1. + */ + +/* Values for max_lazy_match, good_match and max_chain_length, depending on + * the desired pack level (0..9). The values given below have been tuned to + * exclude worst case performance for pathological files. Better values may be + * found for specific files. + */ +typedef struct config_s { + ush good_length; /* reduce lazy search above this match length */ + ush max_lazy; /* do not perform lazy search above this match length */ + ush nice_length; /* quit search above this match length */ + ush max_chain; + compress_func func; +} config; + +#ifdef FASTEST +local const config configuration_table[2] = { +/* good lazy nice chain */ +/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ +/* 1 */ {4, 4, 8, 4, deflate_fast}}; /* max speed, no lazy matches */ +#else +local const config configuration_table[10] = { +/* good lazy nice chain */ +/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ +/* 1 */ {4, 4, 8, 4, deflate_fast}, /* max speed, no lazy matches */ +/* 2 */ {4, 5, 16, 8, deflate_fast}, +/* 3 */ {4, 6, 32, 32, deflate_fast}, + +/* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */ +/* 5 */ {8, 16, 32, 32, deflate_slow}, +/* 6 */ {8, 16, 128, 128, deflate_slow}, +/* 7 */ {8, 32, 128, 256, deflate_slow}, +/* 8 */ {32, 128, 258, 1024, deflate_slow}, +/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */ +#endif + +/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 + * For deflate_fast() (levels <= 3) good is ignored and lazy has a different + * meaning. + */ + +#define EQUAL 0 +/* result of memcmp for equal strings */ + +#ifndef NO_DUMMY_DECL +struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ +#endif + +/* =========================================================================== + * Update a hash value with the given input byte + * IN assertion: all calls to to UPDATE_HASH are made with consecutive + * input characters, so that a running hash key can be computed from the + * previous key instead of complete recalculation each time. + */ +#define UPDATE_HASH(s,h,c) (h = (((h)<hash_shift) ^ (c)) & s->hash_mask) + + +/* =========================================================================== + * Insert string str in the dictionary and set match_head to the previous head + * of the hash chain (the most recent string with same hash key). Return + * the previous length of the hash chain. + * If this file is compiled with -DFASTEST, the compression level is forced + * to 1, and no hash chains are maintained. + * IN assertion: all calls to to INSERT_STRING are made with consecutive + * input characters and the first MIN_MATCH bytes of str are valid + * (except for the last MIN_MATCH-1 bytes of the input file). + */ +#ifdef FASTEST +#define INSERT_STRING(s, str, match_head) \ + (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ + match_head = s->head[s->ins_h], \ + s->head[s->ins_h] = (Pos)(str)) +#else +#define INSERT_STRING(s, str, match_head) \ + (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ + match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \ + s->head[s->ins_h] = (Pos)(str)) +#endif + +/* =========================================================================== + * Initialize the hash table (avoiding 64K overflow for 16 bit systems). + * prev[] will be initialized on the fly. + */ +#define CLEAR_HASH(s) \ + s->head[s->hash_size-1] = NIL; \ + zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); + +/* ========================================================================= */ +int ZEXPORT deflateInit_(strm, level, version, stream_size) + z_streamp strm; + int level; + const char *version; + int stream_size; +{ + return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, + Z_DEFAULT_STRATEGY, version, stream_size); + /* To do: ignore strm->next_in if we use it as window */ +} + +/* ========================================================================= */ +int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + version, stream_size) + z_streamp strm; + int level; + int method; + int windowBits; + int memLevel; + int strategy; + const char *version; + int stream_size; +{ + deflate_state *s; + int wrap = 1; + static const char my_version[] = ZLIB_VERSION; + + ushf *overlay; + /* We overlay pending_buf and d_buf+l_buf. This works since the average + * output size for (length,distance) codes is <= 24 bits. + */ + + if (version == Z_NULL || version[0] != my_version[0] || + stream_size != sizeof(z_stream)) { + return Z_VERSION_ERROR; + } + if (strm == Z_NULL) return Z_STREAM_ERROR; + + strm->msg = Z_NULL; + if (strm->zalloc == (alloc_func)0) { + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; + } + if (strm->zfree == (free_func)0) strm->zfree = zcfree; + +#ifdef FASTEST + if (level != 0) level = 1; +#else + if (level == Z_DEFAULT_COMPRESSION) level = 6; +#endif + + if (windowBits < 0) { /* suppress zlib wrapper */ + wrap = 0; + windowBits = -windowBits; + } +#ifdef GZIP + else if (windowBits > 15) { + wrap = 2; /* write gzip wrapper instead */ + windowBits -= 16; + } +#endif + if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || + windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || + strategy < 0 || strategy > Z_FIXED) { + return Z_STREAM_ERROR; + } + if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */ + s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state)); + if (s == Z_NULL) return Z_MEM_ERROR; + strm->state = (struct internal_state FAR *)s; + s->strm = strm; + + s->wrap = wrap; + s->gzhead = Z_NULL; + s->w_bits = windowBits; + s->w_size = 1 << s->w_bits; + s->w_mask = s->w_size - 1; + + s->hash_bits = memLevel + 7; + s->hash_size = 1 << s->hash_bits; + s->hash_mask = s->hash_size - 1; + s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH); + + s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte)); + s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); + s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); + + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + + overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); + s->pending_buf = (uchf *) overlay; + s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); + + if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || + s->pending_buf == Z_NULL) { + s->status = FINISH_STATE; + strm->msg = (char*)ERR_MSG(Z_MEM_ERROR); + deflateEnd (strm); + return Z_MEM_ERROR; + } + s->d_buf = overlay + s->lit_bufsize/sizeof(ush); + s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; + + s->level = level; + s->strategy = strategy; + s->method = (Byte)method; + + return deflateReset(strm); +} + +/* ========================================================================= */ +int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) + z_streamp strm; + const Bytef *dictionary; + uInt dictLength; +{ + deflate_state *s; + uInt length = dictLength; + uInt n; + IPos hash_head = 0; + + if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL || + strm->state->wrap == 2 || + (strm->state->wrap == 1 && strm->state->status != INIT_STATE)) + return Z_STREAM_ERROR; + + s = strm->state; + if (s->wrap) + strm->adler = adler32(strm->adler, dictionary, dictLength); + + if (length < MIN_MATCH) return Z_OK; + if (length > MAX_DIST(s)) { + length = MAX_DIST(s); + dictionary += dictLength - length; /* use the tail of the dictionary */ + } + zmemcpy(s->window, dictionary, length); + s->strstart = length; + s->block_start = (long)length; + + /* Insert all strings in the hash table (except for the last two bytes). + * s->lookahead stays null, so s->ins_h will be recomputed at the next + * call of fill_window. + */ + s->ins_h = s->window[0]; + UPDATE_HASH(s, s->ins_h, s->window[1]); + for (n = 0; n <= length - MIN_MATCH; n++) { + INSERT_STRING(s, n, hash_head); + } + if (hash_head) hash_head = 0; /* to make compiler happy */ + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateReset (strm) + z_streamp strm; +{ + deflate_state *s; + + if (strm == Z_NULL || strm->state == Z_NULL || + strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) { + return Z_STREAM_ERROR; + } + + strm->total_in = strm->total_out = 0; + strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */ + strm->data_type = Z_UNKNOWN; + + s = (deflate_state *)strm->state; + s->pending = 0; + s->pending_out = s->pending_buf; + + if (s->wrap < 0) { + s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ + } + s->status = s->wrap ? INIT_STATE : BUSY_STATE; + strm->adler = +#ifdef GZIP + s->wrap == 2 ? crc32(0L, Z_NULL, 0) : +#endif + adler32(0L, Z_NULL, 0); + s->last_flush = Z_NO_FLUSH; + + _tr_init(s); + lm_init(s); + + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateSetHeader (strm, head) + z_streamp strm; + gz_headerp head; +{ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (strm->state->wrap != 2) return Z_STREAM_ERROR; + strm->state->gzhead = head; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflatePrime (strm, bits, value) + z_streamp strm; + int bits; + int value; +{ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + strm->state->bi_valid = bits; + strm->state->bi_buf = (ush)(value & ((1 << bits) - 1)); + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateParams(strm, level, strategy) + z_streamp strm; + int level; + int strategy; +{ + deflate_state *s; + compress_func func; + int err = Z_OK; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + s = strm->state; + +#ifdef FASTEST + if (level != 0) level = 1; +#else + if (level == Z_DEFAULT_COMPRESSION) level = 6; +#endif + if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) { + return Z_STREAM_ERROR; + } + func = configuration_table[s->level].func; + + if (func != configuration_table[level].func && strm->total_in != 0) { + /* Flush the last buffer: */ + err = deflate(strm, Z_PARTIAL_FLUSH); + } + if (s->level != level) { + s->level = level; + s->max_lazy_match = configuration_table[level].max_lazy; + s->good_match = configuration_table[level].good_length; + s->nice_match = configuration_table[level].nice_length; + s->max_chain_length = configuration_table[level].max_chain; + } + s->strategy = strategy; + return err; +} + +/* ========================================================================= */ +int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain) + z_streamp strm; + int good_length; + int max_lazy; + int nice_length; + int max_chain; +{ + deflate_state *s; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + s = strm->state; + s->good_match = good_length; + s->max_lazy_match = max_lazy; + s->nice_match = nice_length; + s->max_chain_length = max_chain; + return Z_OK; +} + +/* ========================================================================= + * For the default windowBits of 15 and memLevel of 8, this function returns + * a close to exact, as well as small, upper bound on the compressed size. + * They are coded as constants here for a reason--if the #define's are + * changed, then this function needs to be changed as well. The return + * value for 15 and 8 only works for those exact settings. + * + * For any setting other than those defaults for windowBits and memLevel, + * the value returned is a conservative worst case for the maximum expansion + * resulting from using fixed blocks instead of stored blocks, which deflate + * can emit on compressed data for some combinations of the parameters. + * + * This function could be more sophisticated to provide closer upper bounds + * for every combination of windowBits and memLevel, as well as wrap. + * But even the conservative upper bound of about 14% expansion does not + * seem onerous for output buffer allocation. + */ +uLong ZEXPORT deflateBound(strm, sourceLen) + z_streamp strm; + uLong sourceLen; +{ + deflate_state *s; + uLong destLen; + + /* conservative upper bound */ + destLen = sourceLen + + ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11; + + /* if can't get parameters, return conservative bound */ + if (strm == Z_NULL || strm->state == Z_NULL) + return destLen; + + /* if not default parameters, return conservative bound */ + s = strm->state; + if (s->w_bits != 15 || s->hash_bits != 8 + 7) + return destLen; + + /* default settings: return tight bound for that case */ + return compressBound(sourceLen); +} + +/* ========================================================================= + * Put a short in the pending buffer. The 16-bit value is put in MSB order. + * IN assertion: the stream state is correct and there is enough room in + * pending_buf. + */ +local void putShortMSB (s, b) + deflate_state *s; + uInt b; +{ + put_byte(s, (Byte)(b >> 8)); + put_byte(s, (Byte)(b & 0xff)); +} + +/* ========================================================================= + * Flush as much pending output as possible. All deflate() output goes + * through this function so some applications may wish to modify it + * to avoid allocating a large strm->next_out buffer and copying into it. + * (See also read_buf()). + */ +local void flush_pending(strm) + z_streamp strm; +{ + unsigned len = strm->state->pending; + + if (len > strm->avail_out) len = strm->avail_out; + if (len == 0) return; + + zmemcpy(strm->next_out, strm->state->pending_out, len); + strm->next_out += len; + strm->state->pending_out += len; + strm->total_out += len; + strm->avail_out -= len; + strm->state->pending -= len; + if (strm->state->pending == 0) { + strm->state->pending_out = strm->state->pending_buf; + } +} + +/* ========================================================================= */ +int ZEXPORT deflate (strm, flush) + z_streamp strm; + int flush; +{ + int old_flush; /* value of flush param for previous deflate call */ + deflate_state *s; + + if (strm == Z_NULL || strm->state == Z_NULL || + flush > Z_FINISH || flush < 0) { + return Z_STREAM_ERROR; + } + s = strm->state; + + if (strm->next_out == Z_NULL || + (strm->next_in == Z_NULL && strm->avail_in != 0) || + (s->status == FINISH_STATE && flush != Z_FINISH)) { + ERR_RETURN(strm, Z_STREAM_ERROR); + } + if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR); + + s->strm = strm; /* just in case */ + old_flush = s->last_flush; + s->last_flush = flush; + + /* Write the header */ + if (s->status == INIT_STATE) { +#ifdef GZIP + if (s->wrap == 2) { + strm->adler = crc32(0L, Z_NULL, 0); + put_byte(s, 31); + put_byte(s, 139); + put_byte(s, 8); + if (s->gzhead == NULL) { + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, s->level == 9 ? 2 : + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, OS_CODE); + s->status = BUSY_STATE; + } + else { + put_byte(s, (s->gzhead->text ? 1 : 0) + + (s->gzhead->hcrc ? 2 : 0) + + (s->gzhead->extra == Z_NULL ? 0 : 4) + + (s->gzhead->name == Z_NULL ? 0 : 8) + + (s->gzhead->comment == Z_NULL ? 0 : 16) + ); + put_byte(s, (Byte)(s->gzhead->time & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff)); + put_byte(s, s->level == 9 ? 2 : + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, s->gzhead->os & 0xff); + if (s->gzhead->extra != NULL) { + put_byte(s, s->gzhead->extra_len & 0xff); + put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); + } + if (s->gzhead->hcrc) + strm->adler = crc32(strm->adler, s->pending_buf, + s->pending); + s->gzindex = 0; + s->status = EXTRA_STATE; + } + } + else +#endif + { + uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; + uInt level_flags; + + if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) + level_flags = 0; + else if (s->level < 6) + level_flags = 1; + else if (s->level == 6) + level_flags = 2; + else + level_flags = 3; + header |= (level_flags << 6); + if (s->strstart != 0) header |= PRESET_DICT; + header += 31 - (header % 31); + + s->status = BUSY_STATE; + putShortMSB(s, header); + + /* Save the adler32 of the preset dictionary: */ + if (s->strstart != 0) { + putShortMSB(s, (uInt)(strm->adler >> 16)); + putShortMSB(s, (uInt)(strm->adler & 0xffff)); + } + strm->adler = adler32(0L, Z_NULL, 0); + } + } +#ifdef GZIP + if (s->status == EXTRA_STATE) { + if (s->gzhead->extra != NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + + while (s->gzindex < (s->gzhead->extra_len & 0xffff)) { + if (s->pending == s->pending_buf_size) { + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + flush_pending(strm); + beg = s->pending; + if (s->pending == s->pending_buf_size) + break; + } + put_byte(s, s->gzhead->extra[s->gzindex]); + s->gzindex++; + } + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (s->gzindex == s->gzhead->extra_len) { + s->gzindex = 0; + s->status = NAME_STATE; + } + } + else + s->status = NAME_STATE; + } + if (s->status == NAME_STATE) { + if (s->gzhead->name != NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + int val; + + do { + if (s->pending == s->pending_buf_size) { + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + flush_pending(strm); + beg = s->pending; + if (s->pending == s->pending_buf_size) { + val = 1; + break; + } + } + val = s->gzhead->name[s->gzindex++]; + put_byte(s, val); + } while (val != 0); + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (val == 0) { + s->gzindex = 0; + s->status = COMMENT_STATE; + } + } + else + s->status = COMMENT_STATE; + } + if (s->status == COMMENT_STATE) { + if (s->gzhead->comment != NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + int val; + + do { + if (s->pending == s->pending_buf_size) { + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + flush_pending(strm); + beg = s->pending; + if (s->pending == s->pending_buf_size) { + val = 1; + break; + } + } + val = s->gzhead->comment[s->gzindex++]; + put_byte(s, val); + } while (val != 0); + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (val == 0) + s->status = HCRC_STATE; + } + else + s->status = HCRC_STATE; + } + if (s->status == HCRC_STATE) { + if (s->gzhead->hcrc) { + if (s->pending + 2 > s->pending_buf_size) + flush_pending(strm); + if (s->pending + 2 <= s->pending_buf_size) { + put_byte(s, (Byte)(strm->adler & 0xff)); + put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); + strm->adler = crc32(0L, Z_NULL, 0); + s->status = BUSY_STATE; + } + } + else + s->status = BUSY_STATE; + } +#endif + + /* Flush as much pending output as possible */ + if (s->pending != 0) { + flush_pending(strm); + if (strm->avail_out == 0) { + /* Since avail_out is 0, deflate will be called again with + * more output space, but possibly with both pending and + * avail_in equal to zero. There won't be anything to do, + * but this is not an error situation so make sure we + * return OK instead of BUF_ERROR at next call of deflate: + */ + s->last_flush = -1; + return Z_OK; + } + + /* Make sure there is something to do and avoid duplicate consecutive + * flushes. For repeated and useless calls with Z_FINISH, we keep + * returning Z_STREAM_END instead of Z_BUF_ERROR. + */ + } else if (strm->avail_in == 0 && flush <= old_flush && + flush != Z_FINISH) { + ERR_RETURN(strm, Z_BUF_ERROR); + } + + /* User must not provide more input after the first FINISH: */ + if (s->status == FINISH_STATE && strm->avail_in != 0) { + ERR_RETURN(strm, Z_BUF_ERROR); + } + + /* Start a new block or continue the current one. + */ + if (strm->avail_in != 0 || s->lookahead != 0 || + (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) { + block_state bstate; + + bstate = (*(configuration_table[s->level].func))(s, flush); + + if (bstate == finish_started || bstate == finish_done) { + s->status = FINISH_STATE; + } + if (bstate == need_more || bstate == finish_started) { + if (strm->avail_out == 0) { + s->last_flush = -1; /* avoid BUF_ERROR next call, see above */ + } + return Z_OK; + /* If flush != Z_NO_FLUSH && avail_out == 0, the next call + * of deflate should use the same flush parameter to make sure + * that the flush is complete. So we don't have to output an + * empty block here, this will be done at next call. This also + * ensures that for a very small output buffer, we emit at most + * one empty block. + */ + } + if (bstate == block_done) { + if (flush == Z_PARTIAL_FLUSH) { + _tr_align(s); + } else { /* FULL_FLUSH or SYNC_FLUSH */ + _tr_stored_block(s, (char*)0, 0L, 0); + /* For a full flush, this empty block will be recognized + * as a special marker by inflate_sync(). + */ + if (flush == Z_FULL_FLUSH) { + CLEAR_HASH(s); /* forget history */ + } + } + flush_pending(strm); + if (strm->avail_out == 0) { + s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */ + return Z_OK; + } + } + } + Assert(strm->avail_out > 0, "bug2"); + + if (flush != Z_FINISH) return Z_OK; + if (s->wrap <= 0) return Z_STREAM_END; + + /* Write the trailer */ +#ifdef GZIP + if (s->wrap == 2) { + put_byte(s, (Byte)(strm->adler & 0xff)); + put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); + put_byte(s, (Byte)((strm->adler >> 16) & 0xff)); + put_byte(s, (Byte)((strm->adler >> 24) & 0xff)); + put_byte(s, (Byte)(strm->total_in & 0xff)); + put_byte(s, (Byte)((strm->total_in >> 8) & 0xff)); + put_byte(s, (Byte)((strm->total_in >> 16) & 0xff)); + put_byte(s, (Byte)((strm->total_in >> 24) & 0xff)); + } + else +#endif + { + putShortMSB(s, (uInt)(strm->adler >> 16)); + putShortMSB(s, (uInt)(strm->adler & 0xffff)); + } + flush_pending(strm); + /* If avail_out is zero, the application will call deflate again + * to flush the rest. + */ + if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */ + return s->pending != 0 ? Z_OK : Z_STREAM_END; +} + +/* ========================================================================= */ +int ZEXPORT deflateEnd (strm) + z_streamp strm; +{ + int status; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + + status = strm->state->status; + if (status != INIT_STATE && + status != EXTRA_STATE && + status != NAME_STATE && + status != COMMENT_STATE && + status != HCRC_STATE && + status != BUSY_STATE && + status != FINISH_STATE) { + return Z_STREAM_ERROR; + } + + /* Deallocate in reverse order of allocations: */ + TRY_FREE(strm, strm->state->pending_buf); + TRY_FREE(strm, strm->state->head); + TRY_FREE(strm, strm->state->prev); + TRY_FREE(strm, strm->state->window); + + ZFREE(strm, strm->state); + strm->state = Z_NULL; + + return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK; +} + +/* ========================================================================= + * Copy the source state to the destination state. + * To simplify the source, this is not supported for 16-bit MSDOS (which + * doesn't have enough memory anyway to duplicate compression states). + */ +int ZEXPORT deflateCopy (dest, source) + z_streamp dest; + z_streamp source; +{ +#ifdef MAXSEG_64K + return Z_STREAM_ERROR; +#else + deflate_state *ds; + deflate_state *ss; + ushf *overlay; + + + if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) { + return Z_STREAM_ERROR; + } + + ss = source->state; + + zmemcpy(dest, source, sizeof(z_stream)); + + ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state)); + if (ds == Z_NULL) return Z_MEM_ERROR; + dest->state = (struct internal_state FAR *) ds; + zmemcpy(ds, ss, sizeof(deflate_state)); + ds->strm = dest; + + ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); + ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); + ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); + overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); + ds->pending_buf = (uchf *) overlay; + + if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || + ds->pending_buf == Z_NULL) { + deflateEnd (dest); + return Z_MEM_ERROR; + } + /* following zmemcpy do not work for 16-bit MSDOS */ + zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte)); + zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos)); + zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos)); + zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); + + ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); + ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); + ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; + + ds->l_desc.dyn_tree = ds->dyn_ltree; + ds->d_desc.dyn_tree = ds->dyn_dtree; + ds->bl_desc.dyn_tree = ds->bl_tree; + + return Z_OK; +#endif /* MAXSEG_64K */ +} + +/* =========================================================================== + * Read a new buffer from the current input stream, update the adler32 + * and total number of bytes read. All deflate() input goes through + * this function so some applications may wish to modify it to avoid + * allocating a large strm->next_in buffer and copying from it. + * (See also flush_pending()). + */ +local int read_buf(strm, buf, size) + z_streamp strm; + Bytef *buf; + unsigned size; +{ + unsigned len = strm->avail_in; + + if (len > size) len = size; + if (len == 0) return 0; + + strm->avail_in -= len; + + if (strm->state->wrap == 1) { + strm->adler = adler32(strm->adler, strm->next_in, len); + } +#ifdef GZIP + else if (strm->state->wrap == 2) { + strm->adler = crc32(strm->adler, strm->next_in, len); + } +#endif + zmemcpy(buf, strm->next_in, len); + strm->next_in += len; + strm->total_in += len; + + return (int)len; +} + +/* =========================================================================== + * Initialize the "longest match" routines for a new zlib stream + */ +local void lm_init (s) + deflate_state *s; +{ + s->window_size = (ulg)2L*s->w_size; + + CLEAR_HASH(s); + + /* Set the default configuration parameters: + */ + s->max_lazy_match = configuration_table[s->level].max_lazy; + s->good_match = configuration_table[s->level].good_length; + s->nice_match = configuration_table[s->level].nice_length; + s->max_chain_length = configuration_table[s->level].max_chain; + + s->strstart = 0; + s->block_start = 0L; + s->lookahead = 0; + s->match_length = s->prev_length = MIN_MATCH-1; + s->match_available = 0; + s->ins_h = 0; +#ifndef FASTEST +#ifdef ASMV + match_init(); /* initialize the asm code */ +#endif +#endif +} + +#ifndef FASTEST +/* =========================================================================== + * Set match_start to the longest match starting at the given string and + * return its length. Matches shorter or equal to prev_length are discarded, + * in which case the result is equal to prev_length and match_start is + * garbage. + * IN assertions: cur_match is the head of the hash chain for the current + * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1 + * OUT assertion: the match length is not greater than s->lookahead. + */ +#ifndef ASMV +/* For 80x86 and 680x0, an optimized version will be provided in match.asm or + * match.S. The code will be functionally equivalent. + */ +local uInt longest_match(s, cur_match) + deflate_state *s; + IPos cur_match; /* current match */ +{ + unsigned chain_length = s->max_chain_length;/* max hash chain length */ + register Bytef *scan = s->window + s->strstart; /* current string */ + register Bytef *match; /* matched string */ + register int len; /* length of current match */ + int best_len = s->prev_length; /* best match length so far */ + int nice_match = s->nice_match; /* stop if match long enough */ + IPos limit = s->strstart > (IPos)MAX_DIST(s) ? + s->strstart - (IPos)MAX_DIST(s) : NIL; + /* Stop when cur_match becomes <= limit. To simplify the code, + * we prevent matches with the string of window index 0. + */ + Posf *prev = s->prev; + uInt wmask = s->w_mask; + +#ifdef UNALIGNED_OK + /* Compare two bytes at a time. Note: this is not always beneficial. + * Try with and without -DUNALIGNED_OK to check. + */ + register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1; + register ush scan_start = *(ushf*)scan; + register ush scan_end = *(ushf*)(scan+best_len-1); +#else + register Bytef *strend = s->window + s->strstart + MAX_MATCH; + register Byte scan_end1 = scan[best_len-1]; + register Byte scan_end = scan[best_len]; +#endif + + /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. + * It is easy to get rid of this optimization if necessary. + */ + Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); + + /* Do not waste too much time if we already have a good match: */ + if (s->prev_length >= s->good_match) { + chain_length >>= 2; + } + /* Do not look for matches beyond the end of the input. This is necessary + * to make deflate deterministic. + */ + if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; + + Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); + + do { + Assert(cur_match < s->strstart, "no future"); + match = s->window + cur_match; + + /* Skip to next match if the match length cannot increase + * or if the match length is less than 2. Note that the checks below + * for insufficient lookahead only occur occasionally for performance + * reasons. Therefore uninitialized memory will be accessed, and + * conditional jumps will be made that depend on those values. + * However the length of the match is limited to the lookahead, so + * the output of deflate is not affected by the uninitialized values. + */ +#if (defined(UNALIGNED_OK) && MAX_MATCH == 258) + /* This code assumes sizeof(unsigned short) == 2. Do not use + * UNALIGNED_OK if your compiler uses a different size. + */ + if (*(ushf*)(match+best_len-1) != scan_end || + *(ushf*)match != scan_start) continue; + + /* It is not necessary to compare scan[2] and match[2] since they are + * always equal when the other bytes match, given that the hash keys + * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at + * strstart+3, +5, ... up to strstart+257. We check for insufficient + * lookahead only every 4th comparison; the 128th check will be made + * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is + * necessary to put more guard bytes at the end of the window, or + * to check more often for insufficient lookahead. + */ + Assert(scan[2] == match[2], "scan[2]?"); + scan++, match++; + do { + } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) && + *(ushf*)(scan+=2) == *(ushf*)(match+=2) && + *(ushf*)(scan+=2) == *(ushf*)(match+=2) && + *(ushf*)(scan+=2) == *(ushf*)(match+=2) && + scan < strend); + /* The funny "do {}" generates better code on most compilers */ + + /* Here, scan <= window+strstart+257 */ + Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); + if (*scan == *match) scan++; + + len = (MAX_MATCH - 1) - (int)(strend-scan); + scan = strend - (MAX_MATCH-1); + +#else /* UNALIGNED_OK */ + + if (match[best_len] != scan_end || + match[best_len-1] != scan_end1 || + *match != *scan || + *++match != scan[1]) continue; + + /* The check at best_len-1 can be removed because it will be made + * again later. (This heuristic is not always a win.) + * It is not necessary to compare scan[2] and match[2] since they + * are always equal when the other bytes match, given that + * the hash keys are equal and that HASH_BITS >= 8. + */ + scan += 2, match++; + Assert(*scan == *match, "match[2]?"); + + /* We check for insufficient lookahead only every 8th comparison; + * the 256th check will be made at strstart+258. + */ + do { + } while (*++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + scan < strend); + + Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); + + len = MAX_MATCH - (int)(strend - scan); + scan = strend - MAX_MATCH; + +#endif /* UNALIGNED_OK */ + + if (len > best_len) { + s->match_start = cur_match; + best_len = len; + if (len >= nice_match) break; +#ifdef UNALIGNED_OK + scan_end = *(ushf*)(scan+best_len-1); +#else + scan_end1 = scan[best_len-1]; + scan_end = scan[best_len]; +#endif + } + } while ((cur_match = prev[cur_match & wmask]) > limit + && --chain_length != 0); + + if ((uInt)best_len <= s->lookahead) return (uInt)best_len; + return s->lookahead; +} +#endif /* ASMV */ +#endif /* FASTEST */ + +/* --------------------------------------------------------------------------- + * Optimized version for level == 1 or strategy == Z_RLE only + */ +local uInt longest_match_fast(s, cur_match) + deflate_state *s; + IPos cur_match; /* current match */ +{ + register Bytef *scan = s->window + s->strstart; /* current string */ + register Bytef *match; /* matched string */ + register int len; /* length of current match */ + register Bytef *strend = s->window + s->strstart + MAX_MATCH; + + /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. + * It is easy to get rid of this optimization if necessary. + */ + Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); + + Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); + + Assert(cur_match < s->strstart, "no future"); + + match = s->window + cur_match; + + /* Return failure if the match length is less than 2: + */ + if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1; + + /* The check at best_len-1 can be removed because it will be made + * again later. (This heuristic is not always a win.) + * It is not necessary to compare scan[2] and match[2] since they + * are always equal when the other bytes match, given that + * the hash keys are equal and that HASH_BITS >= 8. + */ + scan += 2, match += 2; + Assert(*scan == *match, "match[2]?"); + + /* We check for insufficient lookahead only every 8th comparison; + * the 256th check will be made at strstart+258. + */ + do { + } while (*++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + scan < strend); + + Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); + + len = MAX_MATCH - (int)(strend - scan); + + if (len < MIN_MATCH) return MIN_MATCH - 1; + + s->match_start = cur_match; + return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead; +} + +#ifdef DEBUG +/* =========================================================================== + * Check that the match at match_start is indeed a match. + */ +local void check_match(s, start, match, length) + deflate_state *s; + IPos start, match; + int length; +{ + /* check that the match is indeed a match */ + if (zmemcmp(s->window + match, + s->window + start, length) != EQUAL) { + fprintf(stderr, " start %u, match %u, length %d\n", + start, match, length); + do { + fprintf(stderr, "%c%c", s->window[match++], s->window[start++]); + } while (--length != 0); + z_error("invalid match"); + } + if (z_verbose > 1) { + fprintf(stderr,"\\[%d,%d]", start-match, length); + do { putc(s->window[start++], stderr); } while (--length != 0); + } +} +#else +# define check_match(s, start, match, length) +#endif /* DEBUG */ + +/* =========================================================================== + * Fill the window when the lookahead becomes insufficient. + * Updates strstart and lookahead. + * + * IN assertion: lookahead < MIN_LOOKAHEAD + * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD + * At least one byte has been read, or avail_in == 0; reads are + * performed for at least two bytes (required for the zip translate_eol + * option -- not supported here). + */ +local void fill_window(s) + deflate_state *s; +{ + register unsigned n, m; + register Posf *p; + unsigned more; /* Amount of free space at the end of the window. */ + uInt wsize = s->w_size; + + do { + more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); + + /* Deal with !@#$% 64K limit: */ + if (sizeof(int) <= 2) { + if (more == 0 && s->strstart == 0 && s->lookahead == 0) { + more = wsize; + + } else if (more == (unsigned)(-1)) { + /* Very unlikely, but possible on 16 bit machine if + * strstart == 0 && lookahead == 1 (input done a byte at time) + */ + more--; + } + } + + /* If the window is almost full and there is insufficient lookahead, + * move the upper half to the lower one to make room in the upper half. + */ + if (s->strstart >= wsize+MAX_DIST(s)) { + + zmemcpy(s->window, s->window+wsize, (unsigned)wsize); + s->match_start -= wsize; + s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ + s->block_start -= (long) wsize; + + /* Slide the hash table (could be avoided with 32 bit values + at the expense of memory usage). We slide even when level == 0 + to keep the hash table consistent if we switch back to level > 0 + later. (Using level 0 permanently is not an optimal usage of + zlib, so we don't care about this pathological case.) + */ + /* %%% avoid this when Z_RLE */ + n = s->hash_size; + p = &s->head[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m-wsize : NIL); + } while (--n); + + n = wsize; +#ifndef FASTEST + p = &s->prev[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m-wsize : NIL); + /* If n is not on any hash chain, prev[n] is garbage but + * its value will never be used. + */ + } while (--n); +#endif + more += wsize; + } + if (s->strm->avail_in == 0) return; + + /* If there was no sliding: + * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && + * more == window_size - lookahead - strstart + * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1) + * => more >= window_size - 2*WSIZE + 2 + * In the BIG_MEM or MMAP case (not yet supported), + * window_size == input_size + MIN_LOOKAHEAD && + * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD. + * Otherwise, window_size == 2*WSIZE so more >= 2. + * If there was sliding, more >= WSIZE. So in all cases, more >= 2. + */ + Assert(more >= 2, "more < 2"); + + n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more); + s->lookahead += n; + + /* Initialize the hash value now that we have some input: */ + if (s->lookahead >= MIN_MATCH) { + s->ins_h = s->window[s->strstart]; + UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]); +#if MIN_MATCH != 3 + Call UPDATE_HASH() MIN_MATCH-3 more times +#endif + } + /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage, + * but this is not important since only literal bytes will be emitted. + */ + + } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); +} + +/* =========================================================================== + * Flush the current block, with given end-of-file flag. + * IN assertion: strstart is set to the end of the current match. + */ +#define FLUSH_BLOCK_ONLY(s, eof) { \ + _tr_flush_block(s, (s->block_start >= 0L ? \ + (charf *)&s->window[(unsigned)s->block_start] : \ + (charf *)Z_NULL), \ + (ulg)((long)s->strstart - s->block_start), \ + (eof)); \ + s->block_start = s->strstart; \ + flush_pending(s->strm); \ + Tracev((stderr,"[FLUSH]")); \ +} + +/* Same but force premature exit if necessary. */ +#define FLUSH_BLOCK(s, eof) { \ + FLUSH_BLOCK_ONLY(s, eof); \ + if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \ +} + +/* =========================================================================== + * Copy without compression as much as possible from the input stream, return + * the current block state. + * This function does not insert new strings in the dictionary since + * uncompressible data is probably not useful. This function is used + * only for the level=0 compression option. + * NOTE: this function should be optimized to avoid extra copying from + * window to pending_buf. + */ +local block_state deflate_stored(s, flush) + deflate_state *s; + int flush; +{ + /* Stored blocks are limited to 0xffff bytes, pending_buf is limited + * to pending_buf_size, and each stored block has a 5 byte header: + */ + ulg max_block_size = 0xffff; + ulg max_start; + + if (max_block_size > s->pending_buf_size - 5) { + max_block_size = s->pending_buf_size - 5; + } + + /* Copy as much as possible from input to output: */ + for (;;) { + /* Fill the window as much as possible: */ + if (s->lookahead <= 1) { + + Assert(s->strstart < s->w_size+MAX_DIST(s) || + s->block_start >= (long)s->w_size, "slide too late"); + + fill_window(s); + if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more; + + if (s->lookahead == 0) break; /* flush the current block */ + } + Assert(s->block_start >= 0L, "block gone"); + + s->strstart += s->lookahead; + s->lookahead = 0; + + /* Emit a stored block if pending_buf will be full: */ + max_start = s->block_start + max_block_size; + if (s->strstart == 0 || (ulg)s->strstart >= max_start) { + /* strstart == 0 is possible when wraparound on 16-bit machine */ + s->lookahead = (uInt)(s->strstart - max_start); + s->strstart = (uInt)max_start; + FLUSH_BLOCK(s, 0); + } + /* Flush if we may have to slide, otherwise block_start may become + * negative and the data will be gone: + */ + if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) { + FLUSH_BLOCK(s, 0); + } + } + FLUSH_BLOCK(s, flush == Z_FINISH); + return flush == Z_FINISH ? finish_done : block_done; +} + +/* =========================================================================== + * Compress as much as possible from the input stream, return the current + * block state. + * This function does not perform lazy evaluation of matches and inserts + * new strings in the dictionary only for unmatched strings or for short + * matches. It is used only for the fast compression options. + */ +local block_state deflate_fast(s, flush) + deflate_state *s; + int flush; +{ + IPos hash_head = NIL; /* head of the hash chain */ + int bflush; /* set if current block must be flushed */ + + for (;;) { + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes + * for the next match, plus MIN_MATCH bytes to insert the + * string following the next match. + */ + if (s->lookahead < MIN_LOOKAHEAD) { + fill_window(s); + if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { + return need_more; + } + if (s->lookahead == 0) break; /* flush the current block */ + } + + /* Insert the string window[strstart .. strstart+2] in the + * dictionary, and set hash_head to the head of the hash chain: + */ + if (s->lookahead >= MIN_MATCH) { + INSERT_STRING(s, s->strstart, hash_head); + } + + /* Find the longest match, discarding those <= prev_length. + * At this point we have always match_length < MIN_MATCH + */ + if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) { + /* To simplify the code, we prevent matches with the string + * of window index 0 (in particular we have to avoid a match + * of the string with itself at the start of the input file). + */ +#ifdef FASTEST + if ((s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) || + (s->strategy == Z_RLE && s->strstart - hash_head == 1)) { + s->match_length = longest_match_fast (s, hash_head); + } +#else + if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) { + s->match_length = longest_match (s, hash_head); + } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) { + s->match_length = longest_match_fast (s, hash_head); + } +#endif + /* longest_match() or longest_match_fast() sets match_start */ + } + if (s->match_length >= MIN_MATCH) { + check_match(s, s->strstart, s->match_start, s->match_length); + + _tr_tally_dist(s, s->strstart - s->match_start, + s->match_length - MIN_MATCH, bflush); + + s->lookahead -= s->match_length; + + /* Insert new strings in the hash table only if the match length + * is not too large. This saves time but degrades compression. + */ +#ifndef FASTEST + if (s->match_length <= s->max_insert_length && + s->lookahead >= MIN_MATCH) { + s->match_length--; /* string at strstart already in table */ + do { + s->strstart++; + INSERT_STRING(s, s->strstart, hash_head); + /* strstart never exceeds WSIZE-MAX_MATCH, so there are + * always MIN_MATCH bytes ahead. + */ + } while (--s->match_length != 0); + s->strstart++; + } else +#endif + { + s->strstart += s->match_length; + s->match_length = 0; + s->ins_h = s->window[s->strstart]; + UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]); +#if MIN_MATCH != 3 + Call UPDATE_HASH() MIN_MATCH-3 more times +#endif + /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not + * matter since it will be recomputed at next deflate call. + */ + } + } else { + /* No match, output a literal byte */ + Tracevv((stderr,"%c", s->window[s->strstart])); + _tr_tally_lit (s, s->window[s->strstart], bflush); + s->lookahead--; + s->strstart++; + } + if (bflush) FLUSH_BLOCK(s, 0); + } + FLUSH_BLOCK(s, flush == Z_FINISH); + return flush == Z_FINISH ? finish_done : block_done; +} + +#ifndef FASTEST +/* =========================================================================== + * Same as above, but achieves better compression. We use a lazy + * evaluation for matches: a match is finally adopted only if there is + * no better match at the next window position. + */ +local block_state deflate_slow(s, flush) + deflate_state *s; + int flush; +{ + IPos hash_head = NIL; /* head of hash chain */ + int bflush; /* set if current block must be flushed */ + + /* Process the input block. */ + for (;;) { + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes + * for the next match, plus MIN_MATCH bytes to insert the + * string following the next match. + */ + if (s->lookahead < MIN_LOOKAHEAD) { + fill_window(s); + if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { + return need_more; + } + if (s->lookahead == 0) break; /* flush the current block */ + } + + /* Insert the string window[strstart .. strstart+2] in the + * dictionary, and set hash_head to the head of the hash chain: + */ + if (s->lookahead >= MIN_MATCH) { + INSERT_STRING(s, s->strstart, hash_head); + } + + /* Find the longest match, discarding those <= prev_length. + */ + s->prev_length = s->match_length, s->prev_match = s->match_start; + s->match_length = MIN_MATCH-1; + + if (hash_head != NIL && s->prev_length < s->max_lazy_match && + s->strstart - hash_head <= MAX_DIST(s)) { + /* To simplify the code, we prevent matches with the string + * of window index 0 (in particular we have to avoid a match + * of the string with itself at the start of the input file). + */ + if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) { + s->match_length = longest_match (s, hash_head); + } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) { + s->match_length = longest_match_fast (s, hash_head); + } + /* longest_match() or longest_match_fast() sets match_start */ + + if (s->match_length <= 5 && (s->strategy == Z_FILTERED +#if TOO_FAR <= 32767 + || (s->match_length == MIN_MATCH && + s->strstart - s->match_start > TOO_FAR) +#endif + )) { + + /* If prev_match is also MIN_MATCH, match_start is garbage + * but we will ignore the current match anyway. + */ + s->match_length = MIN_MATCH-1; + } + } + /* If there was a match at the previous step and the current + * match is not better, output the previous match: + */ + if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) { + uInt max_insert = s->strstart + s->lookahead - MIN_MATCH; + /* Do not insert strings in hash table beyond this. */ + + check_match(s, s->strstart-1, s->prev_match, s->prev_length); + + _tr_tally_dist(s, s->strstart -1 - s->prev_match, + s->prev_length - MIN_MATCH, bflush); + + /* Insert in hash table all strings up to the end of the match. + * strstart-1 and strstart are already inserted. If there is not + * enough lookahead, the last two strings are not inserted in + * the hash table. + */ + s->lookahead -= s->prev_length-1; + s->prev_length -= 2; + do { + if (++s->strstart <= max_insert) { + INSERT_STRING(s, s->strstart, hash_head); + } + } while (--s->prev_length != 0); + s->match_available = 0; + s->match_length = MIN_MATCH-1; + s->strstart++; + + if (bflush) FLUSH_BLOCK(s, 0); + + } else if (s->match_available) { + /* If there was no match at the previous position, output a + * single literal. If there was a match but the current match + * is longer, truncate the previous match to a single literal. + */ + Tracevv((stderr,"%c", s->window[s->strstart-1])); + _tr_tally_lit(s, s->window[s->strstart-1], bflush); + if (bflush) { + FLUSH_BLOCK_ONLY(s, 0); + } + s->strstart++; + s->lookahead--; + if (s->strm->avail_out == 0) return need_more; + } else { + /* There is no previous match to compare with, wait for + * the next step to decide. + */ + s->match_available = 1; + s->strstart++; + s->lookahead--; + } + } + Assert (flush != Z_NO_FLUSH, "no flush?"); + if (s->match_available) { + Tracevv((stderr,"%c", s->window[s->strstart-1])); + _tr_tally_lit(s, s->window[s->strstart-1], bflush); + s->match_available = 0; + } + FLUSH_BLOCK(s, flush == Z_FINISH); + return flush == Z_FINISH ? finish_done : block_done; +} +#endif /* FASTEST */ + +#if 0 +/* =========================================================================== + * For Z_RLE, simply look for runs of bytes, generate matches only of distance + * one. Do not maintain a hash table. (It will be regenerated if this run of + * deflate switches away from Z_RLE.) + */ +local block_state deflate_rle(s, flush) + deflate_state *s; + int flush; +{ + int bflush; /* set if current block must be flushed */ + uInt run; /* length of run */ + uInt max; /* maximum length of run */ + uInt prev; /* byte at distance one to match */ + Bytef *scan; /* scan for end of run */ + + for (;;) { + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes + * for the longest encodable run. + */ + if (s->lookahead < MAX_MATCH) { + fill_window(s); + if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) { + return need_more; + } + if (s->lookahead == 0) break; /* flush the current block */ + } + + /* See how many times the previous byte repeats */ + run = 0; + if (s->strstart > 0) { /* if there is a previous byte, that is */ + max = s->lookahead < MAX_MATCH ? s->lookahead : MAX_MATCH; + scan = s->window + s->strstart - 1; + prev = *scan++; + do { + if (*scan++ != prev) + break; + } while (++run < max); + } + + /* Emit match if have run of MIN_MATCH or longer, else emit literal */ + if (run >= MIN_MATCH) { + check_match(s, s->strstart, s->strstart - 1, run); + _tr_tally_dist(s, 1, run - MIN_MATCH, bflush); + s->lookahead -= run; + s->strstart += run; + } else { + /* No match, output a literal byte */ + Tracevv((stderr,"%c", s->window[s->strstart])); + _tr_tally_lit (s, s->window[s->strstart], bflush); + s->lookahead--; + s->strstart++; + } + if (bflush) FLUSH_BLOCK(s, 0); + } + FLUSH_BLOCK(s, flush == Z_FINISH); + return flush == Z_FINISH ? finish_done : block_done; +} +#endif diff --git a/zlib/deflate.h b/zlib/deflate.h new file mode 100644 index 0000000000..222c53e043 --- /dev/null +++ b/zlib/deflate.h @@ -0,0 +1,331 @@ +/* deflate.h -- internal compression state + * Copyright (C) 1995-2004 Jean-loup Gailly + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +/* @(#) $Id$ */ + +#ifndef DEFLATE_H +#define DEFLATE_H + +#include "zutil.h" + +/* define NO_GZIP when compiling if you want to disable gzip header and + trailer creation by deflate(). NO_GZIP would be used to avoid linking in + the crc code when it is not needed. For shared libraries, gzip encoding + should be left enabled. */ +#ifndef NO_GZIP +# define GZIP +#endif + +/* =========================================================================== + * Internal compression state. + */ + +#define LENGTH_CODES 29 +/* number of length codes, not counting the special END_BLOCK code */ + +#define LITERALS 256 +/* number of literal bytes 0..255 */ + +#define L_CODES (LITERALS+1+LENGTH_CODES) +/* number of Literal or Length codes, including the END_BLOCK code */ + +#define D_CODES 30 +/* number of distance codes */ + +#define BL_CODES 19 +/* number of codes used to transfer the bit lengths */ + +#define HEAP_SIZE (2*L_CODES+1) +/* maximum heap size */ + +#define MAX_BITS 15 +/* All codes must not exceed MAX_BITS bits */ + +#define INIT_STATE 42 +#define EXTRA_STATE 69 +#define NAME_STATE 73 +#define COMMENT_STATE 91 +#define HCRC_STATE 103 +#define BUSY_STATE 113 +#define FINISH_STATE 666 +/* Stream status */ + + +/* Data structure describing a single value and its code string. */ +typedef struct ct_data_s { + union { + ush freq; /* frequency count */ + ush code; /* bit string */ + } fc; + union { + ush dad; /* father node in Huffman tree */ + ush len; /* length of bit string */ + } dl; +} FAR ct_data; + +#define Freq fc.freq +#define Code fc.code +#define Dad dl.dad +#define Len dl.len + +typedef struct static_tree_desc_s static_tree_desc; + +typedef struct tree_desc_s { + ct_data *dyn_tree; /* the dynamic tree */ + int max_code; /* largest code with non zero frequency */ + static_tree_desc *stat_desc; /* the corresponding static tree */ +} FAR tree_desc; + +typedef ush Pos; +typedef Pos FAR Posf; +typedef unsigned IPos; + +/* A Pos is an index in the character window. We use short instead of int to + * save space in the various tables. IPos is used only for parameter passing. + */ + +typedef struct internal_state { + z_streamp strm; /* pointer back to this zlib stream */ + int status; /* as the name implies */ + Bytef *pending_buf; /* output still pending */ + ulg pending_buf_size; /* size of pending_buf */ + Bytef *pending_out; /* next pending byte to output to the stream */ + uInt pending; /* nb of bytes in the pending buffer */ + int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ + gz_headerp gzhead; /* gzip header information to write */ + uInt gzindex; /* where in extra, name, or comment */ + Byte method; /* STORED (for zip only) or DEFLATED */ + int last_flush; /* value of flush param for previous deflate call */ + + /* used by deflate.c: */ + + uInt w_size; /* LZ77 window size (32K by default) */ + uInt w_bits; /* log2(w_size) (8..16) */ + uInt w_mask; /* w_size - 1 */ + + Bytef *window; + /* Sliding window. Input bytes are read into the second half of the window, + * and move to the first half later to keep a dictionary of at least wSize + * bytes. With this organization, matches are limited to a distance of + * wSize-MAX_MATCH bytes, but this ensures that IO is always + * performed with a length multiple of the block size. Also, it limits + * the window size to 64K, which is quite useful on MSDOS. + * To do: use the user input buffer as sliding window. + */ + + ulg window_size; + /* Actual size of window: 2*wSize, except when the user input buffer + * is directly used as sliding window. + */ + + Posf *prev; + /* Link to older string with same hash index. To limit the size of this + * array to 64K, this link is maintained only for the last 32K strings. + * An index in this array is thus a window index modulo 32K. + */ + + Posf *head; /* Heads of the hash chains or NIL. */ + + uInt ins_h; /* hash index of string to be inserted */ + uInt hash_size; /* number of elements in hash table */ + uInt hash_bits; /* log2(hash_size) */ + uInt hash_mask; /* hash_size-1 */ + + uInt hash_shift; + /* Number of bits by which ins_h must be shifted at each input + * step. It must be such that after MIN_MATCH steps, the oldest + * byte no longer takes part in the hash key, that is: + * hash_shift * MIN_MATCH >= hash_bits + */ + + long block_start; + /* Window position at the beginning of the current output block. Gets + * negative when the window is moved backwards. + */ + + uInt match_length; /* length of best match */ + IPos prev_match; /* previous match */ + int match_available; /* set if previous match exists */ + uInt strstart; /* start of string to insert */ + uInt match_start; /* start of matching string */ + uInt lookahead; /* number of valid bytes ahead in window */ + + uInt prev_length; + /* Length of the best match at previous step. Matches not greater than this + * are discarded. This is used in the lazy match evaluation. + */ + + uInt max_chain_length; + /* To speed up deflation, hash chains are never searched beyond this + * length. A higher limit improves compression ratio but degrades the + * speed. + */ + + uInt max_lazy_match; + /* Attempt to find a better match only when the current match is strictly + * smaller than this value. This mechanism is used only for compression + * levels >= 4. + */ +# define max_insert_length max_lazy_match + /* Insert new strings in the hash table only if the match length is not + * greater than this length. This saves time but degrades compression. + * max_insert_length is used only for compression levels <= 3. + */ + + int level; /* compression level (1..9) */ + int strategy; /* favor or force Huffman coding*/ + + uInt good_match; + /* Use a faster search when the previous match is longer than this */ + + int nice_match; /* Stop searching when current match exceeds this */ + + /* used by trees.c: */ + /* Didn't use ct_data typedef below to supress compiler warning */ + struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ + struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ + struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ + + struct tree_desc_s l_desc; /* desc. for literal tree */ + struct tree_desc_s d_desc; /* desc. for distance tree */ + struct tree_desc_s bl_desc; /* desc. for bit length tree */ + + ush bl_count[MAX_BITS+1]; + /* number of codes at each bit length for an optimal tree */ + + int heap[2*L_CODES+1]; /* heap used to build the Huffman trees */ + int heap_len; /* number of elements in the heap */ + int heap_max; /* element of largest frequency */ + /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used. + * The same heap array is used to build all trees. + */ + + uch depth[2*L_CODES+1]; + /* Depth of each subtree used as tie breaker for trees of equal frequency + */ + + uchf *l_buf; /* buffer for literals or lengths */ + + uInt lit_bufsize; + /* Size of match buffer for literals/lengths. There are 4 reasons for + * limiting lit_bufsize to 64K: + * - frequencies can be kept in 16 bit counters + * - if compression is not successful for the first block, all input + * data is still in the window so we can still emit a stored block even + * when input comes from standard input. (This can also be done for + * all blocks if lit_bufsize is not greater than 32K.) + * - if compression is not successful for a file smaller than 64K, we can + * even emit a stored file instead of a stored block (saving 5 bytes). + * This is applicable only for zip (not gzip or zlib). + * - creating new Huffman trees less frequently may not provide fast + * adaptation to changes in the input data statistics. (Take for + * example a binary file with poorly compressible code followed by + * a highly compressible string table.) Smaller buffer sizes give + * fast adaptation but have of course the overhead of transmitting + * trees more frequently. + * - I can't count above 4 + */ + + uInt last_lit; /* running index in l_buf */ + + ushf *d_buf; + /* Buffer for distances. To simplify the code, d_buf and l_buf have + * the same number of elements. To use different lengths, an extra flag + * array would be necessary. + */ + + ulg opt_len; /* bit length of current block with optimal trees */ + ulg static_len; /* bit length of current block with static trees */ + uInt matches; /* number of string matches in current block */ + int last_eob_len; /* bit length of EOB code for last block */ + +#ifdef DEBUG + ulg compressed_len; /* total bit length of compressed file mod 2^32 */ + ulg bits_sent; /* bit length of compressed data sent mod 2^32 */ +#endif + + ush bi_buf; + /* Output buffer. bits are inserted starting at the bottom (least + * significant bits). + */ + int bi_valid; + /* Number of valid bits in bi_buf. All bits above the last valid bit + * are always zero. + */ + +} FAR deflate_state; + +/* Output a byte on the stream. + * IN assertion: there is enough room in pending_buf. + */ +#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);} + + +#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) +/* Minimum amount of lookahead, except at the end of the input file. + * See deflate.c for comments about the MIN_MATCH+1. + */ + +#define MAX_DIST(s) ((s)->w_size-MIN_LOOKAHEAD) +/* In order to simplify the code, particularly on 16 bit machines, match + * distances are limited to MAX_DIST instead of WSIZE. + */ + + /* in trees.c */ +void _tr_init OF((deflate_state *s)); +int _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); +void _tr_flush_block OF((deflate_state *s, charf *buf, ulg stored_len, + int eof)); +void _tr_align OF((deflate_state *s)); +void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len, + int eof)); + +#define d_code(dist) \ + ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)]) +/* Mapping from a distance to a distance code. dist is the distance - 1 and + * must not have side effects. _dist_code[256] and _dist_code[257] are never + * used. + */ + +#ifndef DEBUG +/* Inline versions of _tr_tally for speed: */ + +#if defined(GEN_TREES_H) || !defined(STDC) + extern uch _length_code[]; + extern uch _dist_code[]; +#else + extern const uch _length_code[]; + extern const uch _dist_code[]; +#endif + +# define _tr_tally_lit(s, c, flush) \ + { uch cc = (c); \ + s->d_buf[s->last_lit] = 0; \ + s->l_buf[s->last_lit++] = cc; \ + s->dyn_ltree[cc].Freq++; \ + flush = (s->last_lit == s->lit_bufsize-1); \ + } +# define _tr_tally_dist(s, distance, length, flush) \ + { uch len = (length); \ + ush dist = (distance); \ + s->d_buf[s->last_lit] = dist; \ + s->l_buf[s->last_lit++] = len; \ + dist--; \ + s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ + s->dyn_dtree[d_code(dist)].Freq++; \ + flush = (s->last_lit == s->lit_bufsize-1); \ + } +#else +# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) +# define _tr_tally_dist(s, distance, length, flush) \ + flush = _tr_tally(s, distance, length) +#endif + +#endif /* DEFLATE_H */ diff --git a/zlib/gzio.c b/zlib/gzio.c new file mode 100644 index 0000000000..83e67c7793 --- /dev/null +++ b/zlib/gzio.c @@ -0,0 +1,1032 @@ +/* gzio.c -- IO on .gz files + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + * + * Compile this file with -DNO_GZCOMPRESS to avoid the compression code. + */ + +/* @(#) $Id$ */ + +#include + +#include "zutil.h" + +#ifdef NO_DEFLATE /* for compatibility with old definition */ +# define NO_GZCOMPRESS +#endif + +#ifndef NO_DUMMY_DECL +struct internal_state {int dummy;}; /* for buggy compilers */ +#endif + +#ifndef Z_BUFSIZE +# ifdef MAXSEG_64K +# define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */ +# else +# define Z_BUFSIZE 16384 +# endif +#endif +#ifndef Z_PRINTF_BUFSIZE +# define Z_PRINTF_BUFSIZE 4096 +#endif + +#ifdef __MVS__ +# pragma map (fdopen , "\174\174FDOPEN") + FILE *fdopen(int, const char *); +#endif + +#ifndef STDC +extern voidp malloc OF((uInt size)); +extern void free OF((voidpf ptr)); +#endif + +#define ALLOC(size) malloc(size) +#define TRYFREE(p) {if (p) free(p);} + +/* there is no errno under Windows CE, provide a dummy one to avoid modifying + too much code in this file */ +#ifdef _WIN32_WCE +static int errno; +#endif + +static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ + +/* gzip flag byte */ +#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ +#define HEAD_CRC 0x02 /* bit 1 set: header CRC present */ +#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ +#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ +#define COMMENT 0x10 /* bit 4 set: file comment present */ +#define RESERVED 0xE0 /* bits 5..7: reserved */ + +typedef struct gz_stream { + z_stream stream; + int z_err; /* error code for last stream operation */ + int z_eof; /* set if end of input file */ + FILE *file; /* .gz file */ + Byte *inbuf; /* input buffer */ + Byte *outbuf; /* output buffer */ + uLong crc; /* crc32 of uncompressed data */ + char *msg; /* error message */ + char *path; /* path name for debugging only */ + int transparent; /* 1 if input file is not a .gz file */ + char mode; /* 'w' or 'r' */ + z_off_t start; /* start of compressed data in file (header skipped) */ + z_off_t in; /* bytes into deflate or inflate */ + z_off_t out; /* bytes out of deflate or inflate */ + int back; /* one character push-back */ + int last; /* true if push-back is last character */ +} gz_stream; + + +local gzFile gz_open OF((const char *path, const char *mode, int fd)); +local int do_flush OF((gzFile file, int flush)); +local int get_byte OF((gz_stream *s)); +local void check_header OF((gz_stream *s)); +local int destroy OF((gz_stream *s)); +local void putLong OF((FILE *file, uLong x)); +local uLong getLong OF((gz_stream *s)); + +/* =========================================================================== + Opens a gzip (.gz) file for reading or writing. The mode parameter + is as in fopen ("rb" or "wb"). The file is given either by file descriptor + or path name (if fd == -1). + gz_open returns NULL if the file could not be opened or if there was + insufficient memory to allocate the (de)compression state; errno + can be checked to distinguish the two cases (if errno is zero, the + zlib error is Z_MEM_ERROR). +*/ +local gzFile gz_open (path, mode, fd) + const char *path; + const char *mode; + int fd; +{ + int err; + int level = Z_DEFAULT_COMPRESSION; /* compression level */ + int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */ + char *p = (char*)mode; + gz_stream *s; + char fmode[80]; /* copy of mode, without the compression level */ + char *m = fmode; + + if (!path || !mode) return Z_NULL; + + s = (gz_stream *)ALLOC(sizeof(gz_stream)); + if (!s) return Z_NULL; + + s->stream.zalloc = (alloc_func)0; + s->stream.zfree = (free_func)0; + s->stream.opaque = (voidpf)0; + s->stream.next_in = s->inbuf = Z_NULL; + s->stream.next_out = s->outbuf = Z_NULL; + s->stream.avail_in = s->stream.avail_out = 0; + s->file = NULL; + s->z_err = Z_OK; + s->z_eof = 0; + s->in = 0; + s->out = 0; + s->back = EOF; + s->crc = crc32(0L, Z_NULL, 0); + s->msg = NULL; + s->transparent = 0; + + s->path = (char*)ALLOC(strlen(path)+1); + if (s->path == NULL) { + return destroy(s), (gzFile)Z_NULL; + } + strcpy(s->path, path); /* do this early for debugging */ + + s->mode = '\0'; + do { + if (*p == 'r') s->mode = 'r'; + if (*p == 'w' || *p == 'a') s->mode = 'w'; + if (*p >= '0' && *p <= '9') { + level = *p - '0'; + } else if (*p == 'f') { + strategy = Z_FILTERED; + } else if (*p == 'h') { + strategy = Z_HUFFMAN_ONLY; + } else if (*p == 'R') { + strategy = Z_RLE; + } else { + *m++ = *p; /* copy the mode */ + } + } while (*p++ && m != fmode + sizeof(fmode)); + if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL; + + if (s->mode == 'w') { +#ifdef NO_GZCOMPRESS + err = Z_STREAM_ERROR; +#else + err = deflateInit2(&(s->stream), level, + Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy); + /* windowBits is passed < 0 to suppress zlib header */ + + s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); +#endif + if (err != Z_OK || s->outbuf == Z_NULL) { + return destroy(s), (gzFile)Z_NULL; + } + } else { + s->stream.next_in = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); + + err = inflateInit2(&(s->stream), -MAX_WBITS); + /* windowBits is passed < 0 to tell that there is no zlib header. + * Note that in this case inflate *requires* an extra "dummy" byte + * after the compressed stream in order to complete decompression and + * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are + * present after the compressed stream. + */ + if (err != Z_OK || s->inbuf == Z_NULL) { + return destroy(s), (gzFile)Z_NULL; + } + } + s->stream.avail_out = Z_BUFSIZE; + + errno = 0; + s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode); + + if (s->file == NULL) { + return destroy(s), (gzFile)Z_NULL; + } + if (s->mode == 'w') { + /* Write a very simple .gz header: + */ + fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1], + Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE); + s->start = 10L; + /* We use 10L instead of ftell(s->file) to because ftell causes an + * fflush on some systems. This version of the library doesn't use + * start anyway in write mode, so this initialization is not + * necessary. + */ + } else { + check_header(s); /* skip the .gz header */ + s->start = ftell(s->file) - s->stream.avail_in; + } + + return (gzFile)s; +} + +/* =========================================================================== + Opens a gzip (.gz) file for reading or writing. +*/ +gzFile ZEXPORT gzopen (path, mode) + const char *path; + const char *mode; +{ + return gz_open (path, mode, -1); +} + +/* =========================================================================== + Associate a gzFile with the file descriptor fd. fd is not dup'ed here + to mimic the behavio(u)r of fdopen. +*/ +gzFile ZEXPORT gzdopen (fd, mode) + int fd; + const char *mode; +{ + char name[46]; /* allow for up to 128-bit integers */ + + if (fd < 0) return (gzFile)Z_NULL; + sprintf(name, "", fd); /* for debugging */ + + return gz_open (name, mode, fd); +} + +/* =========================================================================== + * Update the compression level and strategy + */ +int ZEXPORT gzsetparams (file, level, strategy) + gzFile file; + int level; + int strategy; +{ + gz_stream *s = (gz_stream*)file; + + if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; + + /* Make room to allow flushing */ + if (s->stream.avail_out == 0) { + + s->stream.next_out = s->outbuf; + if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { + s->z_err = Z_ERRNO; + } + s->stream.avail_out = Z_BUFSIZE; + } + + return deflateParams (&(s->stream), level, strategy); +} + +/* =========================================================================== + Read a byte from a gz_stream; update next_in and avail_in. Return EOF + for end of file. + IN assertion: the stream s has been sucessfully opened for reading. +*/ +local int get_byte(s) + gz_stream *s; +{ + if (s->z_eof) return EOF; + if (s->stream.avail_in == 0) { + errno = 0; + s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file); + if (s->stream.avail_in == 0) { + s->z_eof = 1; + if (ferror(s->file)) s->z_err = Z_ERRNO; + return EOF; + } + s->stream.next_in = s->inbuf; + } + s->stream.avail_in--; + return *(s->stream.next_in)++; +} + +/* =========================================================================== + Check the gzip header of a gz_stream opened for reading. Set the stream + mode to transparent if the gzip magic header is not present; set s->err + to Z_DATA_ERROR if the magic header is present but the rest of the header + is incorrect. + IN assertion: the stream s has already been created sucessfully; + s->stream.avail_in is zero for the first time, but may be non-zero + for concatenated .gz files. +*/ +local void check_header(s) + gz_stream *s; +{ + int method; /* method byte */ + int flags; /* flags byte */ + uInt len; + int c; + + /* Assure two bytes in the buffer so we can peek ahead -- handle case + where first byte of header is at the end of the buffer after the last + gzip segment */ + len = s->stream.avail_in; + if (len < 2) { + if (len) s->inbuf[0] = s->stream.next_in[0]; + errno = 0; + len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file); + if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO; + s->stream.avail_in += len; + s->stream.next_in = s->inbuf; + if (s->stream.avail_in < 2) { + s->transparent = s->stream.avail_in; + return; + } + } + + /* Peek ahead to check the gzip magic header */ + if (s->stream.next_in[0] != gz_magic[0] || + s->stream.next_in[1] != gz_magic[1]) { + s->transparent = 1; + return; + } + s->stream.avail_in -= 2; + s->stream.next_in += 2; + + /* Check the rest of the gzip header */ + method = get_byte(s); + flags = get_byte(s); + if (method != Z_DEFLATED || (flags & RESERVED) != 0) { + s->z_err = Z_DATA_ERROR; + return; + } + + /* Discard time, xflags and OS code: */ + for (len = 0; len < 6; len++) (void)get_byte(s); + + if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */ + len = (uInt)get_byte(s); + len += ((uInt)get_byte(s))<<8; + /* len is garbage if EOF but the loop below will quit anyway */ + while (len-- != 0 && get_byte(s) != EOF) ; + } + if ((flags & ORIG_NAME) != 0) { /* skip the original file name */ + while ((c = get_byte(s)) != 0 && c != EOF) ; + } + if ((flags & COMMENT) != 0) { /* skip the .gz file comment */ + while ((c = get_byte(s)) != 0 && c != EOF) ; + } + if ((flags & HEAD_CRC) != 0) { /* skip the header crc */ + for (len = 0; len < 2; len++) (void)get_byte(s); + } + s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK; +} + + /* =========================================================================== + * Cleanup then free the given gz_stream. Return a zlib error code. + Try freeing in the reverse order of allocations. + */ +local int destroy (s) + gz_stream *s; +{ + int err = Z_OK; + + if (!s) return Z_STREAM_ERROR; + + TRYFREE(s->msg); + + if (s->stream.state != NULL) { + if (s->mode == 'w') { +#ifdef NO_GZCOMPRESS + err = Z_STREAM_ERROR; +#else + err = deflateEnd(&(s->stream)); +#endif + } else if (s->mode == 'r') { + err = inflateEnd(&(s->stream)); + } + } + if (s->file != NULL && fclose(s->file)) { +#ifdef ESPIPE + if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */ +#endif + err = Z_ERRNO; + } + if (s->z_err < 0) err = s->z_err; + + TRYFREE(s->inbuf); + TRYFREE(s->outbuf); + TRYFREE(s->path); + TRYFREE(s); + return err; +} + +/* =========================================================================== + Reads the given number of uncompressed bytes from the compressed file. + gzread returns the number of bytes actually read (0 for end of file). +*/ +int ZEXPORT gzread (file, buf, len) + gzFile file; + voidp buf; + unsigned len; +{ + gz_stream *s = (gz_stream*)file; + Bytef *start = (Bytef*)buf; /* starting point for crc computation */ + Byte *next_out; /* == stream.next_out but not forced far (for MSDOS) */ + + if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR; + + if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1; + if (s->z_err == Z_STREAM_END) return 0; /* EOF */ + + next_out = (Byte*)buf; + s->stream.next_out = (Bytef*)buf; + s->stream.avail_out = len; + + if (s->stream.avail_out && s->back != EOF) { + *next_out++ = s->back; + s->stream.next_out++; + s->stream.avail_out--; + s->back = EOF; + s->out++; + start++; + if (s->last) { + s->z_err = Z_STREAM_END; + return 1; + } + } + + while (s->stream.avail_out != 0) { + + if (s->transparent) { + /* Copy first the lookahead bytes: */ + uInt n = s->stream.avail_in; + if (n > s->stream.avail_out) n = s->stream.avail_out; + if (n > 0) { + zmemcpy(s->stream.next_out, s->stream.next_in, n); + next_out += n; + s->stream.next_out = next_out; + s->stream.next_in += n; + s->stream.avail_out -= n; + s->stream.avail_in -= n; + } + if (s->stream.avail_out > 0) { + s->stream.avail_out -= + (uInt)fread(next_out, 1, s->stream.avail_out, s->file); + } + len -= s->stream.avail_out; + s->in += len; + s->out += len; + if (len == 0) s->z_eof = 1; + return (int)len; + } + if (s->stream.avail_in == 0 && !s->z_eof) { + + errno = 0; + s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file); + if (s->stream.avail_in == 0) { + s->z_eof = 1; + if (ferror(s->file)) { + s->z_err = Z_ERRNO; + break; + } + } + s->stream.next_in = s->inbuf; + } + s->in += s->stream.avail_in; + s->out += s->stream.avail_out; + s->z_err = inflate(&(s->stream), Z_NO_FLUSH); + s->in -= s->stream.avail_in; + s->out -= s->stream.avail_out; + + if (s->z_err == Z_STREAM_END) { + /* Check CRC and original size */ + s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); + start = s->stream.next_out; + + if (getLong(s) != s->crc) { + s->z_err = Z_DATA_ERROR; + } else { + (void)getLong(s); + /* The uncompressed length returned by above getlong() may be + * different from s->out in case of concatenated .gz files. + * Check for such files: + */ + check_header(s); + if (s->z_err == Z_OK) { + inflateReset(&(s->stream)); + s->crc = crc32(0L, Z_NULL, 0); + } + } + } + if (s->z_err != Z_OK || s->z_eof) break; + } + s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); + + if (len == s->stream.avail_out && + (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO)) + return -1; + return (int)(len - s->stream.avail_out); +} + + +/* =========================================================================== + Reads one byte from the compressed file. gzgetc returns this byte + or -1 in case of end of file or error. +*/ +int ZEXPORT gzgetc(file) + gzFile file; +{ + unsigned char c; + + return gzread(file, &c, 1) == 1 ? c : -1; +} + + +/* =========================================================================== + Push one byte back onto the stream. +*/ +int ZEXPORT gzungetc(c, file) + int c; + gzFile file; +{ + gz_stream *s = (gz_stream*)file; + + if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF; + s->back = c; + s->out--; + s->last = (s->z_err == Z_STREAM_END); + if (s->last) s->z_err = Z_OK; + s->z_eof = 0; + return c; +} + + +/* =========================================================================== + Reads bytes from the compressed file until len-1 characters are + read, or a newline character is read and transferred to buf, or an + end-of-file condition is encountered. The string is then terminated + with a null character. + gzgets returns buf, or Z_NULL in case of error. + + The current implementation is not optimized at all. +*/ +char * ZEXPORT gzgets(file, buf, len) + gzFile file; + char *buf; + int len; +{ + char *b = buf; + if (buf == Z_NULL || len <= 0) return Z_NULL; + + while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ; + *buf = '\0'; + return b == buf && len > 0 ? Z_NULL : b; +} + + +#ifndef NO_GZCOMPRESS +/* =========================================================================== + Writes the given number of uncompressed bytes into the compressed file. + gzwrite returns the number of bytes actually written (0 in case of error). +*/ +int ZEXPORT gzwrite (file, buf, len) + gzFile file; + voidpc buf; + unsigned len; +{ + gz_stream *s = (gz_stream*)file; + + if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; + + s->stream.next_in = (Bytef*)buf; + s->stream.avail_in = len; + + while (s->stream.avail_in != 0) { + + if (s->stream.avail_out == 0) { + + s->stream.next_out = s->outbuf; + if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { + s->z_err = Z_ERRNO; + break; + } + s->stream.avail_out = Z_BUFSIZE; + } + s->in += s->stream.avail_in; + s->out += s->stream.avail_out; + s->z_err = deflate(&(s->stream), Z_NO_FLUSH); + s->in -= s->stream.avail_in; + s->out -= s->stream.avail_out; + if (s->z_err != Z_OK) break; + } + s->crc = crc32(s->crc, (const Bytef *)buf, len); + + return (int)(len - s->stream.avail_in); +} + + +/* =========================================================================== + Converts, formats, and writes the args to the compressed file under + control of the format string, as in fprintf. gzprintf returns the number of + uncompressed bytes actually written (0 in case of error). +*/ +#ifdef STDC +#include + +int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...) +{ + char buf[Z_PRINTF_BUFSIZE]; + va_list va; + int len; + + buf[sizeof(buf) - 1] = 0; + va_start(va, format); +#ifdef NO_vsnprintf +# ifdef HAS_vsprintf_void + (void)vsprintf(buf, format, va); + va_end(va); + for (len = 0; len < sizeof(buf); len++) + if (buf[len] == 0) break; +# else + len = vsprintf(buf, format, va); + va_end(va); +# endif +#else +# ifdef HAS_vsnprintf_void + (void)vsnprintf(buf, sizeof(buf), format, va); + va_end(va); + len = strlen(buf); +# else + len = vsnprintf(buf, sizeof(buf), format, va); + va_end(va); +# endif +#endif + if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0) + return 0; + return gzwrite(file, buf, (unsigned)len); +} +#else /* not ANSI C */ + +int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, + a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) + gzFile file; + const char *format; + int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, + a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; +{ + char buf[Z_PRINTF_BUFSIZE]; + int len; + + buf[sizeof(buf) - 1] = 0; +#ifdef NO_snprintf +# ifdef HAS_sprintf_void + sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + for (len = 0; len < sizeof(buf); len++) + if (buf[len] == 0) break; +# else + len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); +# endif +#else +# ifdef HAS_snprintf_void + snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + len = strlen(buf); +# else + len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); +# endif +#endif + if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0) + return 0; + return gzwrite(file, buf, len); +} +#endif + +/* =========================================================================== + Writes c, converted to an unsigned char, into the compressed file. + gzputc returns the value that was written, or -1 in case of error. +*/ +int ZEXPORT gzputc(file, c) + gzFile file; + int c; +{ + unsigned char cc = (unsigned char) c; /* required for big endian systems */ + + return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1; +} + + +/* =========================================================================== + Writes the given null-terminated string to the compressed file, excluding + the terminating null character. + gzputs returns the number of characters written, or -1 in case of error. +*/ +int ZEXPORT gzputs(file, s) + gzFile file; + const char *s; +{ + return gzwrite(file, (char*)s, (unsigned)strlen(s)); +} + + +/* =========================================================================== + Flushes all pending output into the compressed file. The parameter + flush is as in the deflate() function. +*/ +local int do_flush (file, flush) + gzFile file; + int flush; +{ + uInt len; + int done = 0; + gz_stream *s = (gz_stream*)file; + + if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; + + s->stream.avail_in = 0; /* should be zero already anyway */ + + for (;;) { + len = Z_BUFSIZE - s->stream.avail_out; + + if (len != 0) { + if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) { + s->z_err = Z_ERRNO; + return Z_ERRNO; + } + s->stream.next_out = s->outbuf; + s->stream.avail_out = Z_BUFSIZE; + } + if (done) break; + s->out += s->stream.avail_out; + s->z_err = deflate(&(s->stream), flush); + s->out -= s->stream.avail_out; + + /* Ignore the second of two consecutive flushes: */ + if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK; + + /* deflate has finished flushing only when it hasn't used up + * all the available space in the output buffer: + */ + done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END); + + if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break; + } + return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; +} + +int ZEXPORT gzflush (file, flush) + gzFile file; + int flush; +{ + gz_stream *s = (gz_stream*)file; + int err = do_flush (file, flush); + + if (err) return err; + fflush(s->file); + return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; +} +#endif /* NO_GZCOMPRESS */ + +/* =========================================================================== + Sets the starting position for the next gzread or gzwrite on the given + compressed file. The offset represents a number of bytes in the + gzseek returns the resulting offset location as measured in bytes from + the beginning of the uncompressed stream, or -1 in case of error. + SEEK_END is not implemented, returns error. + In this version of the library, gzseek can be extremely slow. +*/ +z_off_t ZEXPORT gzseek (file, offset, whence) + gzFile file; + z_off_t offset; + int whence; +{ + gz_stream *s = (gz_stream*)file; + + if (s == NULL || whence == SEEK_END || + s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) { + return -1L; + } + + if (s->mode == 'w') { +#ifdef NO_GZCOMPRESS + return -1L; +#else + if (whence == SEEK_SET) { + offset -= s->in; + } + if (offset < 0) return -1L; + + /* At this point, offset is the number of zero bytes to write. */ + if (s->inbuf == Z_NULL) { + s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */ + if (s->inbuf == Z_NULL) return -1L; + zmemzero(s->inbuf, Z_BUFSIZE); + } + while (offset > 0) { + uInt size = Z_BUFSIZE; + if (offset < Z_BUFSIZE) size = (uInt)offset; + + size = gzwrite(file, s->inbuf, size); + if (size == 0) return -1L; + + offset -= size; + } + return s->in; +#endif + } + /* Rest of function is for reading only */ + + /* compute absolute position */ + if (whence == SEEK_CUR) { + offset += s->out; + } + if (offset < 0) return -1L; + + if (s->transparent) { + /* map to fseek */ + s->back = EOF; + s->stream.avail_in = 0; + s->stream.next_in = s->inbuf; + if (fseek(s->file, offset, SEEK_SET) < 0) return -1L; + + s->in = s->out = offset; + return offset; + } + + /* For a negative seek, rewind and use positive seek */ + if (offset >= s->out) { + offset -= s->out; + } else if (gzrewind(file) < 0) { + return -1L; + } + /* offset is now the number of bytes to skip. */ + + if (offset != 0 && s->outbuf == Z_NULL) { + s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); + if (s->outbuf == Z_NULL) return -1L; + } + if (offset && s->back != EOF) { + s->back = EOF; + s->out++; + offset--; + if (s->last) s->z_err = Z_STREAM_END; + } + while (offset > 0) { + int size = Z_BUFSIZE; + if (offset < Z_BUFSIZE) size = (int)offset; + + size = gzread(file, s->outbuf, (uInt)size); + if (size <= 0) return -1L; + offset -= size; + } + return s->out; +} + +/* =========================================================================== + Rewinds input file. +*/ +int ZEXPORT gzrewind (file) + gzFile file; +{ + gz_stream *s = (gz_stream*)file; + + if (s == NULL || s->mode != 'r') return -1; + + s->z_err = Z_OK; + s->z_eof = 0; + s->back = EOF; + s->stream.avail_in = 0; + s->stream.next_in = s->inbuf; + s->crc = crc32(0L, Z_NULL, 0); + if (!s->transparent) (void)inflateReset(&s->stream); + s->in = 0; + s->out = 0; + return fseek(s->file, s->start, SEEK_SET); +} + +/* =========================================================================== + Returns the starting position for the next gzread or gzwrite on the + given compressed file. This position represents a number of bytes in the + uncompressed data stream. +*/ +z_off_t ZEXPORT gztell (file) + gzFile file; +{ + return gzseek(file, 0L, SEEK_CUR); +} + +/* =========================================================================== + Returns 1 when EOF has previously been detected reading the given + input stream, otherwise zero. +*/ +int ZEXPORT gzeof (file) + gzFile file; +{ + gz_stream *s = (gz_stream*)file; + + /* With concatenated compressed files that can have embedded + * crc trailers, z_eof is no longer the only/best indicator of EOF + * on a gz_stream. Handle end-of-stream error explicitly here. + */ + if (s == NULL || s->mode != 'r') return 0; + if (s->z_eof) return 1; + return s->z_err == Z_STREAM_END; +} + +/* =========================================================================== + Returns 1 if reading and doing so transparently, otherwise zero. +*/ +int ZEXPORT gzdirect (file) + gzFile file; +{ + gz_stream *s = (gz_stream*)file; + + if (s == NULL || s->mode != 'r') return 0; + return s->transparent; +} + +/* =========================================================================== + Outputs a long in LSB order to the given file +*/ +local void putLong (file, x) + FILE *file; + uLong x; +{ + int n; + for (n = 0; n < 4; n++) { + fputc((int)(x & 0xff), file); + x >>= 8; + } +} + +/* =========================================================================== + Reads a long in LSB order from the given gz_stream. Sets z_err in case + of error. +*/ +local uLong getLong (s) + gz_stream *s; +{ + uLong x = (uLong)get_byte(s); + int c; + + x += ((uLong)get_byte(s))<<8; + x += ((uLong)get_byte(s))<<16; + c = get_byte(s); + if (c == EOF) s->z_err = Z_DATA_ERROR; + x += ((uLong)c)<<24; + return x; +} + +/* =========================================================================== + Flushes all pending output if necessary, closes the compressed file + and deallocates all the (de)compression state. +*/ +int ZEXPORT gzclose (file) + gzFile file; +{ + gz_stream *s = (gz_stream*)file; + + if (s == NULL) return Z_STREAM_ERROR; + + if (s->mode == 'w') { +#ifdef NO_GZCOMPRESS + return Z_STREAM_ERROR; +#else + if (do_flush (file, Z_FINISH) != Z_OK) + return destroy((gz_stream*)file); + + putLong (s->file, s->crc); + putLong (s->file, (uLong)(s->in & 0xffffffff)); +#endif + } + return destroy((gz_stream*)file); +} + +#ifdef STDC +# define zstrerror(errnum) strerror(errnum) +#else +# define zstrerror(errnum) "" +#endif + +/* =========================================================================== + Returns the error message for the last error which occurred on the + given compressed file. errnum is set to zlib error number. If an + error occurred in the file system and not in the compression library, + errnum is set to Z_ERRNO and the application may consult errno + to get the exact error code. +*/ +const char * ZEXPORT gzerror (file, errnum) + gzFile file; + int *errnum; +{ + char *m; + gz_stream *s = (gz_stream*)file; + + if (s == NULL) { + *errnum = Z_STREAM_ERROR; + return (const char*)ERR_MSG(Z_STREAM_ERROR); + } + *errnum = s->z_err; + if (*errnum == Z_OK) return (const char*)""; + + m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg); + + if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err); + + TRYFREE(s->msg); + s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3); + if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR); + strcpy(s->msg, s->path); + strcat(s->msg, ": "); + strcat(s->msg, m); + return (const char*)s->msg; +} + +/* =========================================================================== + Clear the error and end-of-file flags, and do the same for the real file. +*/ +void ZEXPORT gzclearerr (file) + gzFile file; +{ + gz_stream *s = (gz_stream*)file; + + if (s == NULL) return; + if (s->z_err != Z_STREAM_END) s->z_err = Z_OK; + s->z_eof = 0; + clearerr(s->file); +} diff --git a/zlib/infback.c b/zlib/infback.c new file mode 100644 index 0000000000..1e03e1bab0 --- /dev/null +++ b/zlib/infback.c @@ -0,0 +1,623 @@ +/* infback.c -- inflate using a call-back interface + * Copyright (C) 1995-2005 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + This code is largely copied from inflate.c. Normally either infback.o or + inflate.o would be linked into an application--not both. The interface + with inffast.c is retained so that optimized assembler-coded versions of + inflate_fast() can be used with either inflate.c or infback.c. + */ + +#include "zutil.h" +#include "inftrees.h" +#include "inflate.h" +#include "inffast.h" + +/* function prototypes */ +local void fixedtables OF((struct inflate_state FAR *state)); + +/* + strm provides memory allocation functions in zalloc and zfree, or + Z_NULL to use the library memory allocation functions. + + windowBits is in the range 8..15, and window is a user-supplied + window and output buffer that is 2**windowBits bytes. + */ +int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) +z_streamp strm; +int windowBits; +unsigned char FAR *window; +const char *version; +int stream_size; +{ + struct inflate_state FAR *state; + + if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || + stream_size != (int)(sizeof(z_stream))) + return Z_VERSION_ERROR; + if (strm == Z_NULL || window == Z_NULL || + windowBits < 8 || windowBits > 15) + return Z_STREAM_ERROR; + strm->msg = Z_NULL; /* in case we return an error */ + if (strm->zalloc == (alloc_func)0) { + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; + } + if (strm->zfree == (free_func)0) strm->zfree = zcfree; + state = (struct inflate_state FAR *)ZALLOC(strm, 1, + sizeof(struct inflate_state)); + if (state == Z_NULL) return Z_MEM_ERROR; + Tracev((stderr, "inflate: allocated\n")); + strm->state = (struct internal_state FAR *)state; + state->dmax = 32768U; + state->wbits = windowBits; + state->wsize = 1U << windowBits; + state->window = window; + state->write = 0; + state->whave = 0; + return Z_OK; +} + +/* + Return state with length and distance decoding tables and index sizes set to + fixed code decoding. Normally this returns fixed tables from inffixed.h. + If BUILDFIXED is defined, then instead this routine builds the tables the + first time it's called, and returns those tables the first time and + thereafter. This reduces the size of the code by about 2K bytes, in + exchange for a little execution time. However, BUILDFIXED should not be + used for threaded applications, since the rewriting of the tables and virgin + may not be thread-safe. + */ +local void fixedtables(state) +struct inflate_state FAR *state; +{ +#ifdef BUILDFIXED + static int virgin = 1; + static code *lenfix, *distfix; + static code fixed[544]; + + /* build fixed huffman tables if first call (may not be thread safe) */ + if (virgin) { + unsigned sym, bits; + static code *next; + + /* literal/length table */ + sym = 0; + while (sym < 144) state->lens[sym++] = 8; + while (sym < 256) state->lens[sym++] = 9; + while (sym < 280) state->lens[sym++] = 7; + while (sym < 288) state->lens[sym++] = 8; + next = fixed; + lenfix = next; + bits = 9; + inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); + + /* distance table */ + sym = 0; + while (sym < 32) state->lens[sym++] = 5; + distfix = next; + bits = 5; + inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); + + /* do this just once */ + virgin = 0; + } +#else /* !BUILDFIXED */ +# include "inffixed.h" +#endif /* BUILDFIXED */ + state->lencode = lenfix; + state->lenbits = 9; + state->distcode = distfix; + state->distbits = 5; +} + +/* Macros for inflateBack(): */ + +/* Load returned state from inflate_fast() */ +#define LOAD() \ + do { \ + put = strm->next_out; \ + left = strm->avail_out; \ + next = strm->next_in; \ + have = strm->avail_in; \ + hold = state->hold; \ + bits = state->bits; \ + } while (0) + +/* Set state from registers for inflate_fast() */ +#define RESTORE() \ + do { \ + strm->next_out = put; \ + strm->avail_out = left; \ + strm->next_in = next; \ + strm->avail_in = have; \ + state->hold = hold; \ + state->bits = bits; \ + } while (0) + +/* Clear the input bit accumulator */ +#define INITBITS() \ + do { \ + hold = 0; \ + bits = 0; \ + } while (0) + +/* Assure that some input is available. If input is requested, but denied, + then return a Z_BUF_ERROR from inflateBack(). */ +#define PULL() \ + do { \ + if (have == 0) { \ + have = in(in_desc, &next); \ + if (have == 0) { \ + next = Z_NULL; \ + ret = Z_BUF_ERROR; \ + goto inf_leave; \ + } \ + } \ + } while (0) + +/* Get a byte of input into the bit accumulator, or return from inflateBack() + with an error if there is no input available. */ +#define PULLBYTE() \ + do { \ + PULL(); \ + have--; \ + hold += (unsigned long)(*next++) << bits; \ + bits += 8; \ + } while (0) + +/* Assure that there are at least n bits in the bit accumulator. If there is + not enough available input to do that, then return from inflateBack() with + an error. */ +#define NEEDBITS(n) \ + do { \ + while (bits < (unsigned)(n)) \ + PULLBYTE(); \ + } while (0) + +/* Return the low n bits of the bit accumulator (n < 16) */ +#define BITS(n) \ + ((unsigned)hold & ((1U << (n)) - 1)) + +/* Remove n bits from the bit accumulator */ +#define DROPBITS(n) \ + do { \ + hold >>= (n); \ + bits -= (unsigned)(n); \ + } while (0) + +/* Remove zero to seven bits as needed to go to a byte boundary */ +#define BYTEBITS() \ + do { \ + hold >>= bits & 7; \ + bits -= bits & 7; \ + } while (0) + +/* Assure that some output space is available, by writing out the window + if it's full. If the write fails, return from inflateBack() with a + Z_BUF_ERROR. */ +#define ROOM() \ + do { \ + if (left == 0) { \ + put = state->window; \ + left = state->wsize; \ + state->whave = left; \ + if (out(out_desc, put, left)) { \ + ret = Z_BUF_ERROR; \ + goto inf_leave; \ + } \ + } \ + } while (0) + +/* + strm provides the memory allocation functions and window buffer on input, + and provides information on the unused input on return. For Z_DATA_ERROR + returns, strm will also provide an error message. + + in() and out() are the call-back input and output functions. When + inflateBack() needs more input, it calls in(). When inflateBack() has + filled the window with output, or when it completes with data in the + window, it calls out() to write out the data. The application must not + change the provided input until in() is called again or inflateBack() + returns. The application must not change the window/output buffer until + inflateBack() returns. + + in() and out() are called with a descriptor parameter provided in the + inflateBack() call. This parameter can be a structure that provides the + information required to do the read or write, as well as accumulated + information on the input and output such as totals and check values. + + in() should return zero on failure. out() should return non-zero on + failure. If either in() or out() fails, than inflateBack() returns a + Z_BUF_ERROR. strm->next_in can be checked for Z_NULL to see whether it + was in() or out() that caused in the error. Otherwise, inflateBack() + returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format + error, or Z_MEM_ERROR if it could not allocate memory for the state. + inflateBack() can also return Z_STREAM_ERROR if the input parameters + are not correct, i.e. strm is Z_NULL or the state was not initialized. + */ +int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) +z_streamp strm; +in_func in; +void FAR *in_desc; +out_func out; +void FAR *out_desc; +{ + struct inflate_state FAR *state; + unsigned char FAR *next; /* next input */ + unsigned char FAR *put; /* next output */ + unsigned have, left; /* available input and output */ + unsigned long hold; /* bit buffer */ + unsigned bits; /* bits in bit buffer */ + unsigned copy; /* number of stored or match bytes to copy */ + unsigned char FAR *from; /* where to copy match bytes from */ + code this; /* current decoding table entry */ + code last; /* parent table entry */ + unsigned len; /* length to copy for repeats, bits to drop */ + int ret; /* return code */ + static const unsigned short order[19] = /* permutation of code lengths */ + {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; + + /* Check that the strm exists and that the state was initialized */ + if (strm == Z_NULL || strm->state == Z_NULL) + return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + + /* Reset the state */ + strm->msg = Z_NULL; + state->mode = TYPE; + state->last = 0; + state->whave = 0; + next = strm->next_in; + have = next != Z_NULL ? strm->avail_in : 0; + hold = 0; + bits = 0; + put = state->window; + left = state->wsize; + + /* Inflate until end of block marked as last */ + for (;;) + switch (state->mode) { + case TYPE: + /* determine and dispatch block type */ + if (state->last) { + BYTEBITS(); + state->mode = DONE; + break; + } + NEEDBITS(3); + state->last = BITS(1); + DROPBITS(1); + switch (BITS(2)) { + case 0: /* stored block */ + Tracev((stderr, "inflate: stored block%s\n", + state->last ? " (last)" : "")); + state->mode = STORED; + break; + case 1: /* fixed block */ + fixedtables(state); + Tracev((stderr, "inflate: fixed codes block%s\n", + state->last ? " (last)" : "")); + state->mode = LEN; /* decode codes */ + break; + case 2: /* dynamic block */ + Tracev((stderr, "inflate: dynamic codes block%s\n", + state->last ? " (last)" : "")); + state->mode = TABLE; + break; + case 3: + strm->msg = (char *)"invalid block type"; + state->mode = BAD; + } + DROPBITS(2); + break; + + case STORED: + /* get and verify stored block length */ + BYTEBITS(); /* go to byte boundary */ + NEEDBITS(32); + if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { + strm->msg = (char *)"invalid stored block lengths"; + state->mode = BAD; + break; + } + state->length = (unsigned)hold & 0xffff; + Tracev((stderr, "inflate: stored length %u\n", + state->length)); + INITBITS(); + + /* copy stored block from input to output */ + while (state->length != 0) { + copy = state->length; + PULL(); + ROOM(); + if (copy > have) copy = have; + if (copy > left) copy = left; + zmemcpy(put, next, copy); + have -= copy; + next += copy; + left -= copy; + put += copy; + state->length -= copy; + } + Tracev((stderr, "inflate: stored end\n")); + state->mode = TYPE; + break; + + case TABLE: + /* get dynamic table entries descriptor */ + NEEDBITS(14); + state->nlen = BITS(5) + 257; + DROPBITS(5); + state->ndist = BITS(5) + 1; + DROPBITS(5); + state->ncode = BITS(4) + 4; + DROPBITS(4); +#ifndef PKZIP_BUG_WORKAROUND + if (state->nlen > 286 || state->ndist > 30) { + strm->msg = (char *)"too many length or distance symbols"; + state->mode = BAD; + break; + } +#endif + Tracev((stderr, "inflate: table sizes ok\n")); + + /* get code length code lengths (not a typo) */ + state->have = 0; + while (state->have < state->ncode) { + NEEDBITS(3); + state->lens[order[state->have++]] = (unsigned short)BITS(3); + DROPBITS(3); + } + while (state->have < 19) + state->lens[order[state->have++]] = 0; + state->next = state->codes; + state->lencode = (code const FAR *)(state->next); + state->lenbits = 7; + ret = inflate_table(CODES, state->lens, 19, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid code lengths set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: code lengths ok\n")); + + /* get length and distance code code lengths */ + state->have = 0; + while (state->have < state->nlen + state->ndist) { + for (;;) { + this = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if (this.val < 16) { + NEEDBITS(this.bits); + DROPBITS(this.bits); + state->lens[state->have++] = this.val; + } + else { + if (this.val == 16) { + NEEDBITS(this.bits + 2); + DROPBITS(this.bits); + if (state->have == 0) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + len = (unsigned)(state->lens[state->have - 1]); + copy = 3 + BITS(2); + DROPBITS(2); + } + else if (this.val == 17) { + NEEDBITS(this.bits + 3); + DROPBITS(this.bits); + len = 0; + copy = 3 + BITS(3); + DROPBITS(3); + } + else { + NEEDBITS(this.bits + 7); + DROPBITS(this.bits); + len = 0; + copy = 11 + BITS(7); + DROPBITS(7); + } + if (state->have + copy > state->nlen + state->ndist) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + while (copy--) + state->lens[state->have++] = (unsigned short)len; + } + } + + /* handle error breaks in while */ + if (state->mode == BAD) break; + + /* build code tables */ + state->next = state->codes; + state->lencode = (code const FAR *)(state->next); + state->lenbits = 9; + ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid literal/lengths set"; + state->mode = BAD; + break; + } + state->distcode = (code const FAR *)(state->next); + state->distbits = 6; + ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, + &(state->next), &(state->distbits), state->work); + if (ret) { + strm->msg = (char *)"invalid distances set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: codes ok\n")); + state->mode = LEN; + + case LEN: + /* use inflate_fast() if we have enough input and output */ + if (have >= 6 && left >= 258) { + RESTORE(); + if (state->whave < state->wsize) + state->whave = state->wsize - left; + inflate_fast(strm, state->wsize); + LOAD(); + break; + } + + /* get a literal, length, or end-of-block code */ + for (;;) { + this = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if (this.op && (this.op & 0xf0) == 0) { + last = this; + for (;;) { + this = state->lencode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + this.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } + DROPBITS(this.bits); + state->length = (unsigned)this.val; + + /* process literal */ + if (this.op == 0) { + Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? + "inflate: literal '%c'\n" : + "inflate: literal 0x%02x\n", this.val)); + ROOM(); + *put++ = (unsigned char)(state->length); + left--; + state->mode = LEN; + break; + } + + /* process end of block */ + if (this.op & 32) { + Tracevv((stderr, "inflate: end of block\n")); + state->mode = TYPE; + break; + } + + /* invalid code */ + if (this.op & 64) { + strm->msg = (char *)"invalid literal/length code"; + state->mode = BAD; + break; + } + + /* length code -- get extra bits, if any */ + state->extra = (unsigned)(this.op) & 15; + if (state->extra != 0) { + NEEDBITS(state->extra); + state->length += BITS(state->extra); + DROPBITS(state->extra); + } + Tracevv((stderr, "inflate: length %u\n", state->length)); + + /* get distance code */ + for (;;) { + this = state->distcode[BITS(state->distbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if ((this.op & 0xf0) == 0) { + last = this; + for (;;) { + this = state->distcode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + this.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } + DROPBITS(this.bits); + if (this.op & 64) { + strm->msg = (char *)"invalid distance code"; + state->mode = BAD; + break; + } + state->offset = (unsigned)this.val; + + /* get distance extra bits, if any */ + state->extra = (unsigned)(this.op) & 15; + if (state->extra != 0) { + NEEDBITS(state->extra); + state->offset += BITS(state->extra); + DROPBITS(state->extra); + } + if (state->offset > state->wsize - (state->whave < state->wsize ? + left : 0)) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } + Tracevv((stderr, "inflate: distance %u\n", state->offset)); + + /* copy match from window to output */ + do { + ROOM(); + copy = state->wsize - state->offset; + if (copy < left) { + from = put + copy; + copy = left - copy; + } + else { + from = put - state->offset; + copy = left; + } + if (copy > state->length) copy = state->length; + state->length -= copy; + left -= copy; + do { + *put++ = *from++; + } while (--copy); + } while (state->length != 0); + break; + + case DONE: + /* inflate stream terminated properly -- write leftover output */ + ret = Z_STREAM_END; + if (left < state->wsize) { + if (out(out_desc, state->window, state->wsize - left)) + ret = Z_BUF_ERROR; + } + goto inf_leave; + + case BAD: + ret = Z_DATA_ERROR; + goto inf_leave; + + default: /* can't happen, but makes compilers happy */ + ret = Z_STREAM_ERROR; + goto inf_leave; + } + + /* Return unused input */ + inf_leave: + strm->next_in = next; + strm->avail_in = have; + return ret; +} + +int ZEXPORT inflateBackEnd(strm) +z_streamp strm; +{ + if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) + return Z_STREAM_ERROR; + ZFREE(strm, strm->state); + strm->state = Z_NULL; + Tracev((stderr, "inflate: end\n")); + return Z_OK; +} diff --git a/zlib/inffast.c b/zlib/inffast.c new file mode 100644 index 0000000000..fa31cad905 --- /dev/null +++ b/zlib/inffast.c @@ -0,0 +1,318 @@ +/* inffast.c -- fast decoding + * Copyright (C) 1995-2004 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "zutil.h" +#include "inftrees.h" +#include "inflate.h" +#include "inffast.h" + +#ifndef ASMINF + +/* Allow machine dependent optimization for post-increment or pre-increment. + Based on testing to date, + Pre-increment preferred for: + - PowerPC G3 (Adler) + - MIPS R5000 (Randers-Pehrson) + Post-increment preferred for: + - none + No measurable difference: + - Pentium III (Anderson) + - M68060 (Nikl) + */ +#ifdef POSTINC +# define OFF 0 +# define PUP(a) *(a)++ +#else +# define OFF 1 +# define PUP(a) *++(a) +#endif + +/* + Decode literal, length, and distance codes and write out the resulting + literal and match bytes until either not enough input or output is + available, an end-of-block is encountered, or a data error is encountered. + When large enough input and output buffers are supplied to inflate(), for + example, a 16K input buffer and a 64K output buffer, more than 95% of the + inflate execution time is spent in this routine. + + Entry assumptions: + + state->mode == LEN + strm->avail_in >= 6 + strm->avail_out >= 258 + start >= strm->avail_out + state->bits < 8 + + On return, state->mode is one of: + + LEN -- ran out of enough output space or enough available input + TYPE -- reached end of block code, inflate() to interpret next block + BAD -- error in block data + + Notes: + + - The maximum input bits used by a length/distance pair is 15 bits for the + length code, 5 bits for the length extra, 15 bits for the distance code, + and 13 bits for the distance extra. This totals 48 bits, or six bytes. + Therefore if strm->avail_in >= 6, then there is enough input to avoid + checking for available input while decoding. + + - The maximum bytes that a single length/distance pair can output is 258 + bytes, which is the maximum length that can be coded. inflate_fast() + requires strm->avail_out >= 258 for each loop to avoid checking for + output space. + */ +void inflate_fast(strm, start) +z_streamp strm; +unsigned start; /* inflate()'s starting value for strm->avail_out */ +{ + struct inflate_state FAR *state; + unsigned char FAR *in; /* local strm->next_in */ + unsigned char FAR *last; /* while in < last, enough input available */ + unsigned char FAR *out; /* local strm->next_out */ + unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ + unsigned char FAR *end; /* while out < end, enough space available */ +#ifdef INFLATE_STRICT + unsigned dmax; /* maximum distance from zlib header */ +#endif + unsigned wsize; /* window size or zero if not using window */ + unsigned whave; /* valid bytes in the window */ + unsigned write; /* window write index */ + unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */ + unsigned long hold; /* local strm->hold */ + unsigned bits; /* local strm->bits */ + code const FAR *lcode; /* local strm->lencode */ + code const FAR *dcode; /* local strm->distcode */ + unsigned lmask; /* mask for first level of length codes */ + unsigned dmask; /* mask for first level of distance codes */ + code this; /* retrieved table entry */ + unsigned op; /* code bits, operation, extra bits, or */ + /* window position, window bytes to copy */ + unsigned len; /* match length, unused bytes */ + unsigned dist; /* match distance */ + unsigned char FAR *from; /* where to copy match from */ + + /* copy state to local variables */ + state = (struct inflate_state FAR *)strm->state; + in = strm->next_in - OFF; + last = in + (strm->avail_in - 5); + out = strm->next_out - OFF; + beg = out - (start - strm->avail_out); + end = out + (strm->avail_out - 257); +#ifdef INFLATE_STRICT + dmax = state->dmax; +#endif + wsize = state->wsize; + whave = state->whave; + write = state->write; + window = state->window; + hold = state->hold; + bits = state->bits; + lcode = state->lencode; + dcode = state->distcode; + lmask = (1U << state->lenbits) - 1; + dmask = (1U << state->distbits) - 1; + + /* decode literals and length/distances until end-of-block or not enough + input data or output space */ + do { + if (bits < 15) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + this = lcode[hold & lmask]; + dolen: + op = (unsigned)(this.bits); + hold >>= op; + bits -= op; + op = (unsigned)(this.op); + if (op == 0) { /* literal */ + Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? + "inflate: literal '%c'\n" : + "inflate: literal 0x%02x\n", this.val)); + PUP(out) = (unsigned char)(this.val); + } + else if (op & 16) { /* length base */ + len = (unsigned)(this.val); + op &= 15; /* number of extra bits */ + if (op) { + if (bits < op) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + len += (unsigned)hold & ((1U << op) - 1); + hold >>= op; + bits -= op; + } + Tracevv((stderr, "inflate: length %u\n", len)); + if (bits < 15) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + this = dcode[hold & dmask]; + dodist: + op = (unsigned)(this.bits); + hold >>= op; + bits -= op; + op = (unsigned)(this.op); + if (op & 16) { /* distance base */ + dist = (unsigned)(this.val); + op &= 15; /* number of extra bits */ + if (bits < op) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + if (bits < op) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + } + dist += (unsigned)hold & ((1U << op) - 1); +#ifdef INFLATE_STRICT + if (dist > dmax) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } +#endif + hold >>= op; + bits -= op; + Tracevv((stderr, "inflate: distance %u\n", dist)); + op = (unsigned)(out - beg); /* max distance in output */ + if (dist > op) { /* see if copy from window */ + op = dist - op; /* distance back in window */ + if (op > whave) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } + from = window - OFF; + if (write == 0) { /* very common case */ + from += wsize - op; + if (op < len) { /* some from window */ + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = out - dist; /* rest from output */ + } + } + else if (write < op) { /* wrap around window */ + from += wsize + write - op; + op -= write; + if (op < len) { /* some from end of window */ + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = window - OFF; + if (write < len) { /* some from start of window */ + op = write; + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = out - dist; /* rest from output */ + } + } + } + else { /* contiguous in window */ + from += write - op; + if (op < len) { /* some from window */ + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = out - dist; /* rest from output */ + } + } + while (len > 2) { + PUP(out) = PUP(from); + PUP(out) = PUP(from); + PUP(out) = PUP(from); + len -= 3; + } + if (len) { + PUP(out) = PUP(from); + if (len > 1) + PUP(out) = PUP(from); + } + } + else { + from = out - dist; /* copy direct from output */ + do { /* minimum length is three */ + PUP(out) = PUP(from); + PUP(out) = PUP(from); + PUP(out) = PUP(from); + len -= 3; + } while (len > 2); + if (len) { + PUP(out) = PUP(from); + if (len > 1) + PUP(out) = PUP(from); + } + } + } + else if ((op & 64) == 0) { /* 2nd level distance code */ + this = dcode[this.val + (hold & ((1U << op) - 1))]; + goto dodist; + } + else { + strm->msg = (char *)"invalid distance code"; + state->mode = BAD; + break; + } + } + else if ((op & 64) == 0) { /* 2nd level length code */ + this = lcode[this.val + (hold & ((1U << op) - 1))]; + goto dolen; + } + else if (op & 32) { /* end-of-block */ + Tracevv((stderr, "inflate: end of block\n")); + state->mode = TYPE; + break; + } + else { + strm->msg = (char *)"invalid literal/length code"; + state->mode = BAD; + break; + } + } while (in < last && out < end); + + /* return unused bytes (on entry, bits < 8, so in won't go too far back) */ + len = bits >> 3; + in -= len; + bits -= len << 3; + hold &= (1U << bits) - 1; + + /* update state and return */ + strm->next_in = in + OFF; + strm->next_out = out + OFF; + strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last)); + strm->avail_out = (unsigned)(out < end ? + 257 + (end - out) : 257 - (out - end)); + state->hold = hold; + state->bits = bits; + return; +} + +/* + inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe): + - Using bit fields for code structure + - Different op definition to avoid & for extra bits (do & for table bits) + - Three separate decoding do-loops for direct, window, and write == 0 + - Special case for distance > 1 copies to do overlapped load and store copy + - Explicit branch predictions (based on measured branch probabilities) + - Deferring match copy and interspersed it with decoding subsequent codes + - Swapping literal/length else + - Swapping window/direct else + - Larger unrolled copy loops (three is about right) + - Moving len -= 3 statement into middle of loop + */ + +#endif /* !ASMINF */ diff --git a/zlib/inffast.h b/zlib/inffast.h new file mode 100644 index 0000000000..614fa7877d --- /dev/null +++ b/zlib/inffast.h @@ -0,0 +1,11 @@ +/* inffast.h -- header to use inffast.c + * Copyright (C) 1995-2003 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +void inflate_fast OF((z_streamp strm, unsigned start)); diff --git a/zlib/inffixed.h b/zlib/inffixed.h new file mode 100644 index 0000000000..423d5c5b50 --- /dev/null +++ b/zlib/inffixed.h @@ -0,0 +1,94 @@ + /* inffixed.h -- table for decoding fixed codes + * Generated automatically by makefixed(). + */ + + /* WARNING: this file should *not* be used by applications. It + is part of the implementation of the compression library and + is subject to change. Applications should only use zlib.h. + */ + + static const code lenfix[512] = { + {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48}, + {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128}, + {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59}, + {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176}, + {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20}, + {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100}, + {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8}, + {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216}, + {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76}, + {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114}, + {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2}, + {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148}, + {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42}, + {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86}, + {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15}, + {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236}, + {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62}, + {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142}, + {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31}, + {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162}, + {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25}, + {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105}, + {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4}, + {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202}, + {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69}, + {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125}, + {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13}, + {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195}, + {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35}, + {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91}, + {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19}, + {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246}, + {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55}, + {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135}, + {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99}, + {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190}, + {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16}, + {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96}, + {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6}, + {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209}, + {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72}, + {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116}, + {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4}, + {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153}, + {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44}, + {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82}, + {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11}, + {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229}, + {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58}, + {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138}, + {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51}, + {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173}, + {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30}, + {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110}, + {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0}, + {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195}, + {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65}, + {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121}, + {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9}, + {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258}, + {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37}, + {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93}, + {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23}, + {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251}, + {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51}, + {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131}, + {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67}, + {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183}, + {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23}, + {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103}, + {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9}, + {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223}, + {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79}, + {0,9,255} + }; + + static const code distfix[32] = { + {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025}, + {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193}, + {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385}, + {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577}, + {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073}, + {22,5,193},{64,5,0} + }; diff --git a/zlib/inflate.c b/zlib/inflate.c new file mode 100644 index 0000000000..33ea902928 --- /dev/null +++ b/zlib/inflate.c @@ -0,0 +1,1368 @@ +/* inflate.c -- zlib decompression + * Copyright (C) 1995-2005 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + * Change history: + * + * 1.2.beta0 24 Nov 2002 + * - First version -- complete rewrite of inflate to simplify code, avoid + * creation of window when not needed, minimize use of window when it is + * needed, make inffast.c even faster, implement gzip decoding, and to + * improve code readability and style over the previous zlib inflate code + * + * 1.2.beta1 25 Nov 2002 + * - Use pointers for available input and output checking in inffast.c + * - Remove input and output counters in inffast.c + * - Change inffast.c entry and loop from avail_in >= 7 to >= 6 + * - Remove unnecessary second byte pull from length extra in inffast.c + * - Unroll direct copy to three copies per loop in inffast.c + * + * 1.2.beta2 4 Dec 2002 + * - Change external routine names to reduce potential conflicts + * - Correct filename to inffixed.h for fixed tables in inflate.c + * - Make hbuf[] unsigned char to match parameter type in inflate.c + * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset) + * to avoid negation problem on Alphas (64 bit) in inflate.c + * + * 1.2.beta3 22 Dec 2002 + * - Add comments on state->bits assertion in inffast.c + * - Add comments on op field in inftrees.h + * - Fix bug in reuse of allocated window after inflateReset() + * - Remove bit fields--back to byte structure for speed + * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths + * - Change post-increments to pre-increments in inflate_fast(), PPC biased? + * - Add compile time option, POSTINC, to use post-increments instead (Intel?) + * - Make MATCH copy in inflate() much faster for when inflate_fast() not used + * - Use local copies of stream next and avail values, as well as local bit + * buffer and bit count in inflate()--for speed when inflate_fast() not used + * + * 1.2.beta4 1 Jan 2003 + * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings + * - Move a comment on output buffer sizes from inffast.c to inflate.c + * - Add comments in inffast.c to introduce the inflate_fast() routine + * - Rearrange window copies in inflate_fast() for speed and simplification + * - Unroll last copy for window match in inflate_fast() + * - Use local copies of window variables in inflate_fast() for speed + * - Pull out common write == 0 case for speed in inflate_fast() + * - Make op and len in inflate_fast() unsigned for consistency + * - Add FAR to lcode and dcode declarations in inflate_fast() + * - Simplified bad distance check in inflate_fast() + * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new + * source file infback.c to provide a call-back interface to inflate for + * programs like gzip and unzip -- uses window as output buffer to avoid + * window copying + * + * 1.2.beta5 1 Jan 2003 + * - Improved inflateBack() interface to allow the caller to provide initial + * input in strm. + * - Fixed stored blocks bug in inflateBack() + * + * 1.2.beta6 4 Jan 2003 + * - Added comments in inffast.c on effectiveness of POSTINC + * - Typecasting all around to reduce compiler warnings + * - Changed loops from while (1) or do {} while (1) to for (;;), again to + * make compilers happy + * - Changed type of window in inflateBackInit() to unsigned char * + * + * 1.2.beta7 27 Jan 2003 + * - Changed many types to unsigned or unsigned short to avoid warnings + * - Added inflateCopy() function + * + * 1.2.0 9 Mar 2003 + * - Changed inflateBack() interface to provide separate opaque descriptors + * for the in() and out() functions + * - Changed inflateBack() argument and in_func typedef to swap the length + * and buffer address return values for the input function + * - Check next_in and next_out for Z_NULL on entry to inflate() + * + * The history for versions after 1.2.0 are in ChangeLog in zlib distribution. + */ + +#include "zutil.h" +#include "inftrees.h" +#include "inflate.h" +#include "inffast.h" + +#ifdef MAKEFIXED +# ifndef BUILDFIXED +# define BUILDFIXED +# endif +#endif + +/* function prototypes */ +local void fixedtables OF((struct inflate_state FAR *state)); +local int updatewindow OF((z_streamp strm, unsigned out)); +#ifdef BUILDFIXED + void makefixed OF((void)); +#endif +local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf, + unsigned len)); + +int ZEXPORT inflateReset(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + strm->total_in = strm->total_out = state->total = 0; + strm->msg = Z_NULL; + strm->adler = 1; /* to support ill-conceived Java test suite */ + state->mode = HEAD; + state->last = 0; + state->havedict = 0; + state->dmax = 32768U; + state->head = Z_NULL; + state->wsize = 0; + state->whave = 0; + state->write = 0; + state->hold = 0; + state->bits = 0; + state->lencode = state->distcode = state->next = state->codes; + Tracev((stderr, "inflate: reset\n")); + return Z_OK; +} + +int ZEXPORT inflatePrime(strm, bits, value) +z_streamp strm; +int bits; +int value; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR; + value &= (1L << bits) - 1; + state->hold += value << state->bits; + state->bits += bits; + return Z_OK; +} + +int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) +z_streamp strm; +int windowBits; +const char *version; +int stream_size; +{ + struct inflate_state FAR *state; + + if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || + stream_size != (int)(sizeof(z_stream))) + return Z_VERSION_ERROR; + if (strm == Z_NULL) return Z_STREAM_ERROR; + strm->msg = Z_NULL; /* in case we return an error */ + if (strm->zalloc == (alloc_func)0) { + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; + } + if (strm->zfree == (free_func)0) strm->zfree = zcfree; + state = (struct inflate_state FAR *) + ZALLOC(strm, 1, sizeof(struct inflate_state)); + if (state == Z_NULL) return Z_MEM_ERROR; + Tracev((stderr, "inflate: allocated\n")); + strm->state = (struct internal_state FAR *)state; + if (windowBits < 0) { + state->wrap = 0; + windowBits = -windowBits; + } + else { + state->wrap = (windowBits >> 4) + 1; +#ifdef GUNZIP + if (windowBits < 48) windowBits &= 15; +#endif + } + if (windowBits < 8 || windowBits > 15) { + ZFREE(strm, state); + strm->state = Z_NULL; + return Z_STREAM_ERROR; + } + state->wbits = (unsigned)windowBits; + state->window = Z_NULL; + return inflateReset(strm); +} + +int ZEXPORT inflateInit_(strm, version, stream_size) +z_streamp strm; +const char *version; +int stream_size; +{ + return inflateInit2_(strm, DEF_WBITS, version, stream_size); +} + +/* + Return state with length and distance decoding tables and index sizes set to + fixed code decoding. Normally this returns fixed tables from inffixed.h. + If BUILDFIXED is defined, then instead this routine builds the tables the + first time it's called, and returns those tables the first time and + thereafter. This reduces the size of the code by about 2K bytes, in + exchange for a little execution time. However, BUILDFIXED should not be + used for threaded applications, since the rewriting of the tables and virgin + may not be thread-safe. + */ +local void fixedtables(state) +struct inflate_state FAR *state; +{ +#ifdef BUILDFIXED + static int virgin = 1; + static code *lenfix, *distfix; + static code fixed[544]; + + /* build fixed huffman tables if first call (may not be thread safe) */ + if (virgin) { + unsigned sym, bits; + static code *next; + + /* literal/length table */ + sym = 0; + while (sym < 144) state->lens[sym++] = 8; + while (sym < 256) state->lens[sym++] = 9; + while (sym < 280) state->lens[sym++] = 7; + while (sym < 288) state->lens[sym++] = 8; + next = fixed; + lenfix = next; + bits = 9; + inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); + + /* distance table */ + sym = 0; + while (sym < 32) state->lens[sym++] = 5; + distfix = next; + bits = 5; + inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); + + /* do this just once */ + virgin = 0; + } +#else /* !BUILDFIXED */ +# include "inffixed.h" +#endif /* BUILDFIXED */ + state->lencode = lenfix; + state->lenbits = 9; + state->distcode = distfix; + state->distbits = 5; +} + +#ifdef MAKEFIXED +#include + +/* + Write out the inffixed.h that is #include'd above. Defining MAKEFIXED also + defines BUILDFIXED, so the tables are built on the fly. makefixed() writes + those tables to stdout, which would be piped to inffixed.h. A small program + can simply call makefixed to do this: + + void makefixed(void); + + int main(void) + { + makefixed(); + return 0; + } + + Then that can be linked with zlib built with MAKEFIXED defined and run: + + a.out > inffixed.h + */ +void makefixed() +{ + unsigned low, size; + struct inflate_state state; + + fixedtables(&state); + puts(" /* inffixed.h -- table for decoding fixed codes"); + puts(" * Generated automatically by makefixed()."); + puts(" */"); + puts(""); + puts(" /* WARNING: this file should *not* be used by applications."); + puts(" It is part of the implementation of this library and is"); + puts(" subject to change. Applications should only use zlib.h."); + puts(" */"); + puts(""); + size = 1U << 9; + printf(" static const code lenfix[%u] = {", size); + low = 0; + for (;;) { + if ((low % 7) == 0) printf("\n "); + printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits, + state.lencode[low].val); + if (++low == size) break; + putchar(','); + } + puts("\n };"); + size = 1U << 5; + printf("\n static const code distfix[%u] = {", size); + low = 0; + for (;;) { + if ((low % 6) == 0) printf("\n "); + printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits, + state.distcode[low].val); + if (++low == size) break; + putchar(','); + } + puts("\n };"); +} +#endif /* MAKEFIXED */ + +/* + Update the window with the last wsize (normally 32K) bytes written before + returning. If window does not exist yet, create it. This is only called + when a window is already in use, or when output has been written during this + inflate call, but the end of the deflate stream has not been reached yet. + It is also called to create a window for dictionary data when a dictionary + is loaded. + + Providing output buffers larger than 32K to inflate() should provide a speed + advantage, since only the last 32K of output is copied to the sliding window + upon return from inflate(), and since all distances after the first 32K of + output will fall in the output data, making match copies simpler and faster. + The advantage may be dependent on the size of the processor's data caches. + */ +local int updatewindow(strm, out) +z_streamp strm; +unsigned out; +{ + struct inflate_state FAR *state; + unsigned copy, dist; + + state = (struct inflate_state FAR *)strm->state; + + /* if it hasn't been done already, allocate space for the window */ + if (state->window == Z_NULL) { + state->window = (unsigned char FAR *) + ZALLOC(strm, 1U << state->wbits, + sizeof(unsigned char)); + if (state->window == Z_NULL) return 1; + } + + /* if window not in use yet, initialize */ + if (state->wsize == 0) { + state->wsize = 1U << state->wbits; + state->write = 0; + state->whave = 0; + } + + /* copy state->wsize or less output bytes into the circular window */ + copy = out - strm->avail_out; + if (copy >= state->wsize) { + zmemcpy(state->window, strm->next_out - state->wsize, state->wsize); + state->write = 0; + state->whave = state->wsize; + } + else { + dist = state->wsize - state->write; + if (dist > copy) dist = copy; + zmemcpy(state->window + state->write, strm->next_out - copy, dist); + copy -= dist; + if (copy) { + zmemcpy(state->window, strm->next_out - copy, copy); + state->write = copy; + state->whave = state->wsize; + } + else { + state->write += dist; + if (state->write == state->wsize) state->write = 0; + if (state->whave < state->wsize) state->whave += dist; + } + } + return 0; +} + +/* Macros for inflate(): */ + +/* check function to use adler32() for zlib or crc32() for gzip */ +#ifdef GUNZIP +# define UPDATE(check, buf, len) \ + (state->flags ? crc32(check, buf, len) : adler32(check, buf, len)) +#else +# define UPDATE(check, buf, len) adler32(check, buf, len) +#endif + +/* check macros for header crc */ +#ifdef GUNZIP +# define CRC2(check, word) \ + do { \ + hbuf[0] = (unsigned char)(word); \ + hbuf[1] = (unsigned char)((word) >> 8); \ + check = crc32(check, hbuf, 2); \ + } while (0) + +# define CRC4(check, word) \ + do { \ + hbuf[0] = (unsigned char)(word); \ + hbuf[1] = (unsigned char)((word) >> 8); \ + hbuf[2] = (unsigned char)((word) >> 16); \ + hbuf[3] = (unsigned char)((word) >> 24); \ + check = crc32(check, hbuf, 4); \ + } while (0) +#endif + +/* Load registers with state in inflate() for speed */ +#define LOAD() \ + do { \ + put = strm->next_out; \ + left = strm->avail_out; \ + next = strm->next_in; \ + have = strm->avail_in; \ + hold = state->hold; \ + bits = state->bits; \ + } while (0) + +/* Restore state from registers in inflate() */ +#define RESTORE() \ + do { \ + strm->next_out = put; \ + strm->avail_out = left; \ + strm->next_in = next; \ + strm->avail_in = have; \ + state->hold = hold; \ + state->bits = bits; \ + } while (0) + +/* Clear the input bit accumulator */ +#define INITBITS() \ + do { \ + hold = 0; \ + bits = 0; \ + } while (0) + +/* Get a byte of input into the bit accumulator, or return from inflate() + if there is no input available. */ +#define PULLBYTE() \ + do { \ + if (have == 0) goto inf_leave; \ + have--; \ + hold += (unsigned long)(*next++) << bits; \ + bits += 8; \ + } while (0) + +/* Assure that there are at least n bits in the bit accumulator. If there is + not enough available input to do that, then return from inflate(). */ +#define NEEDBITS(n) \ + do { \ + while (bits < (unsigned)(n)) \ + PULLBYTE(); \ + } while (0) + +/* Return the low n bits of the bit accumulator (n < 16) */ +#define BITS(n) \ + ((unsigned)hold & ((1U << (n)) - 1)) + +/* Remove n bits from the bit accumulator */ +#define DROPBITS(n) \ + do { \ + hold >>= (n); \ + bits -= (unsigned)(n); \ + } while (0) + +/* Remove zero to seven bits as needed to go to a byte boundary */ +#define BYTEBITS() \ + do { \ + hold >>= bits & 7; \ + bits -= bits & 7; \ + } while (0) + +/* Reverse the bytes in a 32-bit value */ +#define REVERSE(q) \ + ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \ + (((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) + +/* + inflate() uses a state machine to process as much input data and generate as + much output data as possible before returning. The state machine is + structured roughly as follows: + + for (;;) switch (state) { + ... + case STATEn: + if (not enough input data or output space to make progress) + return; + ... make progress ... + state = STATEm; + break; + ... + } + + so when inflate() is called again, the same case is attempted again, and + if the appropriate resources are provided, the machine proceeds to the + next state. The NEEDBITS() macro is usually the way the state evaluates + whether it can proceed or should return. NEEDBITS() does the return if + the requested bits are not available. The typical use of the BITS macros + is: + + NEEDBITS(n); + ... do something with BITS(n) ... + DROPBITS(n); + + where NEEDBITS(n) either returns from inflate() if there isn't enough + input left to load n bits into the accumulator, or it continues. BITS(n) + gives the low n bits in the accumulator. When done, DROPBITS(n) drops + the low n bits off the accumulator. INITBITS() clears the accumulator + and sets the number of available bits to zero. BYTEBITS() discards just + enough bits to put the accumulator on a byte boundary. After BYTEBITS() + and a NEEDBITS(8), then BITS(8) would return the next byte in the stream. + + NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return + if there is no input available. The decoding of variable length codes uses + PULLBYTE() directly in order to pull just enough bytes to decode the next + code, and no more. + + Some states loop until they get enough input, making sure that enough + state information is maintained to continue the loop where it left off + if NEEDBITS() returns in the loop. For example, want, need, and keep + would all have to actually be part of the saved state in case NEEDBITS() + returns: + + case STATEw: + while (want < need) { + NEEDBITS(n); + keep[want++] = BITS(n); + DROPBITS(n); + } + state = STATEx; + case STATEx: + + As shown above, if the next state is also the next case, then the break + is omitted. + + A state may also return if there is not enough output space available to + complete that state. Those states are copying stored data, writing a + literal byte, and copying a matching string. + + When returning, a "goto inf_leave" is used to update the total counters, + update the check value, and determine whether any progress has been made + during that inflate() call in order to return the proper return code. + Progress is defined as a change in either strm->avail_in or strm->avail_out. + When there is a window, goto inf_leave will update the window with the last + output written. If a goto inf_leave occurs in the middle of decompression + and there is no window currently, goto inf_leave will create one and copy + output to the window for the next call of inflate(). + + In this implementation, the flush parameter of inflate() only affects the + return code (per zlib.h). inflate() always writes as much as possible to + strm->next_out, given the space available and the provided input--the effect + documented in zlib.h of Z_SYNC_FLUSH. Furthermore, inflate() always defers + the allocation of and copying into a sliding window until necessary, which + provides the effect documented in zlib.h for Z_FINISH when the entire input + stream available. So the only thing the flush parameter actually does is: + when flush is set to Z_FINISH, inflate() cannot return Z_OK. Instead it + will return Z_BUF_ERROR if it has not reached the end of the stream. + */ + +int ZEXPORT inflate(strm, flush) +z_streamp strm; +int flush; +{ + struct inflate_state FAR *state; + unsigned char FAR *next; /* next input */ + unsigned char FAR *put; /* next output */ + unsigned have, left; /* available input and output */ + unsigned long hold; /* bit buffer */ + unsigned bits; /* bits in bit buffer */ + unsigned in, out; /* save starting available input and output */ + unsigned copy; /* number of stored or match bytes to copy */ + unsigned char FAR *from; /* where to copy match bytes from */ + code this; /* current decoding table entry */ + code last; /* parent table entry */ + unsigned len; /* length to copy for repeats, bits to drop */ + int ret; /* return code */ +#ifdef GUNZIP + unsigned char hbuf[4]; /* buffer for gzip header crc calculation */ +#endif + static const unsigned short order[19] = /* permutation of code lengths */ + {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; + + if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL || + (strm->next_in == Z_NULL && strm->avail_in != 0)) + return Z_STREAM_ERROR; + + state = (struct inflate_state FAR *)strm->state; + if (state->mode == TYPE) state->mode = TYPEDO; /* skip check */ + LOAD(); + in = have; + out = left; + ret = Z_OK; + for (;;) + switch (state->mode) { + case HEAD: + if (state->wrap == 0) { + state->mode = TYPEDO; + break; + } + NEEDBITS(16); +#ifdef GUNZIP + if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */ + state->check = crc32(0L, Z_NULL, 0); + CRC2(state->check, hold); + INITBITS(); + state->mode = FLAGS; + break; + } + state->flags = 0; /* expect zlib header */ + if (state->head != Z_NULL) + state->head->done = -1; + if (!(state->wrap & 1) || /* check if zlib header allowed */ +#else + if ( +#endif + ((BITS(8) << 8) + (hold >> 8)) % 31) { + strm->msg = (char *)"incorrect header check"; + state->mode = BAD; + break; + } + if (BITS(4) != Z_DEFLATED) { + strm->msg = (char *)"unknown compression method"; + state->mode = BAD; + break; + } + DROPBITS(4); + len = BITS(4) + 8; + if (len > state->wbits) { + strm->msg = (char *)"invalid window size"; + state->mode = BAD; + break; + } + state->dmax = 1U << len; + Tracev((stderr, "inflate: zlib header ok\n")); + strm->adler = state->check = adler32(0L, Z_NULL, 0); + state->mode = hold & 0x200 ? DICTID : TYPE; + INITBITS(); + break; +#ifdef GUNZIP + case FLAGS: + NEEDBITS(16); + state->flags = (int)(hold); + if ((state->flags & 0xff) != Z_DEFLATED) { + strm->msg = (char *)"unknown compression method"; + state->mode = BAD; + break; + } + if (state->flags & 0xe000) { + strm->msg = (char *)"unknown header flags set"; + state->mode = BAD; + break; + } + if (state->head != Z_NULL) + state->head->text = (int)((hold >> 8) & 1); + if (state->flags & 0x0200) CRC2(state->check, hold); + INITBITS(); + state->mode = TIME; + case TIME: + NEEDBITS(32); + if (state->head != Z_NULL) + state->head->time = hold; + if (state->flags & 0x0200) CRC4(state->check, hold); + INITBITS(); + state->mode = OS; + case OS: + NEEDBITS(16); + if (state->head != Z_NULL) { + state->head->xflags = (int)(hold & 0xff); + state->head->os = (int)(hold >> 8); + } + if (state->flags & 0x0200) CRC2(state->check, hold); + INITBITS(); + state->mode = EXLEN; + case EXLEN: + if (state->flags & 0x0400) { + NEEDBITS(16); + state->length = (unsigned)(hold); + if (state->head != Z_NULL) + state->head->extra_len = (unsigned)hold; + if (state->flags & 0x0200) CRC2(state->check, hold); + INITBITS(); + } + else if (state->head != Z_NULL) + state->head->extra = Z_NULL; + state->mode = EXTRA; + case EXTRA: + if (state->flags & 0x0400) { + copy = state->length; + if (copy > have) copy = have; + if (copy) { + if (state->head != Z_NULL && + state->head->extra != Z_NULL) { + len = state->head->extra_len - state->length; + zmemcpy(state->head->extra + len, next, + len + copy > state->head->extra_max ? + state->head->extra_max - len : copy); + } + if (state->flags & 0x0200) + state->check = crc32(state->check, next, copy); + have -= copy; + next += copy; + state->length -= copy; + } + if (state->length) goto inf_leave; + } + state->length = 0; + state->mode = NAME; + case NAME: + if (state->flags & 0x0800) { + if (have == 0) goto inf_leave; + copy = 0; + do { + len = (unsigned)(next[copy++]); + if (state->head != Z_NULL && + state->head->name != Z_NULL && + state->length < state->head->name_max) + state->head->name[state->length++] = len; + } while (len && copy < have); + if (state->flags & 0x0200) + state->check = crc32(state->check, next, copy); + have -= copy; + next += copy; + if (len) goto inf_leave; + } + else if (state->head != Z_NULL) + state->head->name = Z_NULL; + state->length = 0; + state->mode = COMMENT; + case COMMENT: + if (state->flags & 0x1000) { + if (have == 0) goto inf_leave; + copy = 0; + do { + len = (unsigned)(next[copy++]); + if (state->head != Z_NULL && + state->head->comment != Z_NULL && + state->length < state->head->comm_max) + state->head->comment[state->length++] = len; + } while (len && copy < have); + if (state->flags & 0x0200) + state->check = crc32(state->check, next, copy); + have -= copy; + next += copy; + if (len) goto inf_leave; + } + else if (state->head != Z_NULL) + state->head->comment = Z_NULL; + state->mode = HCRC; + case HCRC: + if (state->flags & 0x0200) { + NEEDBITS(16); + if (hold != (state->check & 0xffff)) { + strm->msg = (char *)"header crc mismatch"; + state->mode = BAD; + break; + } + INITBITS(); + } + if (state->head != Z_NULL) { + state->head->hcrc = (int)((state->flags >> 9) & 1); + state->head->done = 1; + } + strm->adler = state->check = crc32(0L, Z_NULL, 0); + state->mode = TYPE; + break; +#endif + case DICTID: + NEEDBITS(32); + strm->adler = state->check = REVERSE(hold); + INITBITS(); + state->mode = DICT; + case DICT: + if (state->havedict == 0) { + RESTORE(); + return Z_NEED_DICT; + } + strm->adler = state->check = adler32(0L, Z_NULL, 0); + state->mode = TYPE; + case TYPE: + if (flush == Z_BLOCK) goto inf_leave; + case TYPEDO: + if (state->last) { + BYTEBITS(); + state->mode = CHECK; + break; + } + NEEDBITS(3); + state->last = BITS(1); + DROPBITS(1); + switch (BITS(2)) { + case 0: /* stored block */ + Tracev((stderr, "inflate: stored block%s\n", + state->last ? " (last)" : "")); + state->mode = STORED; + break; + case 1: /* fixed block */ + fixedtables(state); + Tracev((stderr, "inflate: fixed codes block%s\n", + state->last ? " (last)" : "")); + state->mode = LEN; /* decode codes */ + break; + case 2: /* dynamic block */ + Tracev((stderr, "inflate: dynamic codes block%s\n", + state->last ? " (last)" : "")); + state->mode = TABLE; + break; + case 3: + strm->msg = (char *)"invalid block type"; + state->mode = BAD; + } + DROPBITS(2); + break; + case STORED: + BYTEBITS(); /* go to byte boundary */ + NEEDBITS(32); + if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { + strm->msg = (char *)"invalid stored block lengths"; + state->mode = BAD; + break; + } + state->length = (unsigned)hold & 0xffff; + Tracev((stderr, "inflate: stored length %u\n", + state->length)); + INITBITS(); + state->mode = COPY; + case COPY: + copy = state->length; + if (copy) { + if (copy > have) copy = have; + if (copy > left) copy = left; + if (copy == 0) goto inf_leave; + zmemcpy(put, next, copy); + have -= copy; + next += copy; + left -= copy; + put += copy; + state->length -= copy; + break; + } + Tracev((stderr, "inflate: stored end\n")); + state->mode = TYPE; + break; + case TABLE: + NEEDBITS(14); + state->nlen = BITS(5) + 257; + DROPBITS(5); + state->ndist = BITS(5) + 1; + DROPBITS(5); + state->ncode = BITS(4) + 4; + DROPBITS(4); +#ifndef PKZIP_BUG_WORKAROUND + if (state->nlen > 286 || state->ndist > 30) { + strm->msg = (char *)"too many length or distance symbols"; + state->mode = BAD; + break; + } +#endif + Tracev((stderr, "inflate: table sizes ok\n")); + state->have = 0; + state->mode = LENLENS; + case LENLENS: + while (state->have < state->ncode) { + NEEDBITS(3); + state->lens[order[state->have++]] = (unsigned short)BITS(3); + DROPBITS(3); + } + while (state->have < 19) + state->lens[order[state->have++]] = 0; + state->next = state->codes; + state->lencode = (code const FAR *)(state->next); + state->lenbits = 7; + ret = inflate_table(CODES, state->lens, 19, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid code lengths set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: code lengths ok\n")); + state->have = 0; + state->mode = CODELENS; + case CODELENS: + while (state->have < state->nlen + state->ndist) { + for (;;) { + this = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if (this.val < 16) { + NEEDBITS(this.bits); + DROPBITS(this.bits); + state->lens[state->have++] = this.val; + } + else { + if (this.val == 16) { + NEEDBITS(this.bits + 2); + DROPBITS(this.bits); + if (state->have == 0) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + len = state->lens[state->have - 1]; + copy = 3 + BITS(2); + DROPBITS(2); + } + else if (this.val == 17) { + NEEDBITS(this.bits + 3); + DROPBITS(this.bits); + len = 0; + copy = 3 + BITS(3); + DROPBITS(3); + } + else { + NEEDBITS(this.bits + 7); + DROPBITS(this.bits); + len = 0; + copy = 11 + BITS(7); + DROPBITS(7); + } + if (state->have + copy > state->nlen + state->ndist) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + while (copy--) + state->lens[state->have++] = (unsigned short)len; + } + } + + /* handle error breaks in while */ + if (state->mode == BAD) break; + + /* build code tables */ + state->next = state->codes; + state->lencode = (code const FAR *)(state->next); + state->lenbits = 9; + ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid literal/lengths set"; + state->mode = BAD; + break; + } + state->distcode = (code const FAR *)(state->next); + state->distbits = 6; + ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, + &(state->next), &(state->distbits), state->work); + if (ret) { + strm->msg = (char *)"invalid distances set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: codes ok\n")); + state->mode = LEN; + case LEN: + if (have >= 6 && left >= 258) { + RESTORE(); + inflate_fast(strm, out); + LOAD(); + break; + } + for (;;) { + this = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if (this.op && (this.op & 0xf0) == 0) { + last = this; + for (;;) { + this = state->lencode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + this.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } + DROPBITS(this.bits); + state->length = (unsigned)this.val; + if ((int)(this.op) == 0) { + Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? + "inflate: literal '%c'\n" : + "inflate: literal 0x%02x\n", this.val)); + state->mode = LIT; + break; + } + if (this.op & 32) { + Tracevv((stderr, "inflate: end of block\n")); + state->mode = TYPE; + break; + } + if (this.op & 64) { + strm->msg = (char *)"invalid literal/length code"; + state->mode = BAD; + break; + } + state->extra = (unsigned)(this.op) & 15; + state->mode = LENEXT; + case LENEXT: + if (state->extra) { + NEEDBITS(state->extra); + state->length += BITS(state->extra); + DROPBITS(state->extra); + } + Tracevv((stderr, "inflate: length %u\n", state->length)); + state->mode = DIST; + case DIST: + for (;;) { + this = state->distcode[BITS(state->distbits)]; + if ((unsigned)(this.bits) <= bits) break; + PULLBYTE(); + } + if ((this.op & 0xf0) == 0) { + last = this; + for (;;) { + this = state->distcode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + this.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } + DROPBITS(this.bits); + if (this.op & 64) { + strm->msg = (char *)"invalid distance code"; + state->mode = BAD; + break; + } + state->offset = (unsigned)this.val; + state->extra = (unsigned)(this.op) & 15; + state->mode = DISTEXT; + case DISTEXT: + if (state->extra) { + NEEDBITS(state->extra); + state->offset += BITS(state->extra); + DROPBITS(state->extra); + } +#ifdef INFLATE_STRICT + if (state->offset > state->dmax) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } +#endif + if (state->offset > state->whave + out - left) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } + Tracevv((stderr, "inflate: distance %u\n", state->offset)); + state->mode = MATCH; + case MATCH: + if (left == 0) goto inf_leave; + copy = out - left; + if (state->offset > copy) { /* copy from window */ + copy = state->offset - copy; + if (copy > state->write) { + copy -= state->write; + from = state->window + (state->wsize - copy); + } + else + from = state->window + (state->write - copy); + if (copy > state->length) copy = state->length; + } + else { /* copy from output */ + from = put - state->offset; + copy = state->length; + } + if (copy > left) copy = left; + left -= copy; + state->length -= copy; + do { + *put++ = *from++; + } while (--copy); + if (state->length == 0) state->mode = LEN; + break; + case LIT: + if (left == 0) goto inf_leave; + *put++ = (unsigned char)(state->length); + left--; + state->mode = LEN; + break; + case CHECK: + if (state->wrap) { + NEEDBITS(32); + out -= left; + strm->total_out += out; + state->total += out; + if (out) + strm->adler = state->check = + UPDATE(state->check, put - out, out); + out = left; + if (( +#ifdef GUNZIP + state->flags ? hold : +#endif + REVERSE(hold)) != state->check) { + strm->msg = (char *)"incorrect data check"; + state->mode = BAD; + break; + } + INITBITS(); + Tracev((stderr, "inflate: check matches trailer\n")); + } +#ifdef GUNZIP + state->mode = LENGTH; + case LENGTH: + if (state->wrap && state->flags) { + NEEDBITS(32); + if (hold != (state->total & 0xffffffffUL)) { + strm->msg = (char *)"incorrect length check"; + state->mode = BAD; + break; + } + INITBITS(); + Tracev((stderr, "inflate: length matches trailer\n")); + } +#endif + state->mode = DONE; + case DONE: + ret = Z_STREAM_END; + goto inf_leave; + case BAD: + ret = Z_DATA_ERROR; + goto inf_leave; + case MEM: + return Z_MEM_ERROR; + case SYNC: + default: + return Z_STREAM_ERROR; + } + + /* + Return from inflate(), updating the total counts and the check value. + If there was no progress during the inflate() call, return a buffer + error. Call updatewindow() to create and/or update the window state. + Note: a memory error from inflate() is non-recoverable. + */ + inf_leave: + RESTORE(); + if (state->wsize || (state->mode < CHECK && out != strm->avail_out)) + if (updatewindow(strm, out)) { + state->mode = MEM; + return Z_MEM_ERROR; + } + in -= strm->avail_in; + out -= strm->avail_out; + strm->total_in += in; + strm->total_out += out; + state->total += out; + if (state->wrap && out) + strm->adler = state->check = + UPDATE(state->check, strm->next_out - out, out); + strm->data_type = state->bits + (state->last ? 64 : 0) + + (state->mode == TYPE ? 128 : 0); + if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) + ret = Z_BUF_ERROR; + return ret; +} + +int ZEXPORT inflateEnd(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) + return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (state->window != Z_NULL) ZFREE(strm, state->window); + ZFREE(strm, strm->state); + strm->state = Z_NULL; + Tracev((stderr, "inflate: end\n")); + return Z_OK; +} + +int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength) +z_streamp strm; +const Bytef *dictionary; +uInt dictLength; +{ + struct inflate_state FAR *state; + unsigned long id; + + /* check state */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (state->wrap != 0 && state->mode != DICT) + return Z_STREAM_ERROR; + + /* check for correct dictionary id */ + if (state->mode == DICT) { + id = adler32(0L, Z_NULL, 0); + id = adler32(id, dictionary, dictLength); + if (id != state->check) + return Z_DATA_ERROR; + } + + /* copy dictionary to window */ + if (updatewindow(strm, strm->avail_out)) { + state->mode = MEM; + return Z_MEM_ERROR; + } + if (dictLength > state->wsize) { + zmemcpy(state->window, dictionary + dictLength - state->wsize, + state->wsize); + state->whave = state->wsize; + } + else { + zmemcpy(state->window + state->wsize - dictLength, dictionary, + dictLength); + state->whave = dictLength; + } + state->havedict = 1; + Tracev((stderr, "inflate: dictionary set\n")); + return Z_OK; +} + +int ZEXPORT inflateGetHeader(strm, head) +z_streamp strm; +gz_headerp head; +{ + struct inflate_state FAR *state; + + /* check state */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if ((state->wrap & 2) == 0) return Z_STREAM_ERROR; + + /* save header structure */ + state->head = head; + head->done = 0; + return Z_OK; +} + +/* + Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff. Return when found + or when out of input. When called, *have is the number of pattern bytes + found in order so far, in 0..3. On return *have is updated to the new + state. If on return *have equals four, then the pattern was found and the + return value is how many bytes were read including the last byte of the + pattern. If *have is less than four, then the pattern has not been found + yet and the return value is len. In the latter case, syncsearch() can be + called again with more data and the *have state. *have is initialized to + zero for the first call. + */ +local unsigned syncsearch(have, buf, len) +unsigned FAR *have; +unsigned char FAR *buf; +unsigned len; +{ + unsigned got; + unsigned next; + + got = *have; + next = 0; + while (next < len && got < 4) { + if ((int)(buf[next]) == (got < 2 ? 0 : 0xff)) + got++; + else if (buf[next]) + got = 0; + else + got = 4 - got; + next++; + } + *have = got; + return next; +} + +int ZEXPORT inflateSync(strm) +z_streamp strm; +{ + unsigned len; /* number of bytes to look at or looked at */ + unsigned long in, out; /* temporary to save total_in and total_out */ + unsigned char buf[4]; /* to restore bit buffer to byte string */ + struct inflate_state FAR *state; + + /* check parameters */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR; + + /* if first time, start search in bit buffer */ + if (state->mode != SYNC) { + state->mode = SYNC; + state->hold <<= state->bits & 7; + state->bits -= state->bits & 7; + len = 0; + while (state->bits >= 8) { + buf[len++] = (unsigned char)(state->hold); + state->hold >>= 8; + state->bits -= 8; + } + state->have = 0; + syncsearch(&(state->have), buf, len); + } + + /* search available input */ + len = syncsearch(&(state->have), strm->next_in, strm->avail_in); + strm->avail_in -= len; + strm->next_in += len; + strm->total_in += len; + + /* return no joy or set up to restart inflate() on a new block */ + if (state->have != 4) return Z_DATA_ERROR; + in = strm->total_in; out = strm->total_out; + inflateReset(strm); + strm->total_in = in; strm->total_out = out; + state->mode = TYPE; + return Z_OK; +} + +/* + Returns true if inflate is currently at the end of a block generated by + Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP + implementation to provide an additional safety check. PPP uses + Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored + block. When decompressing, PPP checks that at the end of input packet, + inflate is waiting for these length bytes. + */ +int ZEXPORT inflateSyncPoint(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + return state->mode == STORED && state->bits == 0; +} + +int ZEXPORT inflateCopy(dest, source) +z_streamp dest; +z_streamp source; +{ + struct inflate_state FAR *state; + struct inflate_state FAR *copy; + unsigned char FAR *window; + unsigned wsize; + + /* check input */ + if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL || + source->zalloc == (alloc_func)0 || source->zfree == (free_func)0) + return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)source->state; + + /* allocate space */ + copy = (struct inflate_state FAR *) + ZALLOC(source, 1, sizeof(struct inflate_state)); + if (copy == Z_NULL) return Z_MEM_ERROR; + window = Z_NULL; + if (state->window != Z_NULL) { + window = (unsigned char FAR *) + ZALLOC(source, 1U << state->wbits, sizeof(unsigned char)); + if (window == Z_NULL) { + ZFREE(source, copy); + return Z_MEM_ERROR; + } + } + + /* copy state */ + zmemcpy(dest, source, sizeof(z_stream)); + zmemcpy(copy, state, sizeof(struct inflate_state)); + if (state->lencode >= state->codes && + state->lencode <= state->codes + ENOUGH - 1) { + copy->lencode = copy->codes + (state->lencode - state->codes); + copy->distcode = copy->codes + (state->distcode - state->codes); + } + copy->next = copy->codes + (state->next - state->codes); + if (window != Z_NULL) { + wsize = 1U << state->wbits; + zmemcpy(window, state->window, wsize); + } + copy->window = window; + dest->state = (struct internal_state FAR *)copy; + return Z_OK; +} diff --git a/zlib/inflate.h b/zlib/inflate.h new file mode 100644 index 0000000000..fbbc871432 --- /dev/null +++ b/zlib/inflate.h @@ -0,0 +1,115 @@ +/* inflate.h -- internal inflate state definition + * Copyright (C) 1995-2004 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +/* define NO_GZIP when compiling if you want to disable gzip header and + trailer decoding by inflate(). NO_GZIP would be used to avoid linking in + the crc code when it is not needed. For shared libraries, gzip decoding + should be left enabled. */ +#ifndef NO_GZIP +# define GUNZIP +#endif + +/* Possible inflate modes between inflate() calls */ +typedef enum { + HEAD, /* i: waiting for magic header */ + FLAGS, /* i: waiting for method and flags (gzip) */ + TIME, /* i: waiting for modification time (gzip) */ + OS, /* i: waiting for extra flags and operating system (gzip) */ + EXLEN, /* i: waiting for extra length (gzip) */ + EXTRA, /* i: waiting for extra bytes (gzip) */ + NAME, /* i: waiting for end of file name (gzip) */ + COMMENT, /* i: waiting for end of comment (gzip) */ + HCRC, /* i: waiting for header crc (gzip) */ + DICTID, /* i: waiting for dictionary check value */ + DICT, /* waiting for inflateSetDictionary() call */ + TYPE, /* i: waiting for type bits, including last-flag bit */ + TYPEDO, /* i: same, but skip check to exit inflate on new block */ + STORED, /* i: waiting for stored size (length and complement) */ + COPY, /* i/o: waiting for input or output to copy stored block */ + TABLE, /* i: waiting for dynamic block table lengths */ + LENLENS, /* i: waiting for code length code lengths */ + CODELENS, /* i: waiting for length/lit and distance code lengths */ + LEN, /* i: waiting for length/lit code */ + LENEXT, /* i: waiting for length extra bits */ + DIST, /* i: waiting for distance code */ + DISTEXT, /* i: waiting for distance extra bits */ + MATCH, /* o: waiting for output space to copy string */ + LIT, /* o: waiting for output space to write literal */ + CHECK, /* i: waiting for 32-bit check value */ + LENGTH, /* i: waiting for 32-bit length (gzip) */ + DONE, /* finished check, done -- remain here until reset */ + BAD, /* got a data error -- remain here until reset */ + MEM, /* got an inflate() memory error -- remain here until reset */ + SYNC /* looking for synchronization bytes to restart inflate() */ +} inflate_mode; + +/* + State transitions between above modes - + + (most modes can go to the BAD or MEM mode -- not shown for clarity) + + Process header: + HEAD -> (gzip) or (zlib) + (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME + NAME -> COMMENT -> HCRC -> TYPE + (zlib) -> DICTID or TYPE + DICTID -> DICT -> TYPE + Read deflate blocks: + TYPE -> STORED or TABLE or LEN or CHECK + STORED -> COPY -> TYPE + TABLE -> LENLENS -> CODELENS -> LEN + Read deflate codes: + LEN -> LENEXT or LIT or TYPE + LENEXT -> DIST -> DISTEXT -> MATCH -> LEN + LIT -> LEN + Process trailer: + CHECK -> LENGTH -> DONE + */ + +/* state maintained between inflate() calls. Approximately 7K bytes. */ +struct inflate_state { + inflate_mode mode; /* current inflate mode */ + int last; /* true if processing last block */ + int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ + int havedict; /* true if dictionary provided */ + int flags; /* gzip header method and flags (0 if zlib) */ + unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */ + unsigned long check; /* protected copy of check value */ + unsigned long total; /* protected copy of output count */ + gz_headerp head; /* where to save gzip header information */ + /* sliding window */ + unsigned wbits; /* log base 2 of requested window size */ + unsigned wsize; /* window size or zero if not using window */ + unsigned whave; /* valid bytes in the window */ + unsigned write; /* window write index */ + unsigned char FAR *window; /* allocated sliding window, if needed */ + /* bit accumulator */ + unsigned long hold; /* input bit accumulator */ + unsigned bits; /* number of bits in "in" */ + /* for string and stored block copying */ + unsigned length; /* literal or length of data to copy */ + unsigned offset; /* distance back to copy string from */ + /* for table and code decoding */ + unsigned extra; /* extra bits needed */ + /* fixed and dynamic code tables */ + code const FAR *lencode; /* starting table for length/literal codes */ + code const FAR *distcode; /* starting table for distance codes */ + unsigned lenbits; /* index bits for lencode */ + unsigned distbits; /* index bits for distcode */ + /* dynamic table building */ + unsigned ncode; /* number of code length code lengths */ + unsigned nlen; /* number of length code lengths */ + unsigned ndist; /* number of distance code lengths */ + unsigned have; /* number of code lengths in lens[] */ + code FAR *next; /* next available space in codes[] */ + unsigned short lens[320]; /* temporary storage for code lengths */ + unsigned short work[288]; /* work area for code table building */ + code codes[ENOUGH]; /* space for code tables */ +}; diff --git a/zlib/inftrees.c b/zlib/inftrees.c new file mode 100644 index 0000000000..38ded81c36 --- /dev/null +++ b/zlib/inftrees.c @@ -0,0 +1,329 @@ +/* inftrees.c -- generate Huffman trees for efficient decoding + * Copyright (C) 1995-2005 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "zutil.h" +#include "inftrees.h" + +#define MAXBITS 15 + +const char inflate_copyright[] = + " inflate 1.2.3 Copyright 1995-2005 Mark Adler "; +/* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot + include such an acknowledgment, I would appreciate that you keep this + copyright string in the executable of your product. + */ + +/* + Build a set of tables to decode the provided canonical Huffman code. + The code lengths are lens[0..codes-1]. The result starts at *table, + whose indices are 0..2^bits-1. work is a writable array of at least + lens shorts, which is used as a work area. type is the type of code + to be generated, CODES, LENS, or DISTS. On return, zero is success, + -1 is an invalid code, and +1 means that ENOUGH isn't enough. table + on return points to the next available entry's address. bits is the + requested root table index bits, and on return it is the actual root + table index bits. It will differ if the request is greater than the + longest code or if it is less than the shortest code. + */ +int inflate_table(type, lens, codes, table, bits, work) +codetype type; +unsigned short FAR *lens; +unsigned codes; +code FAR * FAR *table; +unsigned FAR *bits; +unsigned short FAR *work; +{ + unsigned len; /* a code's length in bits */ + unsigned sym; /* index of code symbols */ + unsigned min, max; /* minimum and maximum code lengths */ + unsigned root; /* number of index bits for root table */ + unsigned curr; /* number of index bits for current table */ + unsigned drop; /* code bits to drop for sub-table */ + int left; /* number of prefix codes available */ + unsigned used; /* code entries in table used */ + unsigned huff; /* Huffman code */ + unsigned incr; /* for incrementing code, index */ + unsigned fill; /* index for replicating entries */ + unsigned low; /* low bits for current root entry */ + unsigned mask; /* mask for low root bits */ + code this; /* table entry for duplication */ + code FAR *next; /* next available space in table */ + const unsigned short FAR *base; /* base value table to use */ + const unsigned short FAR *extra; /* extra bits table to use */ + int end; /* use base and extra for symbol > end */ + unsigned short count[MAXBITS+1]; /* number of codes of each length */ + unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ + static const unsigned short lbase[31] = { /* Length codes 257..285 base */ + 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, + 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; + static const unsigned short lext[31] = { /* Length codes 257..285 extra */ + 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196}; + static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ + 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, + 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, + 8193, 12289, 16385, 24577, 0, 0}; + static const unsigned short dext[32] = { /* Distance codes 0..29 extra */ + 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, + 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, + 28, 28, 29, 29, 64, 64}; + + /* + Process a set of code lengths to create a canonical Huffman code. The + code lengths are lens[0..codes-1]. Each length corresponds to the + symbols 0..codes-1. The Huffman code is generated by first sorting the + symbols by length from short to long, and retaining the symbol order + for codes with equal lengths. Then the code starts with all zero bits + for the first code of the shortest length, and the codes are integer + increments for the same length, and zeros are appended as the length + increases. For the deflate format, these bits are stored backwards + from their more natural integer increment ordering, and so when the + decoding tables are built in the large loop below, the integer codes + are incremented backwards. + + This routine assumes, but does not check, that all of the entries in + lens[] are in the range 0..MAXBITS. The caller must assure this. + 1..MAXBITS is interpreted as that code length. zero means that that + symbol does not occur in this code. + + The codes are sorted by computing a count of codes for each length, + creating from that a table of starting indices for each length in the + sorted table, and then entering the symbols in order in the sorted + table. The sorted table is work[], with that space being provided by + the caller. + + The length counts are used for other purposes as well, i.e. finding + the minimum and maximum length codes, determining if there are any + codes at all, checking for a valid set of lengths, and looking ahead + at length counts to determine sub-table sizes when building the + decoding tables. + */ + + /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */ + for (len = 0; len <= MAXBITS; len++) + count[len] = 0; + for (sym = 0; sym < codes; sym++) + count[lens[sym]]++; + + /* bound code lengths, force root to be within code lengths */ + root = *bits; + for (max = MAXBITS; max >= 1; max--) + if (count[max] != 0) break; + if (root > max) root = max; + if (max == 0) { /* no symbols to code at all */ + this.op = (unsigned char)64; /* invalid code marker */ + this.bits = (unsigned char)1; + this.val = (unsigned short)0; + *(*table)++ = this; /* make a table to force an error */ + *(*table)++ = this; + *bits = 1; + return 0; /* no symbols, but wait for decoding to report error */ + } + for (min = 1; min <= MAXBITS; min++) + if (count[min] != 0) break; + if (root < min) root = min; + + /* check for an over-subscribed or incomplete set of lengths */ + left = 1; + for (len = 1; len <= MAXBITS; len++) { + left <<= 1; + left -= count[len]; + if (left < 0) return -1; /* over-subscribed */ + } + if (left > 0 && (type == CODES || max != 1)) + return -1; /* incomplete set */ + + /* generate offsets into symbol table for each length for sorting */ + offs[1] = 0; + for (len = 1; len < MAXBITS; len++) + offs[len + 1] = offs[len] + count[len]; + + /* sort symbols by length, by symbol order within each length */ + for (sym = 0; sym < codes; sym++) + if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym; + + /* + Create and fill in decoding tables. In this loop, the table being + filled is at next and has curr index bits. The code being used is huff + with length len. That code is converted to an index by dropping drop + bits off of the bottom. For codes where len is less than drop + curr, + those top drop + curr - len bits are incremented through all values to + fill the table with replicated entries. + + root is the number of index bits for the root table. When len exceeds + root, sub-tables are created pointed to by the root entry with an index + of the low root bits of huff. This is saved in low to check for when a + new sub-table should be started. drop is zero when the root table is + being filled, and drop is root when sub-tables are being filled. + + When a new sub-table is needed, it is necessary to look ahead in the + code lengths to determine what size sub-table is needed. The length + counts are used for this, and so count[] is decremented as codes are + entered in the tables. + + used keeps track of how many table entries have been allocated from the + provided *table space. It is checked when a LENS table is being made + against the space in *table, ENOUGH, minus the maximum space needed by + the worst case distance code, MAXD. This should never happen, but the + sufficiency of ENOUGH has not been proven exhaustively, hence the check. + This assumes that when type == LENS, bits == 9. + + sym increments through all symbols, and the loop terminates when + all codes of length max, i.e. all codes, have been processed. This + routine permits incomplete codes, so another loop after this one fills + in the rest of the decoding tables with invalid code markers. + */ + + /* set up for code type */ + switch (type) { + case CODES: + base = extra = work; /* dummy value--not used */ + end = 19; + break; + case LENS: + base = lbase; + base -= 257; + extra = lext; + extra -= 257; + end = 256; + break; + default: /* DISTS */ + base = dbase; + extra = dext; + end = -1; + } + + /* initialize state for loop */ + huff = 0; /* starting code */ + sym = 0; /* starting code symbol */ + len = min; /* starting code length */ + next = *table; /* current table to fill in */ + curr = root; /* current table index bits */ + drop = 0; /* current bits to drop from code for index */ + low = (unsigned)(-1); /* trigger new sub-table when len > root */ + used = 1U << root; /* use root table entries */ + mask = used - 1; /* mask for comparing low */ + + /* check available table space */ + if (type == LENS && used >= ENOUGH - MAXD) + return 1; + + /* process all codes and make table entries */ + for (;;) { + /* create table entry */ + this.bits = (unsigned char)(len - drop); + if ((int)(work[sym]) < end) { + this.op = (unsigned char)0; + this.val = work[sym]; + } + else if ((int)(work[sym]) > end) { + this.op = (unsigned char)(extra[work[sym]]); + this.val = base[work[sym]]; + } + else { + this.op = (unsigned char)(32 + 64); /* end of block */ + this.val = 0; + } + + /* replicate for those indices with low len bits equal to huff */ + incr = 1U << (len - drop); + fill = 1U << curr; + min = fill; /* save offset to next table */ + do { + fill -= incr; + next[(huff >> drop) + fill] = this; + } while (fill != 0); + + /* backwards increment the len-bit code huff */ + incr = 1U << (len - 1); + while (huff & incr) + incr >>= 1; + if (incr != 0) { + huff &= incr - 1; + huff += incr; + } + else + huff = 0; + + /* go to next symbol, update count, len */ + sym++; + if (--(count[len]) == 0) { + if (len == max) break; + len = lens[work[sym]]; + } + + /* create new sub-table if needed */ + if (len > root && (huff & mask) != low) { + /* if first time, transition to sub-tables */ + if (drop == 0) + drop = root; + + /* increment past last table */ + next += min; /* here min is 1 << curr */ + + /* determine length of next table */ + curr = len - drop; + left = (int)(1 << curr); + while (curr + drop < max) { + left -= count[curr + drop]; + if (left <= 0) break; + curr++; + left <<= 1; + } + + /* check for enough space */ + used += 1U << curr; + if (type == LENS && used >= ENOUGH - MAXD) + return 1; + + /* point entry in root table to sub-table */ + low = huff & mask; + (*table)[low].op = (unsigned char)curr; + (*table)[low].bits = (unsigned char)root; + (*table)[low].val = (unsigned short)(next - *table); + } + } + + /* + Fill in rest of table for incomplete codes. This loop is similar to the + loop above in incrementing huff for table indices. It is assumed that + len is equal to curr + drop, so there is no loop needed to increment + through high index bits. When the current sub-table is filled, the loop + drops back to the root table to fill in any remaining entries there. + */ + this.op = (unsigned char)64; /* invalid code marker */ + this.bits = (unsigned char)(len - drop); + this.val = (unsigned short)0; + while (huff != 0) { + /* when done with sub-table, drop back to root table */ + if (drop != 0 && (huff & mask) != low) { + drop = 0; + len = root; + next = *table; + this.bits = (unsigned char)len; + } + + /* put invalid code marker in table */ + next[huff >> drop] = this; + + /* backwards increment the len-bit code huff */ + incr = 1U << (len - 1); + while (huff & incr) + incr >>= 1; + if (incr != 0) { + huff &= incr - 1; + huff += incr; + } + else + huff = 0; + } + + /* set return parameters */ + *table += used; + *bits = root; + return 0; +} diff --git a/zlib/inftrees.h b/zlib/inftrees.h new file mode 100644 index 0000000000..dc0fd567ea --- /dev/null +++ b/zlib/inftrees.h @@ -0,0 +1,55 @@ +/* inftrees.h -- header to use inftrees.c + * Copyright (C) 1995-2005 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +/* Structure for decoding tables. Each entry provides either the + information needed to do the operation requested by the code that + indexed that table entry, or it provides a pointer to another + table that indexes more bits of the code. op indicates whether + the entry is a pointer to another table, a literal, a length or + distance, an end-of-block, or an invalid code. For a table + pointer, the low four bits of op is the number of index bits of + that table. For a length or distance, the low four bits of op + is the number of extra bits to get after the code. bits is + the number of bits in this code or part of the code to drop off + of the bit buffer. val is the actual byte to output in the case + of a literal, the base length or distance, or the offset from + the current table to the next table. Each entry is four bytes. */ +typedef struct { + unsigned char op; /* operation, extra bits, table bits */ + unsigned char bits; /* bits in this part of the code */ + unsigned short val; /* offset in table or code value */ +} code; + +/* op values as set by inflate_table(): + 00000000 - literal + 0000tttt - table link, tttt != 0 is the number of table index bits + 0001eeee - length or distance, eeee is the number of extra bits + 01100000 - end of block + 01000000 - invalid code + */ + +/* Maximum size of dynamic tree. The maximum found in a long but non- + exhaustive search was 1444 code structures (852 for length/literals + and 592 for distances, the latter actually the result of an + exhaustive search). The true maximum is not known, but the value + below is more than safe. */ +#define ENOUGH 2048 +#define MAXD 592 + +/* Type of code to build for inftable() */ +typedef enum { + CODES, + LENS, + DISTS +} codetype; + +extern int inflate_table OF((codetype type, unsigned short FAR *lens, + unsigned codes, code FAR * FAR *table, + unsigned FAR *bits, unsigned short FAR *work)); diff --git a/zlib/trees.c b/zlib/trees.c new file mode 100644 index 0000000000..7a04802862 --- /dev/null +++ b/zlib/trees.c @@ -0,0 +1,1219 @@ +/* trees.c -- output deflated data using Huffman coding + * Copyright (C) 1995-2005 Jean-loup Gailly + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + * ALGORITHM + * + * The "deflation" process uses several Huffman trees. The more + * common source values are represented by shorter bit sequences. + * + * Each code tree is stored in a compressed form which is itself + * a Huffman encoding of the lengths of all the code strings (in + * ascending order by source values). The actual code strings are + * reconstructed from the lengths in the inflate process, as described + * in the deflate specification. + * + * REFERENCES + * + * Deutsch, L.P.,"'Deflate' Compressed Data Format Specification". + * Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc + * + * Storer, James A. + * Data Compression: Methods and Theory, pp. 49-50. + * Computer Science Press, 1988. ISBN 0-7167-8156-5. + * + * Sedgewick, R. + * Algorithms, p290. + * Addison-Wesley, 1983. ISBN 0-201-06672-6. + */ + +/* @(#) $Id$ */ + +/* #define GEN_TREES_H */ + +#include "deflate.h" + +#ifdef DEBUG +# include +#endif + +/* =========================================================================== + * Constants + */ + +#define MAX_BL_BITS 7 +/* Bit length codes must not exceed MAX_BL_BITS bits */ + +#define END_BLOCK 256 +/* end of block literal code */ + +#define REP_3_6 16 +/* repeat previous bit length 3-6 times (2 bits of repeat count) */ + +#define REPZ_3_10 17 +/* repeat a zero length 3-10 times (3 bits of repeat count) */ + +#define REPZ_11_138 18 +/* repeat a zero length 11-138 times (7 bits of repeat count) */ + +local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */ + = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0}; + +local const int extra_dbits[D_CODES] /* extra bits for each distance code */ + = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; + +local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */ + = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7}; + +local const uch bl_order[BL_CODES] + = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15}; +/* The lengths of the bit length codes are sent in order of decreasing + * probability, to avoid transmitting the lengths for unused bit length codes. + */ + +#define Buf_size (8 * 2*sizeof(char)) +/* Number of bits used within bi_buf. (bi_buf might be implemented on + * more than 16 bits on some systems.) + */ + +/* =========================================================================== + * Local data. These are initialized only once. + */ + +#define DIST_CODE_LEN 512 /* see definition of array dist_code below */ + +#if defined(GEN_TREES_H) || !defined(STDC) +/* non ANSI compilers may not accept trees.h */ + +local ct_data static_ltree[L_CODES+2]; +/* The static literal tree. Since the bit lengths are imposed, there is no + * need for the L_CODES extra codes used during heap construction. However + * The codes 286 and 287 are needed to build a canonical tree (see _tr_init + * below). + */ + +local ct_data static_dtree[D_CODES]; +/* The static distance tree. (Actually a trivial tree since all codes use + * 5 bits.) + */ + +uch _dist_code[DIST_CODE_LEN]; +/* Distance codes. The first 256 values correspond to the distances + * 3 .. 258, the last 256 values correspond to the top 8 bits of + * the 15 bit distances. + */ + +uch _length_code[MAX_MATCH-MIN_MATCH+1]; +/* length code for each normalized match length (0 == MIN_MATCH) */ + +local int base_length[LENGTH_CODES]; +/* First normalized length for each code (0 = MIN_MATCH) */ + +local int base_dist[D_CODES]; +/* First normalized distance for each code (0 = distance of 1) */ + +#else +# include "trees.h" +#endif /* GEN_TREES_H */ + +struct static_tree_desc_s { + const ct_data *static_tree; /* static tree or NULL */ + const intf *extra_bits; /* extra bits for each code or NULL */ + int extra_base; /* base index for extra_bits */ + int elems; /* max number of elements in the tree */ + int max_length; /* max bit length for the codes */ +}; + +local static_tree_desc static_l_desc = +{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS}; + +local static_tree_desc static_d_desc = +{static_dtree, extra_dbits, 0, D_CODES, MAX_BITS}; + +local static_tree_desc static_bl_desc = +{(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS}; + +/* =========================================================================== + * Local (static) routines in this file. + */ + +local void tr_static_init OF((void)); +local void init_block OF((deflate_state *s)); +local void pqdownheap OF((deflate_state *s, ct_data *tree, int k)); +local void gen_bitlen OF((deflate_state *s, tree_desc *desc)); +local void gen_codes OF((ct_data *tree, int max_code, ushf *bl_count)); +local void build_tree OF((deflate_state *s, tree_desc *desc)); +local void scan_tree OF((deflate_state *s, ct_data *tree, int max_code)); +local void send_tree OF((deflate_state *s, ct_data *tree, int max_code)); +local int build_bl_tree OF((deflate_state *s)); +local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes, + int blcodes)); +local void compress_block OF((deflate_state *s, ct_data *ltree, + ct_data *dtree)); +local void set_data_type OF((deflate_state *s)); +local unsigned bi_reverse OF((unsigned value, int length)); +local void bi_windup OF((deflate_state *s)); +local void bi_flush OF((deflate_state *s)); +local void copy_block OF((deflate_state *s, charf *buf, unsigned len, + int header)); + +#ifdef GEN_TREES_H +local void gen_trees_header OF((void)); +#endif + +#ifndef DEBUG +# define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len) + /* Send a code of the given tree. c and tree must not have side effects */ + +#else /* DEBUG */ +# define send_code(s, c, tree) \ + { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \ + send_bits(s, tree[c].Code, tree[c].Len); } +#endif + +/* =========================================================================== + * Output a short LSB first on the stream. + * IN assertion: there is enough room in pendingBuf. + */ +#define put_short(s, w) { \ + put_byte(s, (uch)((w) & 0xff)); \ + put_byte(s, (uch)((ush)(w) >> 8)); \ +} + +/* =========================================================================== + * Send a value on a given number of bits. + * IN assertion: length <= 16 and value fits in length bits. + */ +#ifdef DEBUG +local void send_bits OF((deflate_state *s, int value, int length)); + +local void send_bits(s, value, length) + deflate_state *s; + int value; /* value to send */ + int length; /* number of bits */ +{ + Tracevv((stderr," l %2d v %4x ", length, value)); + Assert(length > 0 && length <= 15, "invalid length"); + s->bits_sent += (ulg)length; + + /* If not enough room in bi_buf, use (valid) bits from bi_buf and + * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid)) + * unused bits in value. + */ + if (s->bi_valid > (int)Buf_size - length) { + s->bi_buf |= (value << s->bi_valid); + put_short(s, s->bi_buf); + s->bi_buf = (ush)value >> (Buf_size - s->bi_valid); + s->bi_valid += length - Buf_size; + } else { + s->bi_buf |= value << s->bi_valid; + s->bi_valid += length; + } +} +#else /* !DEBUG */ + +#define send_bits(s, value, length) \ +{ int len = length;\ + if (s->bi_valid > (int)Buf_size - len) {\ + int val = value;\ + s->bi_buf |= (val << s->bi_valid);\ + put_short(s, s->bi_buf);\ + s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\ + s->bi_valid += len - Buf_size;\ + } else {\ + s->bi_buf |= (value) << s->bi_valid;\ + s->bi_valid += len;\ + }\ +} +#endif /* DEBUG */ + + +/* the arguments must not have side effects */ + +/* =========================================================================== + * Initialize the various 'constant' tables. + */ +local void tr_static_init() +{ +#if defined(GEN_TREES_H) || !defined(STDC) + static int static_init_done = 0; + int n; /* iterates over tree elements */ + int bits; /* bit counter */ + int length; /* length value */ + int code; /* code value */ + int dist; /* distance index */ + ush bl_count[MAX_BITS+1]; + /* number of codes at each bit length for an optimal tree */ + + if (static_init_done) return; + + /* For some embedded targets, global variables are not initialized: */ + static_l_desc.static_tree = static_ltree; + static_l_desc.extra_bits = extra_lbits; + static_d_desc.static_tree = static_dtree; + static_d_desc.extra_bits = extra_dbits; + static_bl_desc.extra_bits = extra_blbits; + + /* Initialize the mapping length (0..255) -> length code (0..28) */ + length = 0; + for (code = 0; code < LENGTH_CODES-1; code++) { + base_length[code] = length; + for (n = 0; n < (1< dist code (0..29) */ + dist = 0; + for (code = 0 ; code < 16; code++) { + base_dist[code] = dist; + for (n = 0; n < (1<>= 7; /* from now on, all distances are divided by 128 */ + for ( ; code < D_CODES; code++) { + base_dist[code] = dist << 7; + for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) { + _dist_code[256 + dist++] = (uch)code; + } + } + Assert (dist == 256, "tr_static_init: 256+dist != 512"); + + /* Construct the codes of the static literal tree */ + for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0; + n = 0; + while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++; + while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++; + while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++; + while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++; + /* Codes 286 and 287 do not exist, but we must include them in the + * tree construction to get a canonical Huffman tree (longest code + * all ones) + */ + gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count); + + /* The static distance tree is trivial: */ + for (n = 0; n < D_CODES; n++) { + static_dtree[n].Len = 5; + static_dtree[n].Code = bi_reverse((unsigned)n, 5); + } + static_init_done = 1; + +# ifdef GEN_TREES_H + gen_trees_header(); +# endif +#endif /* defined(GEN_TREES_H) || !defined(STDC) */ +} + +/* =========================================================================== + * Genererate the file trees.h describing the static trees. + */ +#ifdef GEN_TREES_H +# ifndef DEBUG +# include +# endif + +# define SEPARATOR(i, last, width) \ + ((i) == (last)? "\n};\n\n" : \ + ((i) % (width) == (width)-1 ? ",\n" : ", ")) + +void gen_trees_header() +{ + FILE *header = fopen("trees.h", "w"); + int i; + + Assert (header != NULL, "Can't open trees.h"); + fprintf(header, + "/* header created automatically with -DGEN_TREES_H */\n\n"); + + fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n"); + for (i = 0; i < L_CODES+2; i++) { + fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code, + static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5)); + } + + fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n"); + for (i = 0; i < D_CODES; i++) { + fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code, + static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5)); + } + + fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n"); + for (i = 0; i < DIST_CODE_LEN; i++) { + fprintf(header, "%2u%s", _dist_code[i], + SEPARATOR(i, DIST_CODE_LEN-1, 20)); + } + + fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n"); + for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) { + fprintf(header, "%2u%s", _length_code[i], + SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20)); + } + + fprintf(header, "local const int base_length[LENGTH_CODES] = {\n"); + for (i = 0; i < LENGTH_CODES; i++) { + fprintf(header, "%1u%s", base_length[i], + SEPARATOR(i, LENGTH_CODES-1, 20)); + } + + fprintf(header, "local const int base_dist[D_CODES] = {\n"); + for (i = 0; i < D_CODES; i++) { + fprintf(header, "%5u%s", base_dist[i], + SEPARATOR(i, D_CODES-1, 10)); + } + + fclose(header); +} +#endif /* GEN_TREES_H */ + +/* =========================================================================== + * Initialize the tree data structures for a new zlib stream. + */ +void _tr_init(s) + deflate_state *s; +{ + tr_static_init(); + + s->l_desc.dyn_tree = s->dyn_ltree; + s->l_desc.stat_desc = &static_l_desc; + + s->d_desc.dyn_tree = s->dyn_dtree; + s->d_desc.stat_desc = &static_d_desc; + + s->bl_desc.dyn_tree = s->bl_tree; + s->bl_desc.stat_desc = &static_bl_desc; + + s->bi_buf = 0; + s->bi_valid = 0; + s->last_eob_len = 8; /* enough lookahead for inflate */ +#ifdef DEBUG + s->compressed_len = 0L; + s->bits_sent = 0L; +#endif + + /* Initialize the first block of the first file: */ + init_block(s); +} + +/* =========================================================================== + * Initialize a new block. + */ +local void init_block(s) + deflate_state *s; +{ + int n; /* iterates over tree elements */ + + /* Initialize the trees. */ + for (n = 0; n < L_CODES; n++) s->dyn_ltree[n].Freq = 0; + for (n = 0; n < D_CODES; n++) s->dyn_dtree[n].Freq = 0; + for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0; + + s->dyn_ltree[END_BLOCK].Freq = 1; + s->opt_len = s->static_len = 0L; + s->last_lit = s->matches = 0; +} + +#define SMALLEST 1 +/* Index within the heap array of least frequent node in the Huffman tree */ + + +/* =========================================================================== + * Remove the smallest element from the heap and recreate the heap with + * one less element. Updates heap and heap_len. + */ +#define pqremove(s, tree, top) \ +{\ + top = s->heap[SMALLEST]; \ + s->heap[SMALLEST] = s->heap[s->heap_len--]; \ + pqdownheap(s, tree, SMALLEST); \ +} + +/* =========================================================================== + * Compares to subtrees, using the tree depth as tie breaker when + * the subtrees have equal frequency. This minimizes the worst case length. + */ +#define smaller(tree, n, m, depth) \ + (tree[n].Freq < tree[m].Freq || \ + (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m])) + +/* =========================================================================== + * Restore the heap property by moving down the tree starting at node k, + * exchanging a node with the smallest of its two sons if necessary, stopping + * when the heap property is re-established (each father smaller than its + * two sons). + */ +local void pqdownheap(s, tree, k) + deflate_state *s; + ct_data *tree; /* the tree to restore */ + int k; /* node to move down */ +{ + int v = s->heap[k]; + int j = k << 1; /* left son of k */ + while (j <= s->heap_len) { + /* Set j to the smallest of the two sons: */ + if (j < s->heap_len && + smaller(tree, s->heap[j+1], s->heap[j], s->depth)) { + j++; + } + /* Exit if v is smaller than both sons */ + if (smaller(tree, v, s->heap[j], s->depth)) break; + + /* Exchange v with the smallest son */ + s->heap[k] = s->heap[j]; k = j; + + /* And continue down the tree, setting j to the left son of k */ + j <<= 1; + } + s->heap[k] = v; +} + +/* =========================================================================== + * Compute the optimal bit lengths for a tree and update the total bit length + * for the current block. + * IN assertion: the fields freq and dad are set, heap[heap_max] and + * above are the tree nodes sorted by increasing frequency. + * OUT assertions: the field len is set to the optimal bit length, the + * array bl_count contains the frequencies for each bit length. + * The length opt_len is updated; static_len is also updated if stree is + * not null. + */ +local void gen_bitlen(s, desc) + deflate_state *s; + tree_desc *desc; /* the tree descriptor */ +{ + ct_data *tree = desc->dyn_tree; + int max_code = desc->max_code; + const ct_data *stree = desc->stat_desc->static_tree; + const intf *extra = desc->stat_desc->extra_bits; + int base = desc->stat_desc->extra_base; + int max_length = desc->stat_desc->max_length; + int h; /* heap index */ + int n, m; /* iterate over the tree elements */ + int bits; /* bit length */ + int xbits; /* extra bits */ + ush f; /* frequency */ + int overflow = 0; /* number of elements with bit length too large */ + + for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0; + + /* In a first pass, compute the optimal bit lengths (which may + * overflow in the case of the bit length tree). + */ + tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */ + + for (h = s->heap_max+1; h < HEAP_SIZE; h++) { + n = s->heap[h]; + bits = tree[tree[n].Dad].Len + 1; + if (bits > max_length) bits = max_length, overflow++; + tree[n].Len = (ush)bits; + /* We overwrite tree[n].Dad which is no longer needed */ + + if (n > max_code) continue; /* not a leaf node */ + + s->bl_count[bits]++; + xbits = 0; + if (n >= base) xbits = extra[n-base]; + f = tree[n].Freq; + s->opt_len += (ulg)f * (bits + xbits); + if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits); + } + if (overflow == 0) return; + + Trace((stderr,"\nbit length overflow\n")); + /* This happens for example on obj2 and pic of the Calgary corpus */ + + /* Find the first bit length which could increase: */ + do { + bits = max_length-1; + while (s->bl_count[bits] == 0) bits--; + s->bl_count[bits]--; /* move one leaf down the tree */ + s->bl_count[bits+1] += 2; /* move one overflow item as its brother */ + s->bl_count[max_length]--; + /* The brother of the overflow item also moves one step up, + * but this does not affect bl_count[max_length] + */ + overflow -= 2; + } while (overflow > 0); + + /* Now recompute all bit lengths, scanning in increasing frequency. + * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all + * lengths instead of fixing only the wrong ones. This idea is taken + * from 'ar' written by Haruhiko Okumura.) + */ + for (bits = max_length; bits != 0; bits--) { + n = s->bl_count[bits]; + while (n != 0) { + m = s->heap[--h]; + if (m > max_code) continue; + if ((unsigned) tree[m].Len != (unsigned) bits) { + Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits)); + s->opt_len += ((long)bits - (long)tree[m].Len) + *(long)tree[m].Freq; + tree[m].Len = (ush)bits; + } + n--; + } + } +} + +/* =========================================================================== + * Generate the codes for a given tree and bit counts (which need not be + * optimal). + * IN assertion: the array bl_count contains the bit length statistics for + * the given tree and the field len is set for all tree elements. + * OUT assertion: the field code is set for all tree elements of non + * zero code length. + */ +local void gen_codes (tree, max_code, bl_count) + ct_data *tree; /* the tree to decorate */ + int max_code; /* largest code with non zero frequency */ + ushf *bl_count; /* number of codes at each bit length */ +{ + ush next_code[MAX_BITS+1]; /* next code value for each bit length */ + ush code = 0; /* running code value */ + int bits; /* bit index */ + int n; /* code index */ + + /* The distribution counts are first used to generate the code values + * without bit reversal. + */ + for (bits = 1; bits <= MAX_BITS; bits++) { + next_code[bits] = code = (code + bl_count[bits-1]) << 1; + } + /* Check that the bit counts in bl_count are consistent. The last code + * must be all ones. + */ + Assert (code + bl_count[MAX_BITS]-1 == (1<dyn_tree; + const ct_data *stree = desc->stat_desc->static_tree; + int elems = desc->stat_desc->elems; + int n, m; /* iterate over heap elements */ + int max_code = -1; /* largest code with non zero frequency */ + int node; /* new node being created */ + + /* Construct the initial heap, with least frequent element in + * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1]. + * heap[0] is not used. + */ + s->heap_len = 0, s->heap_max = HEAP_SIZE; + + for (n = 0; n < elems; n++) { + if (tree[n].Freq != 0) { + s->heap[++(s->heap_len)] = max_code = n; + s->depth[n] = 0; + } else { + tree[n].Len = 0; + } + } + + /* The pkzip format requires that at least one distance code exists, + * and that at least one bit should be sent even if there is only one + * possible code. So to avoid special checks later on we force at least + * two codes of non zero frequency. + */ + while (s->heap_len < 2) { + node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0); + tree[node].Freq = 1; + s->depth[node] = 0; + s->opt_len--; if (stree) s->static_len -= stree[node].Len; + /* node is 0 or 1 so it does not have extra bits */ + } + desc->max_code = max_code; + + /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree, + * establish sub-heaps of increasing lengths: + */ + for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n); + + /* Construct the Huffman tree by repeatedly combining the least two + * frequent nodes. + */ + node = elems; /* next internal node of the tree */ + do { + pqremove(s, tree, n); /* n = node of least frequency */ + m = s->heap[SMALLEST]; /* m = node of next least frequency */ + + s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */ + s->heap[--(s->heap_max)] = m; + + /* Create a new node father of n and m */ + tree[node].Freq = tree[n].Freq + tree[m].Freq; + s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ? + s->depth[n] : s->depth[m]) + 1); + tree[n].Dad = tree[m].Dad = (ush)node; +#ifdef DUMP_BL_TREE + if (tree == s->bl_tree) { + fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)", + node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq); + } +#endif + /* and insert the new node in the heap */ + s->heap[SMALLEST] = node++; + pqdownheap(s, tree, SMALLEST); + + } while (s->heap_len >= 2); + + s->heap[--(s->heap_max)] = s->heap[SMALLEST]; + + /* At this point, the fields freq and dad are set. We can now + * generate the bit lengths. + */ + gen_bitlen(s, (tree_desc *)desc); + + /* The field len is now set, we can generate the bit codes */ + gen_codes ((ct_data *)tree, max_code, s->bl_count); +} + +/* =========================================================================== + * Scan a literal or distance tree to determine the frequencies of the codes + * in the bit length tree. + */ +local void scan_tree (s, tree, max_code) + deflate_state *s; + ct_data *tree; /* the tree to be scanned */ + int max_code; /* and its largest code of non zero frequency */ +{ + int n; /* iterates over all tree elements */ + int prevlen = -1; /* last emitted length */ + int curlen; /* length of current code */ + int nextlen = tree[0].Len; /* length of next code */ + int count = 0; /* repeat count of the current code */ + int max_count = 7; /* max repeat count */ + int min_count = 4; /* min repeat count */ + + if (nextlen == 0) max_count = 138, min_count = 3; + tree[max_code+1].Len = (ush)0xffff; /* guard */ + + for (n = 0; n <= max_code; n++) { + curlen = nextlen; nextlen = tree[n+1].Len; + if (++count < max_count && curlen == nextlen) { + continue; + } else if (count < min_count) { + s->bl_tree[curlen].Freq += count; + } else if (curlen != 0) { + if (curlen != prevlen) s->bl_tree[curlen].Freq++; + s->bl_tree[REP_3_6].Freq++; + } else if (count <= 10) { + s->bl_tree[REPZ_3_10].Freq++; + } else { + s->bl_tree[REPZ_11_138].Freq++; + } + count = 0; prevlen = curlen; + if (nextlen == 0) { + max_count = 138, min_count = 3; + } else if (curlen == nextlen) { + max_count = 6, min_count = 3; + } else { + max_count = 7, min_count = 4; + } + } +} + +/* =========================================================================== + * Send a literal or distance tree in compressed form, using the codes in + * bl_tree. + */ +local void send_tree (s, tree, max_code) + deflate_state *s; + ct_data *tree; /* the tree to be scanned */ + int max_code; /* and its largest code of non zero frequency */ +{ + int n; /* iterates over all tree elements */ + int prevlen = -1; /* last emitted length */ + int curlen; /* length of current code */ + int nextlen = tree[0].Len; /* length of next code */ + int count = 0; /* repeat count of the current code */ + int max_count = 7; /* max repeat count */ + int min_count = 4; /* min repeat count */ + + /* tree[max_code+1].Len = -1; */ /* guard already set */ + if (nextlen == 0) max_count = 138, min_count = 3; + + for (n = 0; n <= max_code; n++) { + curlen = nextlen; nextlen = tree[n+1].Len; + if (++count < max_count && curlen == nextlen) { + continue; + } else if (count < min_count) { + do { send_code(s, curlen, s->bl_tree); } while (--count != 0); + + } else if (curlen != 0) { + if (curlen != prevlen) { + send_code(s, curlen, s->bl_tree); count--; + } + Assert(count >= 3 && count <= 6, " 3_6?"); + send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2); + + } else if (count <= 10) { + send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3); + + } else { + send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7); + } + count = 0; prevlen = curlen; + if (nextlen == 0) { + max_count = 138, min_count = 3; + } else if (curlen == nextlen) { + max_count = 6, min_count = 3; + } else { + max_count = 7, min_count = 4; + } + } +} + +/* =========================================================================== + * Construct the Huffman tree for the bit lengths and return the index in + * bl_order of the last bit length code to send. + */ +local int build_bl_tree(s) + deflate_state *s; +{ + int max_blindex; /* index of last bit length code of non zero freq */ + + /* Determine the bit length frequencies for literal and distance trees */ + scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code); + scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code); + + /* Build the bit length tree: */ + build_tree(s, (tree_desc *)(&(s->bl_desc))); + /* opt_len now includes the length of the tree representations, except + * the lengths of the bit lengths codes and the 5+5+4 bits for the counts. + */ + + /* Determine the number of bit length codes to send. The pkzip format + * requires that at least 4 bit length codes be sent. (appnote.txt says + * 3 but the actual value used is 4.) + */ + for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) { + if (s->bl_tree[bl_order[max_blindex]].Len != 0) break; + } + /* Update opt_len to include the bit length tree and counts */ + s->opt_len += 3*(max_blindex+1) + 5+5+4; + Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", + s->opt_len, s->static_len)); + + return max_blindex; +} + +/* =========================================================================== + * Send the header for a block using dynamic Huffman trees: the counts, the + * lengths of the bit length codes, the literal tree and the distance tree. + * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4. + */ +local void send_all_trees(s, lcodes, dcodes, blcodes) + deflate_state *s; + int lcodes, dcodes, blcodes; /* number of codes for each tree */ +{ + int rank; /* index in bl_order */ + + Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes"); + Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES, + "too many codes"); + Tracev((stderr, "\nbl counts: ")); + send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */ + send_bits(s, dcodes-1, 5); + send_bits(s, blcodes-4, 4); /* not -3 as stated in appnote.txt */ + for (rank = 0; rank < blcodes; rank++) { + Tracev((stderr, "\nbl code %2d ", bl_order[rank])); + send_bits(s, s->bl_tree[bl_order[rank]].Len, 3); + } + Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent)); + + send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */ + Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent)); + + send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */ + Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent)); +} + +/* =========================================================================== + * Send a stored block + */ +void _tr_stored_block(s, buf, stored_len, eof) + deflate_state *s; + charf *buf; /* input block */ + ulg stored_len; /* length of input block */ + int eof; /* true if this is the last block for a file */ +{ + send_bits(s, (STORED_BLOCK<<1)+eof, 3); /* send block type */ +#ifdef DEBUG + s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; + s->compressed_len += (stored_len + 4) << 3; +#endif + copy_block(s, buf, (unsigned)stored_len, 1); /* with header */ +} + +/* =========================================================================== + * Send one empty static block to give enough lookahead for inflate. + * This takes 10 bits, of which 7 may remain in the bit buffer. + * The current inflate code requires 9 bits of lookahead. If the + * last two codes for the previous block (real code plus EOB) were coded + * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode + * the last real code. In this case we send two empty static blocks instead + * of one. (There are no problems if the previous block is stored or fixed.) + * To simplify the code, we assume the worst case of last real code encoded + * on one bit only. + */ +void _tr_align(s) + deflate_state *s; +{ + send_bits(s, STATIC_TREES<<1, 3); + send_code(s, END_BLOCK, static_ltree); +#ifdef DEBUG + s->compressed_len += 10L; /* 3 for block type, 7 for EOB */ +#endif + bi_flush(s); + /* Of the 10 bits for the empty block, we have already sent + * (10 - bi_valid) bits. The lookahead for the last real code (before + * the EOB of the previous block) was thus at least one plus the length + * of the EOB plus what we have just sent of the empty static block. + */ + if (1 + s->last_eob_len + 10 - s->bi_valid < 9) { + send_bits(s, STATIC_TREES<<1, 3); + send_code(s, END_BLOCK, static_ltree); +#ifdef DEBUG + s->compressed_len += 10L; +#endif + bi_flush(s); + } + s->last_eob_len = 7; +} + +/* =========================================================================== + * Determine the best encoding for the current block: dynamic trees, static + * trees or store, and output the encoded block to the zip file. + */ +void _tr_flush_block(s, buf, stored_len, eof) + deflate_state *s; + charf *buf; /* input block, or NULL if too old */ + ulg stored_len; /* length of input block */ + int eof; /* true if this is the last block for a file */ +{ + ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ + int max_blindex = 0; /* index of last bit length code of non zero freq */ + + /* Build the Huffman trees unless a stored block is forced */ + if (s->level > 0) { + + /* Check if the file is binary or text */ + if (stored_len > 0 && s->strm->data_type == Z_UNKNOWN) + set_data_type(s); + + /* Construct the literal and distance trees */ + build_tree(s, (tree_desc *)(&(s->l_desc))); + Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len, + s->static_len)); + + build_tree(s, (tree_desc *)(&(s->d_desc))); + Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len, + s->static_len)); + /* At this point, opt_len and static_len are the total bit lengths of + * the compressed block data, excluding the tree representations. + */ + + /* Build the bit length tree for the above two trees, and get the index + * in bl_order of the last bit length code to send. + */ + max_blindex = build_bl_tree(s); + + /* Determine the best encoding. Compute the block lengths in bytes. */ + opt_lenb = (s->opt_len+3+7)>>3; + static_lenb = (s->static_len+3+7)>>3; + + Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", + opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, + s->last_lit)); + + if (static_lenb <= opt_lenb) opt_lenb = static_lenb; + + } else { + Assert(buf != (char*)0, "lost buf"); + opt_lenb = static_lenb = stored_len + 5; /* force a stored block */ + } + +#ifdef FORCE_STORED + if (buf != (char*)0) { /* force stored block */ +#else + if (stored_len+4 <= opt_lenb && buf != (char*)0) { + /* 4: two words for the lengths */ +#endif + /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. + * Otherwise we can't have processed more than WSIZE input bytes since + * the last block flush, because compression would have been + * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to + * transform a block into a stored block. + */ + _tr_stored_block(s, buf, stored_len, eof); + +#ifdef FORCE_STATIC + } else if (static_lenb >= 0) { /* force static trees */ +#else + } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) { +#endif + send_bits(s, (STATIC_TREES<<1)+eof, 3); + compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree); +#ifdef DEBUG + s->compressed_len += 3 + s->static_len; +#endif + } else { + send_bits(s, (DYN_TREES<<1)+eof, 3); + send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1, + max_blindex+1); + compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree); +#ifdef DEBUG + s->compressed_len += 3 + s->opt_len; +#endif + } + Assert (s->compressed_len == s->bits_sent, "bad compressed size"); + /* The above check is made mod 2^32, for files larger than 512 MB + * and uLong implemented on 32 bits. + */ + init_block(s); + + if (eof) { + bi_windup(s); +#ifdef DEBUG + s->compressed_len += 7; /* align on byte boundary */ +#endif + } + Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3, + s->compressed_len-7*eof)); +} + +/* =========================================================================== + * Save the match info and tally the frequency counts. Return true if + * the current block must be flushed. + */ +int _tr_tally (s, dist, lc) + deflate_state *s; + unsigned dist; /* distance of matched string */ + unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ +{ + s->d_buf[s->last_lit] = (ush)dist; + s->l_buf[s->last_lit++] = (uch)lc; + if (dist == 0) { + /* lc is the unmatched char */ + s->dyn_ltree[lc].Freq++; + } else { + s->matches++; + /* Here, lc is the match length - MIN_MATCH */ + dist--; /* dist = match distance - 1 */ + Assert((ush)dist < (ush)MAX_DIST(s) && + (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) && + (ush)d_code(dist) < (ush)D_CODES, "_tr_tally: bad match"); + + s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; + s->dyn_dtree[d_code(dist)].Freq++; + } + +#ifdef TRUNCATE_BLOCK + /* Try to guess if it is profitable to stop the current block here */ + if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { + /* Compute an upper bound for the compressed length */ + ulg out_length = (ulg)s->last_lit*8L; + ulg in_length = (ulg)((long)s->strstart - s->block_start); + int dcode; + for (dcode = 0; dcode < D_CODES; dcode++) { + out_length += (ulg)s->dyn_dtree[dcode].Freq * + (5L+extra_dbits[dcode]); + } + out_length >>= 3; + Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", + s->last_lit, in_length, out_length, + 100L - out_length*100L/in_length)); + if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; + } +#endif + return (s->last_lit == s->lit_bufsize-1); + /* We avoid equality with lit_bufsize because of wraparound at 64K + * on 16 bit machines and because stored blocks are restricted to + * 64K-1 bytes. + */ +} + +/* =========================================================================== + * Send the block data compressed using the given Huffman trees + */ +local void compress_block(s, ltree, dtree) + deflate_state *s; + ct_data *ltree; /* literal tree */ + ct_data *dtree; /* distance tree */ +{ + unsigned dist; /* distance of matched string */ + int lc; /* match length or unmatched char (if dist == 0) */ + unsigned lx = 0; /* running index in l_buf */ + unsigned code; /* the code to send */ + int extra; /* number of extra bits to send */ + + if (s->last_lit != 0) do { + dist = s->d_buf[lx]; + lc = s->l_buf[lx++]; + if (dist == 0) { + send_code(s, lc, ltree); /* send a literal byte */ + Tracecv(isgraph(lc), (stderr," '%c' ", lc)); + } else { + /* Here, lc is the match length - MIN_MATCH */ + code = _length_code[lc]; + send_code(s, code+LITERALS+1, ltree); /* send the length code */ + extra = extra_lbits[code]; + if (extra != 0) { + lc -= base_length[code]; + send_bits(s, lc, extra); /* send the extra length bits */ + } + dist--; /* dist is now the match distance - 1 */ + code = d_code(dist); + Assert (code < D_CODES, "bad d_code"); + + send_code(s, code, dtree); /* send the distance code */ + extra = extra_dbits[code]; + if (extra != 0) { + dist -= base_dist[code]; + send_bits(s, dist, extra); /* send the extra distance bits */ + } + } /* literal or match pair ? */ + + /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ + Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, + "pendingBuf overflow"); + + } while (lx < s->last_lit); + + send_code(s, END_BLOCK, ltree); + s->last_eob_len = ltree[END_BLOCK].Len; +} + +/* =========================================================================== + * Set the data type to BINARY or TEXT, using a crude approximation: + * set it to Z_TEXT if all symbols are either printable characters (33 to 255) + * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise. + * IN assertion: the fields Freq of dyn_ltree are set. + */ +local void set_data_type(s) + deflate_state *s; +{ + int n; + + for (n = 0; n < 9; n++) + if (s->dyn_ltree[n].Freq != 0) + break; + if (n == 9) + for (n = 14; n < 32; n++) + if (s->dyn_ltree[n].Freq != 0) + break; + s->strm->data_type = (n == 32) ? Z_TEXT : Z_BINARY; +} + +/* =========================================================================== + * Reverse the first len bits of a code, using straightforward code (a faster + * method would use a table) + * IN assertion: 1 <= len <= 15 + */ +local unsigned bi_reverse(code, len) + unsigned code; /* the value to invert */ + int len; /* its bit length */ +{ + register unsigned res = 0; + do { + res |= code & 1; + code >>= 1, res <<= 1; + } while (--len > 0); + return res >> 1; +} + +/* =========================================================================== + * Flush the bit buffer, keeping at most 7 bits in it. + */ +local void bi_flush(s) + deflate_state *s; +{ + if (s->bi_valid == 16) { + put_short(s, s->bi_buf); + s->bi_buf = 0; + s->bi_valid = 0; + } else if (s->bi_valid >= 8) { + put_byte(s, (Byte)s->bi_buf); + s->bi_buf >>= 8; + s->bi_valid -= 8; + } +} + +/* =========================================================================== + * Flush the bit buffer and align the output on a byte boundary + */ +local void bi_windup(s) + deflate_state *s; +{ + if (s->bi_valid > 8) { + put_short(s, s->bi_buf); + } else if (s->bi_valid > 0) { + put_byte(s, (Byte)s->bi_buf); + } + s->bi_buf = 0; + s->bi_valid = 0; +#ifdef DEBUG + s->bits_sent = (s->bits_sent+7) & ~7; +#endif +} + +/* =========================================================================== + * Copy a stored block, storing first the length and its + * one's complement if requested. + */ +local void copy_block(s, buf, len, header) + deflate_state *s; + charf *buf; /* the input data */ + unsigned len; /* its length */ + int header; /* true if block header must be written */ +{ + bi_windup(s); /* align on byte boundary */ + s->last_eob_len = 8; /* enough lookahead for inflate */ + + if (header) { + put_short(s, (ush)len); + put_short(s, (ush)~len); +#ifdef DEBUG + s->bits_sent += 2*16; +#endif + } +#ifdef DEBUG + s->bits_sent += (ulg)len<<3; +#endif + while (len--) { + put_byte(s, *buf++); + } +} diff --git a/zlib/trees.h b/zlib/trees.h new file mode 100644 index 0000000000..1ca868b848 --- /dev/null +++ b/zlib/trees.h @@ -0,0 +1,128 @@ +/* header created automatically with -DGEN_TREES_H */ + +local const ct_data static_ltree[L_CODES+2] = { +{{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}}, +{{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}}, +{{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}}, +{{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}}, +{{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}}, +{{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}}, +{{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}}, +{{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}}, +{{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}}, +{{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}}, +{{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}}, +{{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}}, +{{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}}, +{{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}}, +{{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}}, +{{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}}, +{{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}}, +{{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}}, +{{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}}, +{{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}}, +{{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}}, +{{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}}, +{{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}}, +{{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}}, +{{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}}, +{{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}}, +{{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}}, +{{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}}, +{{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}}, +{{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}}, +{{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}}, +{{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}}, +{{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}}, +{{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}}, +{{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}}, +{{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}}, +{{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}}, +{{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}}, +{{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}}, +{{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}}, +{{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}}, +{{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}}, +{{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}}, +{{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}}, +{{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}}, +{{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}}, +{{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}}, +{{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}}, +{{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}}, +{{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}}, +{{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}}, +{{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}}, +{{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}}, +{{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}}, +{{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}}, +{{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}}, +{{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}}, +{{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}} +}; + +local const ct_data static_dtree[D_CODES] = { +{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}}, +{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}}, +{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}}, +{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}}, +{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}}, +{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} +}; + +const uch _dist_code[DIST_CODE_LEN] = { + 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, + 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, +10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, +11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, +12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, +13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, +13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, +14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, +14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, +14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, +15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, +15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, +15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17, +18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, +23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, +24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, +26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, +26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, +27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, +27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, +28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, +28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, +28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, +29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, +29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, +29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 +}; + +const uch _length_code[MAX_MATCH-MIN_MATCH+1]= { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, +13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, +17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, +19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, +21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, +22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, +23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, +24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, +25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, +25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, +26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, +26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, +27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28 +}; + +local const int base_length[LENGTH_CODES] = { +0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, +64, 80, 96, 112, 128, 160, 192, 224, 0 +}; + +local const int base_dist[D_CODES] = { + 0, 1, 2, 3, 4, 6, 8, 12, 16, 24, + 32, 48, 64, 96, 128, 192, 256, 384, 512, 768, + 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576 +}; + diff --git a/zlib/uncompr.c b/zlib/uncompr.c new file mode 100644 index 0000000000..ad6db0a67c --- /dev/null +++ b/zlib/uncompr.c @@ -0,0 +1,61 @@ +/* uncompr.c -- decompress a memory buffer + * Copyright (C) 1995-2003 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#define ZLIB_INTERNAL +#include "zlib.h" + +/* =========================================================================== + Decompresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be large enough to hold the + entire uncompressed data. (The size of the uncompressed data must have + been saved previously by the compressor and transmitted to the decompressor + by some mechanism outside the scope of this compression library.) + Upon exit, destLen is the actual size of the compressed buffer. + This function can be used to decompress a whole file at once if the + input file is mmap'ed. + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer, or Z_DATA_ERROR if the input data was corrupted. +*/ +int ZEXPORT uncompress (dest, destLen, source, sourceLen) + Bytef *dest; + uLongf *destLen; + const Bytef *source; + uLong sourceLen; +{ + z_stream stream; + int err; + + stream.next_in = (Bytef*)source; + stream.avail_in = (uInt)sourceLen; + /* Check for source > 64K on 16-bit machine: */ + if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; + + stream.next_out = dest; + stream.avail_out = (uInt)*destLen; + if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; + + stream.zalloc = (alloc_func)0; + stream.zfree = (free_func)0; + + err = inflateInit(&stream); + if (err != Z_OK) return err; + + err = inflate(&stream, Z_FINISH); + if (err != Z_STREAM_END) { + inflateEnd(&stream); + if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) + return Z_DATA_ERROR; + return err; + } + *destLen = stream.total_out; + + err = inflateEnd(&stream); + return err; +} diff --git a/zlib/zconf.h b/zlib/zconf.h new file mode 100644 index 0000000000..e3b0c962e3 --- /dev/null +++ b/zlib/zconf.h @@ -0,0 +1,332 @@ +/* zconf.h -- configuration of the zlib compression library + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#ifndef ZCONF_H +#define ZCONF_H + +/* + * If you *really* need a unique prefix for all types and library functions, + * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. + */ +#ifdef Z_PREFIX +# define deflateInit_ z_deflateInit_ +# define deflate z_deflate +# define deflateEnd z_deflateEnd +# define inflateInit_ z_inflateInit_ +# define inflate z_inflate +# define inflateEnd z_inflateEnd +# define deflateInit2_ z_deflateInit2_ +# define deflateSetDictionary z_deflateSetDictionary +# define deflateCopy z_deflateCopy +# define deflateReset z_deflateReset +# define deflateParams z_deflateParams +# define deflateBound z_deflateBound +# define deflatePrime z_deflatePrime +# define inflateInit2_ z_inflateInit2_ +# define inflateSetDictionary z_inflateSetDictionary +# define inflateSync z_inflateSync +# define inflateSyncPoint z_inflateSyncPoint +# define inflateCopy z_inflateCopy +# define inflateReset z_inflateReset +# define inflateBack z_inflateBack +# define inflateBackEnd z_inflateBackEnd +# define compress z_compress +# define compress2 z_compress2 +# define compressBound z_compressBound +# define uncompress z_uncompress +# define adler32 z_adler32 +# define crc32 z_crc32 +# define get_crc_table z_get_crc_table +# define zError z_zError + +# define alloc_func z_alloc_func +# define free_func z_free_func +# define in_func z_in_func +# define out_func z_out_func +# define Byte z_Byte +# define uInt z_uInt +# define uLong z_uLong +# define Bytef z_Bytef +# define charf z_charf +# define intf z_intf +# define uIntf z_uIntf +# define uLongf z_uLongf +# define voidpf z_voidpf +# define voidp z_voidp +#endif + +#if defined(__MSDOS__) && !defined(MSDOS) +# define MSDOS +#endif +#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) +# define OS2 +#endif +#if defined(_WINDOWS) && !defined(WINDOWS) +# define WINDOWS +#endif +#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) +# ifndef WIN32 +# define WIN32 +# endif +#endif +#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) +# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) +# ifndef SYS16BIT +# define SYS16BIT +# endif +# endif +#endif + +/* + * Compile with -DMAXSEG_64K if the alloc function cannot allocate more + * than 64k bytes at a time (needed on systems with 16-bit int). + */ +#ifdef SYS16BIT +# define MAXSEG_64K +#endif +#ifdef MSDOS +# define UNALIGNED_OK +#endif + +#ifdef __STDC_VERSION__ +# ifndef STDC +# define STDC +# endif +# if __STDC_VERSION__ >= 199901L +# ifndef STDC99 +# define STDC99 +# endif +# endif +#endif +#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) +# define STDC +#endif +#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) +# define STDC +#endif +#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) +# define STDC +#endif +#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) +# define STDC +#endif + +#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ +# define STDC +#endif + +#ifndef STDC +# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ +# define const /* note: need a more gentle solution here */ +# endif +#endif + +/* Some Mac compilers merge all .h files incorrectly: */ +#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) +# define NO_DUMMY_DECL +#endif + +/* Maximum value for memLevel in deflateInit2 */ +#ifndef MAX_MEM_LEVEL +# ifdef MAXSEG_64K +# define MAX_MEM_LEVEL 8 +# else +# define MAX_MEM_LEVEL 9 +# endif +#endif + +/* Maximum value for windowBits in deflateInit2 and inflateInit2. + * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files + * created by gzip. (Files created by minigzip can still be extracted by + * gzip.) + */ +#ifndef MAX_WBITS +# define MAX_WBITS 15 /* 32K LZ77 window */ +#endif + +/* The memory requirements for deflate are (in bytes): + (1 << (windowBits+2)) + (1 << (memLevel+9)) + that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) + plus a few kilobytes for small objects. For example, if you want to reduce + the default memory requirements from 256K to 128K, compile with + make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" + Of course this will generally degrade compression (there's no free lunch). + + The memory requirements for inflate are (in bytes) 1 << windowBits + that is, 32K for windowBits=15 (default value) plus a few kilobytes + for small objects. +*/ + + /* Type declarations */ + +#ifndef OF /* function prototypes */ +# ifdef STDC +# define OF(args) args +# else +# define OF(args) () +# endif +#endif + +/* The following definitions for FAR are needed only for MSDOS mixed + * model programming (small or medium model with some far allocations). + * This was tested only with MSC; for other MSDOS compilers you may have + * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, + * just define FAR to be empty. + */ +#ifdef SYS16BIT +# if defined(M_I86SM) || defined(M_I86MM) + /* MSC small or medium model */ +# define SMALL_MEDIUM +# ifdef _MSC_VER +# define FAR _far +# else +# define FAR far +# endif +# endif +# if (defined(__SMALL__) || defined(__MEDIUM__)) + /* Turbo C small or medium model */ +# define SMALL_MEDIUM +# ifdef __BORLANDC__ +# define FAR _far +# else +# define FAR far +# endif +# endif +#endif + +#if defined(WINDOWS) || defined(WIN32) + /* If building or using zlib as a DLL, define ZLIB_DLL. + * This is not mandatory, but it offers a little performance increase. + */ +# ifdef ZLIB_DLL +# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) +# ifdef ZLIB_INTERNAL +# define ZEXTERN extern __declspec(dllexport) +# else +# define ZEXTERN extern __declspec(dllimport) +# endif +# endif +# endif /* ZLIB_DLL */ + /* If building or using zlib with the WINAPI/WINAPIV calling convention, + * define ZLIB_WINAPI. + * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. + */ +# ifdef ZLIB_WINAPI +# ifdef FAR +# undef FAR +# endif +# include + /* No need for _export, use ZLIB.DEF instead. */ + /* For complete Windows compatibility, use WINAPI, not __stdcall. */ +# define ZEXPORT WINAPI +# ifdef WIN32 +# define ZEXPORTVA WINAPIV +# else +# define ZEXPORTVA FAR CDECL +# endif +# endif +#endif + +#if defined (__BEOS__) +# ifdef ZLIB_DLL +# ifdef ZLIB_INTERNAL +# define ZEXPORT __declspec(dllexport) +# define ZEXPORTVA __declspec(dllexport) +# else +# define ZEXPORT __declspec(dllimport) +# define ZEXPORTVA __declspec(dllimport) +# endif +# endif +#endif + +#ifndef ZEXTERN +# define ZEXTERN extern +#endif +#ifndef ZEXPORT +# define ZEXPORT +#endif +#ifndef ZEXPORTVA +# define ZEXPORTVA +#endif + +#ifndef FAR +# define FAR +#endif + +#if !defined(__MACTYPES__) +typedef unsigned char Byte; /* 8 bits */ +#endif +typedef unsigned int uInt; /* 16 bits or more */ +typedef unsigned long uLong; /* 32 bits or more */ + +#ifdef SMALL_MEDIUM + /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ +# define Bytef Byte FAR +#else + typedef Byte FAR Bytef; +#endif +typedef char FAR charf; +typedef int FAR intf; +typedef uInt FAR uIntf; +typedef uLong FAR uLongf; + +#ifdef STDC + typedef void const *voidpc; + typedef void FAR *voidpf; + typedef void *voidp; +#else + typedef Byte const *voidpc; + typedef Byte FAR *voidpf; + typedef Byte *voidp; +#endif + +#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ +# include /* for off_t */ +# include /* for SEEK_* and off_t */ +# ifdef VMS +# include /* for off_t */ +# endif +# define z_off_t off_t +#endif +#ifndef SEEK_SET +# define SEEK_SET 0 /* Seek from beginning of file. */ +# define SEEK_CUR 1 /* Seek from current position. */ +# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ +#endif +#ifndef z_off_t +# define z_off_t long +#endif + +#if defined(__OS400__) +# define NO_vsnprintf +#endif + +#if defined(__MVS__) +# define NO_vsnprintf +# ifdef FAR +# undef FAR +# endif +#endif + +/* MVS linker does not support external names larger than 8 bytes */ +#if defined(__MVS__) +# pragma map(deflateInit_,"DEIN") +# pragma map(deflateInit2_,"DEIN2") +# pragma map(deflateEnd,"DEEND") +# pragma map(deflateBound,"DEBND") +# pragma map(inflateInit_,"ININ") +# pragma map(inflateInit2_,"ININ2") +# pragma map(inflateEnd,"INEND") +# pragma map(inflateSync,"INSY") +# pragma map(inflateSetDictionary,"INSEDI") +# pragma map(compressBound,"CMBND") +# pragma map(inflate_table,"INTABL") +# pragma map(inflate_fast,"INFA") +# pragma map(inflate_copyright,"INCOPY") +#endif + +#endif /* ZCONF_H */ diff --git a/zlib/zlib.3 b/zlib/zlib.3 new file mode 100644 index 0000000000..f6b0da1176 --- /dev/null +++ b/zlib/zlib.3 @@ -0,0 +1,159 @@ +.TH ZLIB 3 "18 July 2005" +.SH NAME +zlib \- compression/decompression library +.SH SYNOPSIS +[see +.I zlib.h +for full description] +.SH DESCRIPTION +The +.I zlib +library is a general purpose data compression library. +The code is thread safe. +It provides in-memory compression and decompression functions, +including integrity checks of the uncompressed data. +This version of the library supports only one compression method (deflation) +but other algorithms will be added later +and will have the same stream interface. +.LP +Compression can be done in a single step if the buffers are large enough +(for example if an input file is mmap'ed), +or can be done by repeated calls of the compression function. +In the latter case, +the application must provide more input and/or consume the output +(providing more output space) before each call. +.LP +The library also supports reading and writing files in +.IR gzip (1) +(.gz) format +with an interface similar to that of stdio. +.LP +The library does not install any signal handler. +The decoder checks the consistency of the compressed data, +so the library should never crash even in case of corrupted input. +.LP +All functions of the compression library are documented in the file +.IR zlib.h . +The distribution source includes examples of use of the library +in the files +.I example.c +and +.IR minigzip.c . +.LP +Changes to this version are documented in the file +.I ChangeLog +that accompanies the source, +and are concerned primarily with bug fixes and portability enhancements. +.LP +A Java implementation of +.I zlib +is available in the Java Development Kit 1.1: +.IP +http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html +.LP +A Perl interface to +.IR zlib , +written by Paul Marquess (pmqs@cpan.org), +is available at CPAN (Comprehensive Perl Archive Network) sites, +including: +.IP +http://www.cpan.org/modules/by-module/Compress/ +.LP +A Python interface to +.IR zlib , +written by A.M. Kuchling (amk@magnet.com), +is available in Python 1.5 and later versions: +.IP +http://www.python.org/doc/lib/module-zlib.html +.LP +A +.I zlib +binding for +.IR tcl (1), +written by Andreas Kupries (a.kupries@westend.com), +is availlable at: +.IP +http://www.westend.com/~kupries/doc/trf/man/man.html +.LP +An experimental package to read and write files in .zip format, +written on top of +.I zlib +by Gilles Vollant (info@winimage.com), +is available at: +.IP +http://www.winimage.com/zLibDll/unzip.html +and also in the +.I contrib/minizip +directory of the main +.I zlib +web site. +.SH "SEE ALSO" +The +.I zlib +web site can be found at either of these locations: +.IP +http://www.zlib.org +.br +http://www.gzip.org/zlib/ +.LP +The data format used by the zlib library is described by RFC +(Request for Comments) 1950 to 1952 in the files: +.IP +http://www.ietf.org/rfc/rfc1950.txt (concerning zlib format) +.br +http://www.ietf.org/rfc/rfc1951.txt (concerning deflate format) +.br +http://www.ietf.org/rfc/rfc1952.txt (concerning gzip format) +.LP +These documents are also available in other formats from: +.IP +ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html +.LP +Mark Nelson (markn@ieee.org) wrote an article about +.I zlib +for the Jan. 1997 issue of Dr. Dobb's Journal; +a copy of the article is available at: +.IP +http://dogma.net/markn/articles/zlibtool/zlibtool.htm +.SH "REPORTING PROBLEMS" +Before reporting a problem, +please check the +.I zlib +web site to verify that you have the latest version of +.IR zlib ; +otherwise, +obtain the latest version and see if the problem still exists. +Please read the +.I zlib +FAQ at: +.IP +http://www.gzip.org/zlib/zlib_faq.html +.LP +before asking for help. +Send questions and/or comments to zlib@gzip.org, +or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). +.SH AUTHORS +Version 1.2.3 +Copyright (C) 1995-2005 Jean-loup Gailly (jloup@gzip.org) +and Mark Adler (madler@alumni.caltech.edu). +.LP +This software is provided "as-is," +without any express or implied warranty. +In no event will the authors be held liable for any damages +arising from the use of this software. +See the distribution directory with respect to requirements +governing redistribution. +The deflate format used by +.I zlib +was defined by Phil Katz. +The deflate and +.I zlib +specifications were written by L. Peter Deutsch. +Thanks to all the people who reported problems and suggested various +improvements in +.IR zlib ; +who are too numerous to cite here. +.LP +UNIX manual page by R. P. C. Rodgers, +U.S. National Library of Medicine (rodgers@nlm.nih.gov). +.\" end of man page diff --git a/zlib/zlib.h b/zlib/zlib.h new file mode 100644 index 0000000000..62d0e4675b --- /dev/null +++ b/zlib/zlib.h @@ -0,0 +1,1357 @@ +/* zlib.h -- interface of the 'zlib' general purpose compression library + version 1.2.3, July 18th, 2005 + + Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + + The data format used by the zlib library is described by RFCs (Request for + Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt + (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). +*/ + +#ifndef ZLIB_H +#define ZLIB_H + +#include "zconf.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define ZLIB_VERSION "1.2.3" +#define ZLIB_VERNUM 0x1230 + +/* + The 'zlib' compression library provides in-memory compression and + decompression functions, including integrity checks of the uncompressed + data. This version of the library supports only one compression method + (deflation) but other algorithms will be added later and will have the same + stream interface. + + Compression can be done in a single step if the buffers are large + enough (for example if an input file is mmap'ed), or can be done by + repeated calls of the compression function. In the latter case, the + application must provide more input and/or consume the output + (providing more output space) before each call. + + The compressed data format used by default by the in-memory functions is + the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped + around a deflate stream, which is itself documented in RFC 1951. + + The library also supports reading and writing files in gzip (.gz) format + with an interface similar to that of stdio using the functions that start + with "gz". The gzip format is different from the zlib format. gzip is a + gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. + + This library can optionally read and write gzip streams in memory as well. + + The zlib format was designed to be compact and fast for use in memory + and on communications channels. The gzip format was designed for single- + file compression on file systems, has a larger header than zlib to maintain + directory information, and uses a different, slower check method than zlib. + + The library does not install any signal handler. The decoder checks + the consistency of the compressed data, so the library should never + crash even in case of corrupted input. +*/ + +typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); +typedef void (*free_func) OF((voidpf opaque, voidpf address)); + +struct internal_state; + +typedef struct z_stream_s { + Bytef *next_in; /* next input byte */ + uInt avail_in; /* number of bytes available at next_in */ + uLong total_in; /* total nb of input bytes read so far */ + + Bytef *next_out; /* next output byte should be put there */ + uInt avail_out; /* remaining free space at next_out */ + uLong total_out; /* total nb of bytes output so far */ + + char *msg; /* last error message, NULL if no error */ + struct internal_state FAR *state; /* not visible by applications */ + + alloc_func zalloc; /* used to allocate the internal state */ + free_func zfree; /* used to free the internal state */ + voidpf opaque; /* private data object passed to zalloc and zfree */ + + int data_type; /* best guess about the data type: binary or text */ + uLong adler; /* adler32 value of the uncompressed data */ + uLong reserved; /* reserved for future use */ +} z_stream; + +typedef z_stream FAR *z_streamp; + +/* + gzip header information passed to and from zlib routines. See RFC 1952 + for more details on the meanings of these fields. +*/ +typedef struct gz_header_s { + int text; /* true if compressed data believed to be text */ + uLong time; /* modification time */ + int xflags; /* extra flags (not used when writing a gzip file) */ + int os; /* operating system */ + Bytef *extra; /* pointer to extra field or Z_NULL if none */ + uInt extra_len; /* extra field length (valid if extra != Z_NULL) */ + uInt extra_max; /* space at extra (only when reading header) */ + Bytef *name; /* pointer to zero-terminated file name or Z_NULL */ + uInt name_max; /* space at name (only when reading header) */ + Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */ + uInt comm_max; /* space at comment (only when reading header) */ + int hcrc; /* true if there was or will be a header crc */ + int done; /* true when done reading gzip header (not used + when writing a gzip file) */ +} gz_header; + +typedef gz_header FAR *gz_headerp; + +/* + The application must update next_in and avail_in when avail_in has + dropped to zero. It must update next_out and avail_out when avail_out + has dropped to zero. The application must initialize zalloc, zfree and + opaque before calling the init function. All other fields are set by the + compression library and must not be updated by the application. + + The opaque value provided by the application will be passed as the first + parameter for calls of zalloc and zfree. This can be useful for custom + memory management. The compression library attaches no meaning to the + opaque value. + + zalloc must return Z_NULL if there is not enough memory for the object. + If zlib is used in a multi-threaded application, zalloc and zfree must be + thread safe. + + On 16-bit systems, the functions zalloc and zfree must be able to allocate + exactly 65536 bytes, but will not be required to allocate more than this + if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, + pointers returned by zalloc for objects of exactly 65536 bytes *must* + have their offset normalized to zero. The default allocation function + provided by this library ensures this (see zutil.c). To reduce memory + requirements and avoid any allocation of 64K objects, at the expense of + compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h). + + The fields total_in and total_out can be used for statistics or + progress reports. After compression, total_in holds the total size of + the uncompressed data and may be saved for use in the decompressor + (particularly if the decompressor wants to decompress everything in + a single step). +*/ + + /* constants */ + +#define Z_NO_FLUSH 0 +#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */ +#define Z_SYNC_FLUSH 2 +#define Z_FULL_FLUSH 3 +#define Z_FINISH 4 +#define Z_BLOCK 5 +/* Allowed flush values; see deflate() and inflate() below for details */ + +#define Z_OK 0 +#define Z_STREAM_END 1 +#define Z_NEED_DICT 2 +#define Z_ERRNO (-1) +#define Z_STREAM_ERROR (-2) +#define Z_DATA_ERROR (-3) +#define Z_MEM_ERROR (-4) +#define Z_BUF_ERROR (-5) +#define Z_VERSION_ERROR (-6) +/* Return codes for the compression/decompression functions. Negative + * values are errors, positive values are used for special but normal events. + */ + +#define Z_NO_COMPRESSION 0 +#define Z_BEST_SPEED 1 +#define Z_BEST_COMPRESSION 9 +#define Z_DEFAULT_COMPRESSION (-1) +/* compression levels */ + +#define Z_FILTERED 1 +#define Z_HUFFMAN_ONLY 2 +#define Z_RLE 3 +#define Z_FIXED 4 +#define Z_DEFAULT_STRATEGY 0 +/* compression strategy; see deflateInit2() below for details */ + +#define Z_BINARY 0 +#define Z_TEXT 1 +#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */ +#define Z_UNKNOWN 2 +/* Possible values of the data_type field (though see inflate()) */ + +#define Z_DEFLATED 8 +/* The deflate compression method (the only one supported in this version) */ + +#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ + +#define zlib_version zlibVersion() +/* for compatibility with versions < 1.0.2 */ + + /* basic functions */ + +ZEXTERN const char * ZEXPORT zlibVersion OF((void)); +/* The application can compare zlibVersion and ZLIB_VERSION for consistency. + If the first character differs, the library code actually used is + not compatible with the zlib.h header file used by the application. + This check is automatically made by deflateInit and inflateInit. + */ + +/* +ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); + + Initializes the internal stream state for compression. The fields + zalloc, zfree and opaque must be initialized before by the caller. + If zalloc and zfree are set to Z_NULL, deflateInit updates them to + use default allocation functions. + + The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: + 1 gives best speed, 9 gives best compression, 0 gives no compression at + all (the input data is simply copied a block at a time). + Z_DEFAULT_COMPRESSION requests a default compromise between speed and + compression (currently equivalent to level 6). + + deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if level is not a valid compression level, + Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible + with the version assumed by the caller (ZLIB_VERSION). + msg is set to null if there is no error message. deflateInit does not + perform any compression: this will be done by deflate(). +*/ + + +ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); +/* + deflate compresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce some + output latency (reading input without producing any output) except when + forced to flush. + + The detailed semantics are as follows. deflate performs one or both of the + following actions: + + - Compress more input starting at next_in and update next_in and avail_in + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in and avail_in are updated and + processing will resume at this point for the next call of deflate(). + + - Provide more output starting at next_out and update next_out and avail_out + accordingly. This action is forced if the parameter flush is non zero. + Forcing flush frequently degrades the compression ratio, so this parameter + should be set only when necessary (in interactive applications). + Some output may be provided even if flush is not set. + + Before the call of deflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming + more output, and updating avail_in or avail_out accordingly; avail_out + should never be zero before the call. The application can consume the + compressed output when it wants, for example when the output buffer is full + (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK + and with zero avail_out, it must be called again after making room in the + output buffer because there might be more output pending. + + Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to + decide how much data to accumualte before producing output, in order to + maximize compression. + + If the parameter flush is set to Z_SYNC_FLUSH, all pending output is + flushed to the output buffer and the output is aligned on a byte boundary, so + that the decompressor can get all input data available so far. (In particular + avail_in is zero after the call if enough output space has been provided + before the call.) Flushing may degrade compression for some compression + algorithms and so it should be used only when necessary. + + If flush is set to Z_FULL_FLUSH, all output is flushed as with + Z_SYNC_FLUSH, and the compression state is reset so that decompression can + restart from this point if previous compressed data has been damaged or if + random access is desired. Using Z_FULL_FLUSH too often can seriously degrade + compression. + + If deflate returns with avail_out == 0, this function must be called again + with the same value of the flush parameter and more output space (updated + avail_out), until the flush is complete (deflate returns with non-zero + avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that + avail_out is greater than six to avoid repeated flush markers due to + avail_out == 0 on return. + + If the parameter flush is set to Z_FINISH, pending input is processed, + pending output is flushed and deflate returns with Z_STREAM_END if there + was enough output space; if deflate returns with Z_OK, this function must be + called again with Z_FINISH and more output space (updated avail_out) but no + more input data, until it returns with Z_STREAM_END or an error. After + deflate has returned Z_STREAM_END, the only possible operations on the + stream are deflateReset or deflateEnd. + + Z_FINISH can be used immediately after deflateInit if all the compression + is to be done in a single step. In this case, avail_out must be at least + the value returned by deflateBound (see below). If deflate does not return + Z_STREAM_END, then it must be called again as described above. + + deflate() sets strm->adler to the adler32 checksum of all input read + so far (that is, total_in bytes). + + deflate() may update strm->data_type if it can make a good guess about + the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered + binary. This field is only for information purposes and does not affect + the compression algorithm in any manner. + + deflate() returns Z_OK if some progress has been made (more input + processed or more output produced), Z_STREAM_END if all input has been + consumed and all output has been produced (only when flush is set to + Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example + if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible + (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not + fatal, and deflate() can be called again with more input and more output + space to continue compressing. +*/ + + +ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); +/* + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any + pending output. + + deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the + stream state was inconsistent, Z_DATA_ERROR if the stream was freed + prematurely (some input or output was discarded). In the error case, + msg may be set but then points to a static string (which must not be + deallocated). +*/ + + +/* +ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); + + Initializes the internal stream state for decompression. The fields + next_in, avail_in, zalloc, zfree and opaque must be initialized before by + the caller. If next_in is not Z_NULL and avail_in is large enough (the exact + value depends on the compression method), inflateInit determines the + compression method from the zlib header and allocates all data structures + accordingly; otherwise the allocation will be deferred to the first call of + inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to + use default allocation functions. + + inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_VERSION_ERROR if the zlib library version is incompatible with the + version assumed by the caller. msg is set to null if there is no error + message. inflateInit does not perform any decompression apart from reading + the zlib header if present: this will be done by inflate(). (So next_in and + avail_in may be modified, but next_out and avail_out are unchanged.) +*/ + + +ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); +/* + inflate decompresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce + some output latency (reading input without producing any output) except when + forced to flush. + + The detailed semantics are as follows. inflate performs one or both of the + following actions: + + - Decompress more input starting at next_in and update next_in and avail_in + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in is updated and processing + will resume at this point for the next call of inflate(). + + - Provide more output starting at next_out and update next_out and avail_out + accordingly. inflate() provides as much output as possible, until there + is no more input data or no more space in the output buffer (see below + about the flush parameter). + + Before the call of inflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming + more output, and updating the next_* and avail_* values accordingly. + The application can consume the uncompressed output when it wants, for + example when the output buffer is full (avail_out == 0), or after each + call of inflate(). If inflate returns Z_OK and with zero avail_out, it + must be called again after making room in the output buffer because there + might be more output pending. + + The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, + Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much + output as possible to the output buffer. Z_BLOCK requests that inflate() stop + if and when it gets to the next deflate block boundary. When decoding the + zlib or gzip format, this will cause inflate() to return immediately after + the header and before the first block. When doing a raw inflate, inflate() + will go ahead and process the first block, and will return when it gets to + the end of that block, or when it runs out of data. + + The Z_BLOCK option assists in appending to or combining deflate streams. + Also to assist in this, on return inflate() will set strm->data_type to the + number of unused bits in the last byte taken from strm->next_in, plus 64 + if inflate() is currently decoding the last block in the deflate stream, + plus 128 if inflate() returned immediately after decoding an end-of-block + code or decoding the complete header up to just before the first byte of the + deflate stream. The end-of-block will not be indicated until all of the + uncompressed data from that block has been written to strm->next_out. The + number of unused bits may in general be greater than seven, except when + bit 7 of data_type is set, in which case the number of unused bits will be + less than eight. + + inflate() should normally be called until it returns Z_STREAM_END or an + error. However if all decompression is to be performed in a single step + (a single call of inflate), the parameter flush should be set to + Z_FINISH. In this case all pending input is processed and all pending + output is flushed; avail_out must be large enough to hold all the + uncompressed data. (The size of the uncompressed data may have been saved + by the compressor for this purpose.) The next operation on this stream must + be inflateEnd to deallocate the decompression state. The use of Z_FINISH + is never required, but can be used to inform inflate that a faster approach + may be used for the single inflate() call. + + In this implementation, inflate() always flushes as much output as + possible to the output buffer, and always uses the faster approach on the + first call. So the only effect of the flush parameter in this implementation + is on the return value of inflate(), as noted below, or when it returns early + because Z_BLOCK is used. + + If a preset dictionary is needed after this call (see inflateSetDictionary + below), inflate sets strm->adler to the adler32 checksum of the dictionary + chosen by the compressor and returns Z_NEED_DICT; otherwise it sets + strm->adler to the adler32 checksum of all output produced so far (that is, + total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described + below. At the end of the stream, inflate() checks that its computed adler32 + checksum is equal to that saved by the compressor and returns Z_STREAM_END + only if the checksum is correct. + + inflate() will decompress and check either zlib-wrapped or gzip-wrapped + deflate data. The header type is detected automatically. Any information + contained in the gzip header is not retained, so applications that need that + information should instead use raw inflate, see inflateInit2() below, or + inflateBack() and perform their own processing of the gzip header and + trailer. + + inflate() returns Z_OK if some progress has been made (more input processed + or more output produced), Z_STREAM_END if the end of the compressed data has + been reached and all uncompressed output has been produced, Z_NEED_DICT if a + preset dictionary is needed at this point, Z_DATA_ERROR if the input data was + corrupted (input stream not conforming to the zlib format or incorrect check + value), Z_STREAM_ERROR if the stream structure was inconsistent (for example + if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory, + Z_BUF_ERROR if no progress is possible or if there was not enough room in the + output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and + inflate() can be called again with more input and more output space to + continue decompressing. If Z_DATA_ERROR is returned, the application may then + call inflateSync() to look for a good compression block if a partial recovery + of the data is desired. +*/ + + +ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); +/* + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any + pending output. + + inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state + was inconsistent. In the error case, msg may be set but then points to a + static string (which must not be deallocated). +*/ + + /* Advanced functions */ + +/* + The following functions are needed only in some special applications. +*/ + +/* +ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, + int level, + int method, + int windowBits, + int memLevel, + int strategy)); + + This is another version of deflateInit with more compression options. The + fields next_in, zalloc, zfree and opaque must be initialized before by + the caller. + + The method parameter is the compression method. It must be Z_DEFLATED in + this version of the library. + + The windowBits parameter is the base two logarithm of the window size + (the size of the history buffer). It should be in the range 8..15 for this + version of the library. Larger values of this parameter result in better + compression at the expense of memory usage. The default value is 15 if + deflateInit is used instead. + + windowBits can also be -8..-15 for raw deflate. In this case, -windowBits + determines the window size. deflate() will then generate raw deflate data + with no zlib header or trailer, and will not compute an adler32 check value. + + windowBits can also be greater than 15 for optional gzip encoding. Add + 16 to windowBits to write a simple gzip header and trailer around the + compressed data instead of a zlib wrapper. The gzip header will have no + file name, no extra data, no comment, no modification time (set to zero), + no header crc, and the operating system will be set to 255 (unknown). If a + gzip stream is being written, strm->adler is a crc32 instead of an adler32. + + The memLevel parameter specifies how much memory should be allocated + for the internal compression state. memLevel=1 uses minimum memory but + is slow and reduces compression ratio; memLevel=9 uses maximum memory + for optimal speed. The default value is 8. See zconf.h for total memory + usage as a function of windowBits and memLevel. + + The strategy parameter is used to tune the compression algorithm. Use the + value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a + filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no + string match), or Z_RLE to limit match distances to one (run-length + encoding). Filtered data consists mostly of small values with a somewhat + random distribution. In this case, the compression algorithm is tuned to + compress them better. The effect of Z_FILTERED is to force more Huffman + coding and less string matching; it is somewhat intermediate between + Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as + Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy + parameter only affects the compression ratio but not the correctness of the + compressed output even if it is not set appropriately. Z_FIXED prevents the + use of dynamic Huffman codes, allowing for a simpler decoder for special + applications. + + deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid + method). msg is set to null if there is no error message. deflateInit2 does + not perform any compression: this will be done by deflate(). +*/ + +ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, + const Bytef *dictionary, + uInt dictLength)); +/* + Initializes the compression dictionary from the given byte sequence + without producing any compressed output. This function must be called + immediately after deflateInit, deflateInit2 or deflateReset, before any + call of deflate. The compressor and decompressor must use exactly the same + dictionary (see inflateSetDictionary). + + The dictionary should consist of strings (byte sequences) that are likely + to be encountered later in the data to be compressed, with the most commonly + used strings preferably put towards the end of the dictionary. Using a + dictionary is most useful when the data to be compressed is short and can be + predicted with good accuracy; the data can then be compressed better than + with the default empty dictionary. + + Depending on the size of the compression data structures selected by + deflateInit or deflateInit2, a part of the dictionary may in effect be + discarded, for example if the dictionary is larger than the window size in + deflate or deflate2. Thus the strings most likely to be useful should be + put at the end of the dictionary, not at the front. In addition, the + current implementation of deflate will use at most the window size minus + 262 bytes of the provided dictionary. + + Upon return of this function, strm->adler is set to the adler32 value + of the dictionary; the decompressor may later use this value to determine + which dictionary has been used by the compressor. (The adler32 value + applies to the whole dictionary even if only a subset of the dictionary is + actually used by the compressor.) If a raw deflate was requested, then the + adler32 value is not computed and strm->adler is not set. + + deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a + parameter is invalid (such as NULL dictionary) or the stream state is + inconsistent (for example if deflate has already been called for this stream + or if the compression method is bsort). deflateSetDictionary does not + perform any compression: this will be done by deflate(). +*/ + +ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, + z_streamp source)); +/* + Sets the destination stream as a complete copy of the source stream. + + This function can be useful when several compression strategies will be + tried, for example when there are several ways of pre-processing the input + data with a filter. The streams that will be discarded should then be freed + by calling deflateEnd. Note that deflateCopy duplicates the internal + compression state which can be quite large, so this strategy is slow and + can consume lots of memory. + + deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent + (such as zalloc being NULL). msg is left unchanged in both source and + destination. +*/ + +ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); +/* + This function is equivalent to deflateEnd followed by deflateInit, + but does not free and reallocate all the internal compression state. + The stream will keep the same compression level and any other attributes + that may have been set by deflateInit2. + + deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being NULL). +*/ + +ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, + int level, + int strategy)); +/* + Dynamically update the compression level and compression strategy. The + interpretation of level and strategy is as in deflateInit2. This can be + used to switch between compression and straight copy of the input data, or + to switch to a different kind of input data requiring a different + strategy. If the compression level is changed, the input available so far + is compressed with the old level (and may be flushed); the new level will + take effect only at the next call of deflate(). + + Before the call of deflateParams, the stream state must be set as for + a call of deflate(), since the currently available input may have to + be compressed and flushed. In particular, strm->avail_out must be non-zero. + + deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source + stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR + if strm->avail_out was zero. +*/ + +ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, + int good_length, + int max_lazy, + int nice_length, + int max_chain)); +/* + Fine tune deflate's internal compression parameters. This should only be + used by someone who understands the algorithm used by zlib's deflate for + searching for the best matching string, and even then only by the most + fanatic optimizer trying to squeeze out the last compressed bit for their + specific input data. Read the deflate.c source code for the meaning of the + max_lazy, good_length, nice_length, and max_chain parameters. + + deflateTune() can be called after deflateInit() or deflateInit2(), and + returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. + */ + +ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, + uLong sourceLen)); +/* + deflateBound() returns an upper bound on the compressed size after + deflation of sourceLen bytes. It must be called after deflateInit() + or deflateInit2(). This would be used to allocate an output buffer + for deflation in a single pass, and so would be called before deflate(). +*/ + +ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, + int bits, + int value)); +/* + deflatePrime() inserts bits in the deflate output stream. The intent + is that this function is used to start off the deflate output with the + bits leftover from a previous deflate stream when appending to it. As such, + this function can only be used for raw deflate, and must be used before the + first deflate() call after a deflateInit2() or deflateReset(). bits must be + less than or equal to 16, and that many of the least significant bits of + value will be inserted in the output. + + deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, + gz_headerp head)); +/* + deflateSetHeader() provides gzip header information for when a gzip + stream is requested by deflateInit2(). deflateSetHeader() may be called + after deflateInit2() or deflateReset() and before the first call of + deflate(). The text, time, os, extra field, name, and comment information + in the provided gz_header structure are written to the gzip header (xflag is + ignored -- the extra flags are set according to the compression level). The + caller must assure that, if not Z_NULL, name and comment are terminated with + a zero byte, and that if extra is not Z_NULL, that extra_len bytes are + available there. If hcrc is true, a gzip header crc is included. Note that + the current versions of the command-line version of gzip (up through version + 1.3.x) do not support header crc's, and will report that it is a "multi-part + gzip file" and give up. + + If deflateSetHeader is not used, the default gzip header has text false, + the time set to zero, and os set to 255, with no extra, name, or comment + fields. The gzip header is returned to the default state by deflateReset(). + + deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +/* +ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, + int windowBits)); + + This is another version of inflateInit with an extra parameter. The + fields next_in, avail_in, zalloc, zfree and opaque must be initialized + before by the caller. + + The windowBits parameter is the base two logarithm of the maximum window + size (the size of the history buffer). It should be in the range 8..15 for + this version of the library. The default value is 15 if inflateInit is used + instead. windowBits must be greater than or equal to the windowBits value + provided to deflateInit2() while compressing, or it must be equal to 15 if + deflateInit2() was not used. If a compressed stream with a larger window + size is given as input, inflate() will return with the error code + Z_DATA_ERROR instead of trying to allocate a larger window. + + windowBits can also be -8..-15 for raw inflate. In this case, -windowBits + determines the window size. inflate() will then process raw deflate data, + not looking for a zlib or gzip header, not generating a check value, and not + looking for any check values for comparison at the end of the stream. This + is for use with other formats that use the deflate compressed data format + such as zip. Those formats provide their own check values. If a custom + format is developed using the raw deflate format for compressed data, it is + recommended that a check value such as an adler32 or a crc32 be applied to + the uncompressed data as is done in the zlib, gzip, and zip formats. For + most applications, the zlib format should be used as is. Note that comments + above on the use in deflateInit2() applies to the magnitude of windowBits. + + windowBits can also be greater than 15 for optional gzip decoding. Add + 32 to windowBits to enable zlib and gzip decoding with automatic header + detection, or add 16 to decode only the gzip format (the zlib format will + return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is + a crc32 instead of an adler32. + + inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg + is set to null if there is no error message. inflateInit2 does not perform + any decompression apart from reading the zlib header if present: this will + be done by inflate(). (So next_in and avail_in may be modified, but next_out + and avail_out are unchanged.) +*/ + +ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, + const Bytef *dictionary, + uInt dictLength)); +/* + Initializes the decompression dictionary from the given uncompressed byte + sequence. This function must be called immediately after a call of inflate, + if that call returned Z_NEED_DICT. The dictionary chosen by the compressor + can be determined from the adler32 value returned by that call of inflate. + The compressor and decompressor must use exactly the same dictionary (see + deflateSetDictionary). For raw inflate, this function can be called + immediately after inflateInit2() or inflateReset() and before any call of + inflate() to set the dictionary. The application must insure that the + dictionary that was used for compression is provided. + + inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a + parameter is invalid (such as NULL dictionary) or the stream state is + inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the + expected one (incorrect adler32 value). inflateSetDictionary does not + perform any decompression: this will be done by subsequent calls of + inflate(). +*/ + +ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); +/* + Skips invalid compressed data until a full flush point (see above the + description of deflate with Z_FULL_FLUSH) can be found, or until all + available input is skipped. No output is provided. + + inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR + if no more input was provided, Z_DATA_ERROR if no flush point has been found, + or Z_STREAM_ERROR if the stream structure was inconsistent. In the success + case, the application may save the current current value of total_in which + indicates where valid compressed data was found. In the error case, the + application may repeatedly call inflateSync, providing more input each time, + until success or end of the input data. +*/ + +ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, + z_streamp source)); +/* + Sets the destination stream as a complete copy of the source stream. + + This function can be useful when randomly accessing a large stream. The + first pass through the stream can periodically record the inflate state, + allowing restarting inflate at those points when randomly accessing the + stream. + + inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent + (such as zalloc being NULL). msg is left unchanged in both source and + destination. +*/ + +ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); +/* + This function is equivalent to inflateEnd followed by inflateInit, + but does not free and reallocate all the internal decompression state. + The stream will keep attributes that may have been set by inflateInit2. + + inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being NULL). +*/ + +ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, + int bits, + int value)); +/* + This function inserts bits in the inflate input stream. The intent is + that this function is used to start inflating at a bit position in the + middle of a byte. The provided bits will be used before any bytes are used + from next_in. This function should only be used with raw inflate, and + should be used before the first inflate() call after inflateInit2() or + inflateReset(). bits must be less than or equal to 16, and that many of the + least significant bits of value will be inserted in the input. + + inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, + gz_headerp head)); +/* + inflateGetHeader() requests that gzip header information be stored in the + provided gz_header structure. inflateGetHeader() may be called after + inflateInit2() or inflateReset(), and before the first call of inflate(). + As inflate() processes the gzip stream, head->done is zero until the header + is completed, at which time head->done is set to one. If a zlib stream is + being decoded, then head->done is set to -1 to indicate that there will be + no gzip header information forthcoming. Note that Z_BLOCK can be used to + force inflate() to return immediately after header processing is complete + and before any actual data is decompressed. + + The text, time, xflags, and os fields are filled in with the gzip header + contents. hcrc is set to true if there is a header CRC. (The header CRC + was valid if done is set to one.) If extra is not Z_NULL, then extra_max + contains the maximum number of bytes to write to extra. Once done is true, + extra_len contains the actual extra field length, and extra contains the + extra field, or that field truncated if extra_max is less than extra_len. + If name is not Z_NULL, then up to name_max characters are written there, + terminated with a zero unless the length is greater than name_max. If + comment is not Z_NULL, then up to comm_max characters are written there, + terminated with a zero unless the length is greater than comm_max. When + any of extra, name, or comment are not Z_NULL and the respective field is + not present in the header, then that field is set to Z_NULL to signal its + absence. This allows the use of deflateSetHeader() with the returned + structure to duplicate the header. However if those fields are set to + allocated memory, then the application will need to save those pointers + elsewhere so that they can be eventually freed. + + If inflateGetHeader is not used, then the header information is simply + discarded. The header is always checked for validity, including the header + CRC if present. inflateReset() will reset the process to discard the header + information. The application would need to call inflateGetHeader() again to + retrieve the header from the next gzip stream. + + inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +/* +ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, + unsigned char FAR *window)); + + Initialize the internal stream state for decompression using inflateBack() + calls. The fields zalloc, zfree and opaque in strm must be initialized + before the call. If zalloc and zfree are Z_NULL, then the default library- + derived memory allocation routines are used. windowBits is the base two + logarithm of the window size, in the range 8..15. window is a caller + supplied buffer of that size. Except for special applications where it is + assured that deflate was used with small window sizes, windowBits must be 15 + and a 32K byte window must be supplied to be able to decompress general + deflate streams. + + See inflateBack() for the usage of these routines. + + inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of + the paramaters are invalid, Z_MEM_ERROR if the internal state could not + be allocated, or Z_VERSION_ERROR if the version of the library does not + match the version of the header file. +*/ + +typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); +typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); + +ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, + in_func in, void FAR *in_desc, + out_func out, void FAR *out_desc)); +/* + inflateBack() does a raw inflate with a single call using a call-back + interface for input and output. This is more efficient than inflate() for + file i/o applications in that it avoids copying between the output and the + sliding window by simply making the window itself the output buffer. This + function trusts the application to not change the output buffer passed by + the output function, at least until inflateBack() returns. + + inflateBackInit() must be called first to allocate the internal state + and to initialize the state with the user-provided window buffer. + inflateBack() may then be used multiple times to inflate a complete, raw + deflate stream with each call. inflateBackEnd() is then called to free + the allocated state. + + A raw deflate stream is one with no zlib or gzip header or trailer. + This routine would normally be used in a utility that reads zip or gzip + files and writes out uncompressed files. The utility would decode the + header and process the trailer on its own, hence this routine expects + only the raw deflate stream to decompress. This is different from the + normal behavior of inflate(), which expects either a zlib or gzip header and + trailer around the deflate stream. + + inflateBack() uses two subroutines supplied by the caller that are then + called by inflateBack() for input and output. inflateBack() calls those + routines until it reads a complete deflate stream and writes out all of the + uncompressed data, or until it encounters an error. The function's + parameters and return types are defined above in the in_func and out_func + typedefs. inflateBack() will call in(in_desc, &buf) which should return the + number of bytes of provided input, and a pointer to that input in buf. If + there is no input available, in() must return zero--buf is ignored in that + case--and inflateBack() will return a buffer error. inflateBack() will call + out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out() + should return zero on success, or non-zero on failure. If out() returns + non-zero, inflateBack() will return with an error. Neither in() nor out() + are permitted to change the contents of the window provided to + inflateBackInit(), which is also the buffer that out() uses to write from. + The length written by out() will be at most the window size. Any non-zero + amount of input may be provided by in(). + + For convenience, inflateBack() can be provided input on the first call by + setting strm->next_in and strm->avail_in. If that input is exhausted, then + in() will be called. Therefore strm->next_in must be initialized before + calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called + immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in + must also be initialized, and then if strm->avail_in is not zero, input will + initially be taken from strm->next_in[0 .. strm->avail_in - 1]. + + The in_desc and out_desc parameters of inflateBack() is passed as the + first parameter of in() and out() respectively when they are called. These + descriptors can be optionally used to pass any information that the caller- + supplied in() and out() functions need to do their job. + + On return, inflateBack() will set strm->next_in and strm->avail_in to + pass back any unused input that was provided by the last in() call. The + return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR + if in() or out() returned an error, Z_DATA_ERROR if there was a format + error in the deflate stream (in which case strm->msg is set to indicate the + nature of the error), or Z_STREAM_ERROR if the stream was not properly + initialized. In the case of Z_BUF_ERROR, an input or output error can be + distinguished using strm->next_in which will be Z_NULL only if in() returned + an error. If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to + out() returning non-zero. (in() will always be called before out(), so + strm->next_in is assured to be defined if out() returns non-zero.) Note + that inflateBack() cannot return Z_OK. +*/ + +ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); +/* + All memory allocated by inflateBackInit() is freed. + + inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream + state was inconsistent. +*/ + +ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); +/* Return flags indicating compile-time options. + + Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: + 1.0: size of uInt + 3.2: size of uLong + 5.4: size of voidpf (pointer) + 7.6: size of z_off_t + + Compiler, assembler, and debug options: + 8: DEBUG + 9: ASMV or ASMINF -- use ASM code + 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention + 11: 0 (reserved) + + One-time table building (smaller code, but not thread-safe if true): + 12: BUILDFIXED -- build static block decoding tables when needed + 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed + 14,15: 0 (reserved) + + Library content (indicates missing functionality): + 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking + deflate code when not needed) + 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect + and decode gzip streams (to avoid linking crc code) + 18-19: 0 (reserved) + + Operation variations (changes in library functionality): + 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate + 21: FASTEST -- deflate algorithm with only one, lowest compression level + 22,23: 0 (reserved) + + The sprintf variant used by gzprintf (zero is best): + 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format + 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure! + 26: 0 = returns value, 1 = void -- 1 means inferred string length returned + + Remainder: + 27-31: 0 (reserved) + */ + + + /* utility functions */ + +/* + The following utility functions are implemented on top of the + basic stream-oriented functions. To simplify the interface, some + default options are assumed (compression level and memory usage, + standard memory allocation functions). The source code of these + utility functions can easily be modified if you need special options. +*/ + +ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); +/* + Compresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be at least the value returned + by compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressed buffer. + This function can be used to compress a whole file at once if the + input file is mmap'ed. + compress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer. +*/ + +ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen, + int level)); +/* + Compresses the source buffer into the destination buffer. The level + parameter has the same meaning as in deflateInit. sourceLen is the byte + length of the source buffer. Upon entry, destLen is the total size of the + destination buffer, which must be at least the value returned by + compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressed buffer. + + compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_BUF_ERROR if there was not enough room in the output buffer, + Z_STREAM_ERROR if the level parameter is invalid. +*/ + +ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); +/* + compressBound() returns an upper bound on the compressed size after + compress() or compress2() on sourceLen bytes. It would be used before + a compress() or compress2() call to allocate the destination buffer. +*/ + +ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); +/* + Decompresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be large enough to hold the + entire uncompressed data. (The size of the uncompressed data must have + been saved previously by the compressor and transmitted to the decompressor + by some mechanism outside the scope of this compression library.) + Upon exit, destLen is the actual size of the compressed buffer. + This function can be used to decompress a whole file at once if the + input file is mmap'ed. + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. +*/ + + +typedef voidp gzFile; + +ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); +/* + Opens a gzip (.gz) file for reading or writing. The mode parameter + is as in fopen ("rb" or "wb") but can also include a compression level + ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for + Huffman only compression as in "wb1h", or 'R' for run-length encoding + as in "wb1R". (See the description of deflateInit2 for more information + about the strategy parameter.) + + gzopen can be used to read a file which is not in gzip format; in this + case gzread will directly read from the file without decompression. + + gzopen returns NULL if the file could not be opened or if there was + insufficient memory to allocate the (de)compression state; errno + can be checked to distinguish the two cases (if errno is zero, the + zlib error is Z_MEM_ERROR). */ + +ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); +/* + gzdopen() associates a gzFile with the file descriptor fd. File + descriptors are obtained from calls like open, dup, creat, pipe or + fileno (in the file has been previously opened with fopen). + The mode parameter is as in gzopen. + The next call of gzclose on the returned gzFile will also close the + file descriptor fd, just like fclose(fdopen(fd), mode) closes the file + descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode). + gzdopen returns NULL if there was insufficient memory to allocate + the (de)compression state. +*/ + +ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); +/* + Dynamically update the compression level or strategy. See the description + of deflateInit2 for the meaning of these parameters. + gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not + opened for writing. +*/ + +ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); +/* + Reads the given number of uncompressed bytes from the compressed file. + If the input file was not in gzip format, gzread copies the given number + of bytes into the buffer. + gzread returns the number of uncompressed bytes actually read (0 for + end of file, -1 for error). */ + +ZEXTERN int ZEXPORT gzwrite OF((gzFile file, + voidpc buf, unsigned len)); +/* + Writes the given number of uncompressed bytes into the compressed file. + gzwrite returns the number of uncompressed bytes actually written + (0 in case of error). +*/ + +ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); +/* + Converts, formats, and writes the args to the compressed file under + control of the format string, as in fprintf. gzprintf returns the number of + uncompressed bytes actually written (0 in case of error). The number of + uncompressed bytes written is limited to 4095. The caller should assure that + this limit is not exceeded. If it is exceeded, then gzprintf() will return + return an error (0) with nothing written. In this case, there may also be a + buffer overflow with unpredictable consequences, which is possible only if + zlib was compiled with the insecure functions sprintf() or vsprintf() + because the secure snprintf() or vsnprintf() functions were not available. +*/ + +ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); +/* + Writes the given null-terminated string to the compressed file, excluding + the terminating null character. + gzputs returns the number of characters written, or -1 in case of error. +*/ + +ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); +/* + Reads bytes from the compressed file until len-1 characters are read, or + a newline character is read and transferred to buf, or an end-of-file + condition is encountered. The string is then terminated with a null + character. + gzgets returns buf, or Z_NULL in case of error. +*/ + +ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); +/* + Writes c, converted to an unsigned char, into the compressed file. + gzputc returns the value that was written, or -1 in case of error. +*/ + +ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); +/* + Reads one byte from the compressed file. gzgetc returns this byte + or -1 in case of end of file or error. +*/ + +ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); +/* + Push one character back onto the stream to be read again later. + Only one character of push-back is allowed. gzungetc() returns the + character pushed, or -1 on failure. gzungetc() will fail if a + character has been pushed but not read yet, or if c is -1. The pushed + character will be discarded if the stream is repositioned with gzseek() + or gzrewind(). +*/ + +ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); +/* + Flushes all pending output into the compressed file. The parameter + flush is as in the deflate() function. The return value is the zlib + error number (see function gzerror below). gzflush returns Z_OK if + the flush parameter is Z_FINISH and all output could be flushed. + gzflush should be called only when strictly necessary because it can + degrade compression. +*/ + +ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, + z_off_t offset, int whence)); +/* + Sets the starting position for the next gzread or gzwrite on the + given compressed file. The offset represents a number of bytes in the + uncompressed data stream. The whence parameter is defined as in lseek(2); + the value SEEK_END is not supported. + If the file is opened for reading, this function is emulated but can be + extremely slow. If the file is opened for writing, only forward seeks are + supported; gzseek then compresses a sequence of zeroes up to the new + starting position. + + gzseek returns the resulting offset location as measured in bytes from + the beginning of the uncompressed stream, or -1 in case of error, in + particular if the file is opened for writing and the new starting position + would be before the current position. +*/ + +ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); +/* + Rewinds the given file. This function is supported only for reading. + + gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) +*/ + +ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); +/* + Returns the starting position for the next gzread or gzwrite on the + given compressed file. This position represents a number of bytes in the + uncompressed data stream. + + gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) +*/ + +ZEXTERN int ZEXPORT gzeof OF((gzFile file)); +/* + Returns 1 when EOF has previously been detected reading the given + input stream, otherwise zero. +*/ + +ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); +/* + Returns 1 if file is being read directly without decompression, otherwise + zero. +*/ + +ZEXTERN int ZEXPORT gzclose OF((gzFile file)); +/* + Flushes all pending output if necessary, closes the compressed file + and deallocates all the (de)compression state. The return value is the zlib + error number (see function gzerror below). +*/ + +ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); +/* + Returns the error message for the last error which occurred on the + given compressed file. errnum is set to zlib error number. If an + error occurred in the file system and not in the compression library, + errnum is set to Z_ERRNO and the application may consult errno + to get the exact error code. +*/ + +ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); +/* + Clears the error and end-of-file flags for file. This is analogous to the + clearerr() function in stdio. This is useful for continuing to read a gzip + file that is being written concurrently. +*/ + + /* checksum functions */ + +/* + These functions are not related to compression but are exported + anyway because they might be useful in applications using the + compression library. +*/ + +ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); +/* + Update a running Adler-32 checksum with the bytes buf[0..len-1] and + return the updated checksum. If buf is NULL, this function returns + the required initial value for the checksum. + An Adler-32 checksum is almost as reliable as a CRC32 but can be computed + much faster. Usage example: + + uLong adler = adler32(0L, Z_NULL, 0); + + while (read_buffer(buffer, length) != EOF) { + adler = adler32(adler, buffer, length); + } + if (adler != original_adler) error(); +*/ + +ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, + z_off_t len2)); +/* + Combine two Adler-32 checksums into one. For two sequences of bytes, seq1 + and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for + each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of + seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. +*/ + +ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); +/* + Update a running CRC-32 with the bytes buf[0..len-1] and return the + updated CRC-32. If buf is NULL, this function returns the required initial + value for the for the crc. Pre- and post-conditioning (one's complement) is + performed within this function so it shouldn't be done by the application. + Usage example: + + uLong crc = crc32(0L, Z_NULL, 0); + + while (read_buffer(buffer, length) != EOF) { + crc = crc32(crc, buffer, length); + } + if (crc != original_crc) error(); +*/ + +ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); + +/* + Combine two CRC-32 check values into one. For two sequences of bytes, + seq1 and seq2 with lengths len1 and len2, CRC-32 check values were + calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32 + check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and + len2. +*/ + + + /* various hacks, don't look :) */ + +/* deflateInit and inflateInit are macros to allow checking the zlib version + * and the compiler's view of z_stream: + */ +ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, + int windowBits, int memLevel, + int strategy, const char *version, + int stream_size)); +ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, + unsigned char FAR *window, + const char *version, + int stream_size)); +#define deflateInit(strm, level) \ + deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream)) +#define inflateInit(strm) \ + inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream)) +#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ + deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ + (strategy), ZLIB_VERSION, sizeof(z_stream)) +#define inflateInit2(strm, windowBits) \ + inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream)) +#define inflateBackInit(strm, windowBits, window) \ + inflateBackInit_((strm), (windowBits), (window), \ + ZLIB_VERSION, sizeof(z_stream)) + + +#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) + struct internal_state {int dummy;}; /* hack for buggy compilers */ +#endif + +ZEXTERN const char * ZEXPORT zError OF((int)); +ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); +ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); + +#ifdef __cplusplus +} +#endif + +#endif /* ZLIB_H */ diff --git a/zlib/zutil.c b/zlib/zutil.c new file mode 100644 index 0000000000..0f4bd7871d --- /dev/null +++ b/zlib/zutil.c @@ -0,0 +1,318 @@ +/* zutil.c -- target dependent utility functions for the compression library + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#include "zutil.h" + +#ifndef NO_DUMMY_DECL +struct internal_state {int dummy;}; /* for buggy compilers */ +#endif + +const char * const z_errmsg[10] = { +"need dictionary", /* Z_NEED_DICT 2 */ +"stream end", /* Z_STREAM_END 1 */ +"", /* Z_OK 0 */ +"file error", /* Z_ERRNO (-1) */ +"stream error", /* Z_STREAM_ERROR (-2) */ +"data error", /* Z_DATA_ERROR (-3) */ +"insufficient memory", /* Z_MEM_ERROR (-4) */ +"buffer error", /* Z_BUF_ERROR (-5) */ +"incompatible version",/* Z_VERSION_ERROR (-6) */ +""}; + + +const char * ZEXPORT zlibVersion() +{ + return ZLIB_VERSION; +} + +uLong ZEXPORT zlibCompileFlags() +{ + uLong flags; + + flags = 0; + switch (sizeof(uInt)) { + case 2: break; + case 4: flags += 1; break; + case 8: flags += 2; break; + default: flags += 3; + } + switch (sizeof(uLong)) { + case 2: break; + case 4: flags += 1 << 2; break; + case 8: flags += 2 << 2; break; + default: flags += 3 << 2; + } + switch (sizeof(voidpf)) { + case 2: break; + case 4: flags += 1 << 4; break; + case 8: flags += 2 << 4; break; + default: flags += 3 << 4; + } + switch (sizeof(z_off_t)) { + case 2: break; + case 4: flags += 1 << 6; break; + case 8: flags += 2 << 6; break; + default: flags += 3 << 6; + } +#ifdef DEBUG + flags += 1 << 8; +#endif +#if defined(ASMV) || defined(ASMINF) + flags += 1 << 9; +#endif +#ifdef ZLIB_WINAPI + flags += 1 << 10; +#endif +#ifdef BUILDFIXED + flags += 1 << 12; +#endif +#ifdef DYNAMIC_CRC_TABLE + flags += 1 << 13; +#endif +#ifdef NO_GZCOMPRESS + flags += 1L << 16; +#endif +#ifdef NO_GZIP + flags += 1L << 17; +#endif +#ifdef PKZIP_BUG_WORKAROUND + flags += 1L << 20; +#endif +#ifdef FASTEST + flags += 1L << 21; +#endif +#ifdef STDC +# ifdef NO_vsnprintf + flags += 1L << 25; +# ifdef HAS_vsprintf_void + flags += 1L << 26; +# endif +# else +# ifdef HAS_vsnprintf_void + flags += 1L << 26; +# endif +# endif +#else + flags += 1L << 24; +# ifdef NO_snprintf + flags += 1L << 25; +# ifdef HAS_sprintf_void + flags += 1L << 26; +# endif +# else +# ifdef HAS_snprintf_void + flags += 1L << 26; +# endif +# endif +#endif + return flags; +} + +#ifdef DEBUG + +# ifndef verbose +# define verbose 0 +# endif +int z_verbose = verbose; + +void z_error (m) + char *m; +{ + fprintf(stderr, "%s\n", m); + exit(1); +} +#endif + +/* exported to allow conversion of error code to string for compress() and + * uncompress() + */ +const char * ZEXPORT zError(err) + int err; +{ + return ERR_MSG(err); +} + +#if defined(_WIN32_WCE) + /* The Microsoft C Run-Time Library for Windows CE doesn't have + * errno. We define it as a global variable to simplify porting. + * Its value is always 0 and should not be used. + */ + int errno = 0; +#endif + +#ifndef HAVE_MEMCPY + +void zmemcpy(dest, source, len) + Bytef* dest; + const Bytef* source; + uInt len; +{ + if (len == 0) return; + do { + *dest++ = *source++; /* ??? to be unrolled */ + } while (--len != 0); +} + +int zmemcmp(s1, s2, len) + const Bytef* s1; + const Bytef* s2; + uInt len; +{ + uInt j; + + for (j = 0; j < len; j++) { + if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1; + } + return 0; +} + +void zmemzero(dest, len) + Bytef* dest; + uInt len; +{ + if (len == 0) return; + do { + *dest++ = 0; /* ??? to be unrolled */ + } while (--len != 0); +} +#endif + + +#ifdef SYS16BIT + +#ifdef __TURBOC__ +/* Turbo C in 16-bit mode */ + +# define MY_ZCALLOC + +/* Turbo C malloc() does not allow dynamic allocation of 64K bytes + * and farmalloc(64K) returns a pointer with an offset of 8, so we + * must fix the pointer. Warning: the pointer must be put back to its + * original form in order to free it, use zcfree(). + */ + +#define MAX_PTR 10 +/* 10*64K = 640K */ + +local int next_ptr = 0; + +typedef struct ptr_table_s { + voidpf org_ptr; + voidpf new_ptr; +} ptr_table; + +local ptr_table table[MAX_PTR]; +/* This table is used to remember the original form of pointers + * to large buffers (64K). Such pointers are normalized with a zero offset. + * Since MSDOS is not a preemptive multitasking OS, this table is not + * protected from concurrent access. This hack doesn't work anyway on + * a protected system like OS/2. Use Microsoft C instead. + */ + +voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) +{ + voidpf buf = opaque; /* just to make some compilers happy */ + ulg bsize = (ulg)items*size; + + /* If we allocate less than 65520 bytes, we assume that farmalloc + * will return a usable pointer which doesn't have to be normalized. + */ + if (bsize < 65520L) { + buf = farmalloc(bsize); + if (*(ush*)&buf != 0) return buf; + } else { + buf = farmalloc(bsize + 16L); + } + if (buf == NULL || next_ptr >= MAX_PTR) return NULL; + table[next_ptr].org_ptr = buf; + + /* Normalize the pointer to seg:0 */ + *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4; + *(ush*)&buf = 0; + table[next_ptr++].new_ptr = buf; + return buf; +} + +void zcfree (voidpf opaque, voidpf ptr) +{ + int n; + if (*(ush*)&ptr != 0) { /* object < 64K */ + farfree(ptr); + return; + } + /* Find the original pointer */ + for (n = 0; n < next_ptr; n++) { + if (ptr != table[n].new_ptr) continue; + + farfree(table[n].org_ptr); + while (++n < next_ptr) { + table[n-1] = table[n]; + } + next_ptr--; + return; + } + ptr = opaque; /* just to make some compilers happy */ + Assert(0, "zcfree: ptr not found"); +} + +#endif /* __TURBOC__ */ + + +#ifdef M_I86 +/* Microsoft C in 16-bit mode */ + +# define MY_ZCALLOC + +#if (!defined(_MSC_VER) || (_MSC_VER <= 600)) +# define _halloc halloc +# define _hfree hfree +#endif + +voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) +{ + if (opaque) opaque = 0; /* to make compiler happy */ + return _halloc((long)items, size); +} + +void zcfree (voidpf opaque, voidpf ptr) +{ + if (opaque) opaque = 0; /* to make compiler happy */ + _hfree(ptr); +} + +#endif /* M_I86 */ + +#endif /* SYS16BIT */ + + +#ifndef MY_ZCALLOC /* Any system without a special alloc function */ + +#ifndef STDC +extern voidp malloc OF((uInt size)); +extern voidp calloc OF((uInt items, uInt size)); +extern void free OF((voidpf ptr)); +#endif + +voidpf zcalloc (opaque, items, size) + voidpf opaque; + unsigned items; + unsigned size; +{ + if (opaque) items += size - size; /* make compiler happy */ + return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : + (voidpf)calloc(items, size); +} + +void zcfree (opaque, ptr) + voidpf opaque; + voidpf ptr; +{ + free(ptr); + if (opaque) return; /* make compiler happy */ +} + +#endif /* MY_ZCALLOC */ diff --git a/zlib/zutil.h b/zlib/zutil.h new file mode 100644 index 0000000000..0ba6e02087 --- /dev/null +++ b/zlib/zutil.h @@ -0,0 +1,269 @@ +/* zutil.h -- internal interface and configuration of the compression library + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +/* @(#) $Id$ */ + +#ifndef ZUTIL_H +#define ZUTIL_H + +#define ZLIB_INTERNAL +#include "zlib.h" + +#ifdef STDC +# ifndef _WIN32_WCE +# include +# endif +# include +# include +#endif +#ifdef NO_ERRNO_H +# ifdef _WIN32_WCE + /* The Microsoft C Run-Time Library for Windows CE doesn't have + * errno. We define it as a global variable to simplify porting. + * Its value is always 0 and should not be used. We rename it to + * avoid conflict with other libraries that use the same workaround. + */ +# define errno z_errno +# endif + extern int errno; +#else +# ifndef _WIN32_WCE +# include +# endif +#endif + +#ifndef local +# define local static +#endif +/* compile with -Dlocal if your debugger can't find static symbols */ + +typedef unsigned char uch; +typedef uch FAR uchf; +typedef unsigned short ush; +typedef ush FAR ushf; +typedef unsigned long ulg; + +extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ +/* (size given to avoid silly warnings with Visual C++) */ + +#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] + +#define ERR_RETURN(strm,err) \ + return (strm->msg = (char*)ERR_MSG(err), (err)) +/* To be used only when the state is known to be valid */ + + /* common constants */ + +#ifndef DEF_WBITS +# define DEF_WBITS MAX_WBITS +#endif +/* default windowBits for decompression. MAX_WBITS is for compression only */ + +#if MAX_MEM_LEVEL >= 8 +# define DEF_MEM_LEVEL 8 +#else +# define DEF_MEM_LEVEL MAX_MEM_LEVEL +#endif +/* default memLevel */ + +#define STORED_BLOCK 0 +#define STATIC_TREES 1 +#define DYN_TREES 2 +/* The three kinds of block type */ + +#define MIN_MATCH 3 +#define MAX_MATCH 258 +/* The minimum and maximum match lengths */ + +#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */ + + /* target dependencies */ + +#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32)) +# define OS_CODE 0x00 +# if defined(__TURBOC__) || defined(__BORLANDC__) +# if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) + /* Allow compilation with ANSI keywords only enabled */ + void _Cdecl farfree( void *block ); + void *_Cdecl farmalloc( unsigned long nbytes ); +# else +# include +# endif +# else /* MSC or DJGPP */ +# include +# endif +#endif + +#ifdef AMIGA +# define OS_CODE 0x01 +#endif + +#if defined(VAXC) || defined(VMS) +# define OS_CODE 0x02 +# define F_OPEN(name, mode) \ + fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512") +#endif + +#if defined(ATARI) || defined(atarist) +# define OS_CODE 0x05 +#endif + +#ifdef OS2 +# define OS_CODE 0x06 +# ifdef M_I86 + #include +# endif +#endif + +#if defined(MACOS) || defined(TARGET_OS_MAC) +# define OS_CODE 0x07 +# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os +# include /* for fdopen */ +# else +# ifndef fdopen +# define fdopen(fd,mode) NULL /* No fdopen() */ +# endif +# endif +#endif + +#ifdef TOPS20 +# define OS_CODE 0x0a +#endif + +#ifdef WIN32 +# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */ +# define OS_CODE 0x0b +# endif +#endif + +#ifdef __50SERIES /* Prime/PRIMOS */ +# define OS_CODE 0x0f +#endif + +#if defined(_BEOS_) || defined(RISCOS) +# define fdopen(fd,mode) NULL /* No fdopen() */ +#endif + +#if (defined(_MSC_VER) && (_MSC_VER > 600)) +# if defined(_WIN32_WCE) +# define fdopen(fd,mode) NULL /* No fdopen() */ +# ifndef _PTRDIFF_T_DEFINED + typedef int ptrdiff_t; +# define _PTRDIFF_T_DEFINED +# endif +# else +# define fdopen(fd,type) _fdopen(fd,type) +# endif +#endif + + /* common defaults */ + +#ifndef OS_CODE +# define OS_CODE 0x03 /* assume Unix */ +#endif + +#ifndef F_OPEN +# define F_OPEN(name, mode) fopen((name), (mode)) +#endif + + /* functions */ + +#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) +# ifndef HAVE_VSNPRINTF +# define HAVE_VSNPRINTF +# endif +#endif +#if defined(__CYGWIN__) +# ifndef HAVE_VSNPRINTF +# define HAVE_VSNPRINTF +# endif +#endif +#ifndef HAVE_VSNPRINTF +# ifdef MSDOS + /* vsnprintf may exist on some MS-DOS compilers (DJGPP?), + but for now we just assume it doesn't. */ +# define NO_vsnprintf +# endif +# ifdef __TURBOC__ +# define NO_vsnprintf +# endif +# ifdef WIN32 + /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ +# if !defined(vsnprintf) && !defined(NO_vsnprintf) +# define vsnprintf _vsnprintf +# endif +# endif +# ifdef __SASC +# define NO_vsnprintf +# endif +#endif +#ifdef VMS +# define NO_vsnprintf +#endif + +#if defined(pyr) +# define NO_MEMCPY +#endif +#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__) + /* Use our own functions for small and medium model with MSC <= 5.0. + * You may have to use the same strategy for Borland C (untested). + * The __SC__ check is for Symantec. + */ +# define NO_MEMCPY +#endif +#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY) +# define HAVE_MEMCPY +#endif +#ifdef HAVE_MEMCPY +# ifdef SMALL_MEDIUM /* MSDOS small or medium model */ +# define zmemcpy _fmemcpy +# define zmemcmp _fmemcmp +# define zmemzero(dest, len) _fmemset(dest, 0, len) +# else +# define zmemcpy memcpy +# define zmemcmp memcmp +# define zmemzero(dest, len) memset(dest, 0, len) +# endif +#else + extern void zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); + extern int zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); + extern void zmemzero OF((Bytef* dest, uInt len)); +#endif + +/* Diagnostic functions */ +#ifdef DEBUG +# include + extern int z_verbose; + extern void z_error OF((char *m)); +# define Assert(cond,msg) {if(!(cond)) z_error(msg);} +# define Trace(x) {if (z_verbose>=0) fprintf x ;} +# define Tracev(x) {if (z_verbose>0) fprintf x ;} +# define Tracevv(x) {if (z_verbose>1) fprintf x ;} +# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;} +# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;} +#else +# define Assert(cond,msg) +# define Trace(x) +# define Tracev(x) +# define Tracevv(x) +# define Tracec(c,x) +# define Tracecv(c,x) +#endif + + +voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size)); +void zcfree OF((voidpf opaque, voidpf ptr)); + +#define ZALLOC(strm, items, size) \ + (*((strm)->zalloc))((strm)->opaque, (items), (size)) +#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) +#define TRY_FREE(s, p) {if (p) ZFREE(s, p);} + +#endif /* ZUTIL_H */