Skip to content

Commit

Permalink
lvdrawbuf: don't compile unused code
Browse files Browse the repository at this point in the history 
Example code size reduction for release builds:
- `android-arm64`: -15.1 KB
- `emu-x86_64`: -19.4 KB
- `kindlepw2`: -10.9 KB
  • Loading branch information
@benoit-pierre
benoit-pierre committed Jan 11, 2025
1 parent 661bc53 commit 3ab68d4
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 0 deletions.
28 changes: 28 additions & 0 deletions crengine/include/lvdrawbuf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class GLDrawBuf; // workaround for no-rtti builds
class LVDrawBuf : public CacheableObject
{
public:
#if 0
// GL draw buffer support
/// GL draw buffer compatibility - requires this call before any drawing
virtual void beforeDrawing() {}
Expand Down Expand Up @@ -76,6 +77,7 @@ class LVDrawBuf : public CacheableObject
rc.right = GetWidth();
rc.bottom = GetHeight();
}
#endif

/// rotates buffer contents by specified angle
virtual void Rotate( cr_rotate_angle_t angle ) = 0;
Expand Down Expand Up @@ -128,12 +130,15 @@ class LVDrawBuf : public CacheableObject
virtual lUInt32 GetAvgColor(lvRect & rc16) const = 0;
/// get linearly interpolated pixel value (coordinates are fixed floating points *16)
virtual lUInt32 GetInterpolatedColor(int x16, int y16) const = 0;
#if 0
/// draw gradient filled rectangle with colors for top-left, top-right, bottom-right, bottom-left
virtual void GradientRect(int x0, int y0, int x1, int y1, lUInt32 color1, lUInt32 color2, lUInt32 color3, lUInt32 color4) {
CR_UNUSED8(x0, x1, y0, y1, color1, color2, color3, color4);
}
#endif
/// fills rectangle with specified color
virtual void FillRect( int x0, int y0, int x1, int y1, lUInt32 color ) = 0;
#if 0
/// draw frame
inline void DrawFrame(const lvRect & rc, lUInt32 color, int width = 1)
{
Expand All @@ -142,6 +147,7 @@ class LVDrawBuf : public CacheableObject
FillRect( rc.left, rc.top + width, rc.left + width, rc.bottom - width, color );
FillRect( rc.right - width, rc.top + width, rc.right, rc.bottom - width, color );
}
#endif
/// fills rectangle with specified color
inline void FillRect( const lvRect & rc, lUInt32 color )
{
Expand Down Expand Up @@ -175,8 +181,10 @@ class LVDrawBuf : public CacheableObject
{
Rect( rc.left, rc.top, rc.right, rc.bottom, borderWidth, color );
}
#if 0
/// fills rectangle with pattern
virtual void FillRectPattern( int x0, int y0, int x1, int y1, lUInt32 color0, lUInt32 color1, const lUInt8 * __restrict pattern ) = 0;
#endif
/// inverts image in specified rectangle
virtual void InvertRect(int x0, int y0, int x1, int y1) = 0;
/// sets new size
Expand All @@ -187,6 +195,7 @@ class LVDrawBuf : public CacheableObject
virtual void Draw( LVImageSourceRef img, int x, int y, int width, int height, bool dither=true ) = 0;
/// draws part of source image, possible rescaled
virtual void Draw( LVImageSourceRef img, int x, int y, int width, int height, int srcx, int srcy, int srcwidth, int srcheight, bool dither=true ) { CR_UNUSED10(img, x, y, width, height, srcx, srcy, srcwidth, srcheight, dither); }
#if 0
/// for GL buf only - rotated drawing
virtual void DrawRotated( LVImageSourceRef img, int x, int y, int width, int height, int rotationAngle) { Draw(img, x, y, width, height); CR_UNUSED(rotationAngle); }
/// draws buffer content to another buffer doing color conversion if necessary
Expand All @@ -199,11 +208,14 @@ class LVDrawBuf : public CacheableObject
virtual void DrawFragment(const LVDrawBuf * __restrict src, int srcx, int srcy, int srcdx, int srcdy, int x, int y, int dx, int dy, int options) {
CR_UNUSED10(src, srcx, srcy, srcdx, srcdy, x, y, dx, dy, options);
}
#endif
/// draw lines
virtual void DrawLine(int x0, int y0, int x1, int y1, lUInt32 color0, int length1, int length2, int direction) = 0;
#if 0
#if !defined(__SYMBIAN32__) && defined(_WIN32) && !defined(QT_GL)
/// draws buffer content to another buffer doing color conversion if necessary
virtual void DrawTo( HDC dc, int x, int y, int options, const lUInt32 * __restrict palette ) = 0;
#endif
#endif
/// draws text string
/*
Expand Down Expand Up @@ -376,6 +388,7 @@ class LVGrayDrawBuf : public LVBaseDrawBuf
virtual lUInt32 GetWhiteColor() const;
/// returns black pixel value
virtual lUInt32 GetBlackColor() const;
#if 0
/// draws buffer content to another buffer doing color conversion if necessary
virtual void DrawTo( LVDrawBuf * __restrict buf, int x, int y, int options, const lUInt32 * __restrict palette );
// draws buffer on top of another buffer to implement background
Expand All @@ -385,6 +398,7 @@ class LVGrayDrawBuf : public LVBaseDrawBuf
#if !defined(__SYMBIAN32__) && defined(_WIN32) && !defined(QT_GL)
/// draws buffer content to another buffer doing color conversion if necessary
virtual void DrawTo( HDC dc, int x, int y, int options, const lUInt32 * __restrict palette );
#endif
#endif
/// invert image
virtual void Invert();
Expand All @@ -400,8 +414,10 @@ class LVGrayDrawBuf : public LVBaseDrawBuf
virtual void FillRect( int x0, int y0, int x1, int y1, lUInt32 color );
/// inverts image in specified rectangle
virtual void InvertRect( int x0, int y0, int x1, int y1 );
#if 0
/// fills rectangle with pattern
virtual void FillRectPattern( int x0, int y0, int x1, int y1, lUInt32 color0, lUInt32 color1, const lUInt8 * __restrict pattern );
#endif
/// sets new size
virtual void Resize( int dx, int dy );
/// draws image
Expand All @@ -412,8 +428,10 @@ class LVGrayDrawBuf : public LVBaseDrawBuf
LVGrayDrawBuf(int dx, int dy, int bpp=2, void * auxdata = NULL );
/// destructor
virtual ~LVGrayDrawBuf();
#if 0
/// convert to 1-bit bitmap
void ConvertToBitmap(bool flgDither);
#endif
virtual void DrawLine(int x0, int y0, int x1, int y1, lUInt32 color0, int length1, int length2, int direction=0);
};

Expand Down Expand Up @@ -506,6 +524,7 @@ class LVColorDrawBuf : public LVBaseDrawBuf
virtual lUInt32 GetWhiteColor() const;
/// returns black pixel value
virtual lUInt32 GetBlackColor() const;
#if 0
/// draws buffer content to another buffer doing color conversion if necessary
virtual void DrawTo( LVDrawBuf * __restrict buf, int x, int y, int options, const lUInt32 * __restrict palette );
// draws buffer on top of another buffer to implement background
Expand All @@ -515,6 +534,7 @@ class LVColorDrawBuf : public LVBaseDrawBuf
#if !defined(__SYMBIAN32__) && defined(_WIN32) && !defined(QT_GL)
/// draws buffer content to another buffer doing color conversion if necessary
virtual void DrawTo( HDC dc, int x, int y, int options, const lUInt32 * __restrict palette );
#endif
#endif
/// invert image
virtual void Invert();
Expand All @@ -526,8 +546,10 @@ class LVColorDrawBuf : public LVBaseDrawBuf
virtual lUInt32 GetPixel( int x, int y ) const;
/// fills rectangle with specified color
virtual void FillRect( int x0, int y0, int x1, int y1, lUInt32 color );
#if 0
/// fills rectangle with pattern
virtual void FillRectPattern( int x0, int y0, int x1, int y1, lUInt32 color0, lUInt32 color1, const lUInt8 * __restrict pattern );
#endif
/// inverts specified rectangle
virtual void InvertRect( int x0, int y0, int x1, int y1 );
/// sets new size
Expand All @@ -545,8 +567,10 @@ class LVColorDrawBuf : public LVBaseDrawBuf
LVColorDrawBuf(int dx, int dy, lUInt8 * externalBuffer, int bpp=32 );
/// destructor
virtual ~LVColorDrawBuf();
#if 0
/// convert to 1-bit bitmap
void ConvertToBitmap(bool flgDither);
#endif
/// draw line
virtual void DrawLine(int x0, int y0, int x1, int y1, lUInt32 color0, int length1=1, int length2=0, int direction=0);
#if !defined(__SYMBIAN32__) && defined(_WIN32) && !defined(QT_GL)
Expand Down Expand Up @@ -608,11 +632,13 @@ class LVInkMeasurementDrawBuf : public LVBaseDrawBuf
// if ( color != GetBackgroundColor() )
updateInkBounds(x0, y0, x1, y1);
}
#if 0
virtual void FillRectPattern( int x0, int y0, int x1, int y1, lUInt32 color0, lUInt32 color1, const lUInt8 * __restrict pattern ) {
if ( ignore_decorations )
return;
FillRect( x0, y0, x1, y1, color0);
}
#endif
/// draws image
virtual void Draw( LVImageSourceRef img, int x, int y, int width, int height, bool dither ) {
// An image (even if empty) sets the ink area
Expand Down Expand Up @@ -666,11 +692,13 @@ class LVInkMeasurementDrawBuf : public LVBaseDrawBuf
virtual void Rotate( cr_rotate_angle_t angle ) {}
virtual lUInt32 GetWhiteColor() const { return 0; }
virtual lUInt32 GetBlackColor() const { return 0; }
#if 0
virtual void DrawTo( LVDrawBuf * __restrict buf, int x, int y, int options, const lUInt32 * __restrict palette ) {}
virtual void DrawOnTop( LVDrawBuf * __restrict buf, int x, int y) {}
virtual void DrawRescaled(const LVDrawBuf * __restrict src, int x, int y, int dx, int dy, int options) {}
#if !defined(__SYMBIAN32__) && defined(_WIN32) && !defined(QT_GL)
virtual void DrawTo( HDC dc, int x, int y, int options, const lUInt32 * __restrict palette ) {}
#endif
#endif
virtual void Invert() {}
virtual lUInt32 GetPixel( int x, int y ) const { return 0; }
Expand Down
24 changes: 24 additions & 0 deletions crengine/src/lvdrawbuf.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,15 @@ static lUInt8 rgbToGray( lUInt32 color, int bpp )
return (lUInt8)(((r + g + g + b)>>2) & (((1<<bpp)-1)<<(8-bpp)));
}

#if 0

static lUInt16 rgb565(int r, int g, int b) {
// rrrr rggg gggb bbbb
return (lUInt16)(((r & 0xF8) << 8) | ((g & 0xFC) << 3) | ((b & 0xF8) >> 3));
}

#endif

static lUInt8 rgbToGrayMask( lUInt32 color, int bpp )
{
switch ( bpp ) {
Expand Down Expand Up @@ -988,6 +992,8 @@ void LVGrayDrawBuf::FillRect( int x0, int y0, int x1, int y1, lUInt32 color32 )
}
}

#if 0

void LVGrayDrawBuf::FillRectPattern( int x0, int y0, int x1, int y1, lUInt32 color032, lUInt32 color132, const lUInt8 * __restrict pattern )
{
if (x0<_clip.left)
Expand Down Expand Up @@ -1033,6 +1039,8 @@ void LVGrayDrawBuf::FillRectPattern( int x0, int y0, int x1, int y1, lUInt32 col
}
}

#endif

static const lUInt8 fill_masks1[5] = {0x00, 0x3, 0x0f, 0x3f, 0xff};
static const lUInt8 fill_masks2[4] = {0x00, 0xc0, 0xf0, 0xfc};

Expand Down Expand Up @@ -1479,6 +1487,8 @@ void LVGrayDrawBuf::Invert()
}
}

#if 0

void LVGrayDrawBuf::ConvertToBitmap(bool flgDither)
{
if (_bpp==1)
Expand Down Expand Up @@ -1526,6 +1536,8 @@ void LVGrayDrawBuf::ConvertToBitmap(bool flgDither)
CHECK_GUARD_BYTE;
}

#endif

//=======================================================
// 32-bit RGB buffer
//=======================================================
Expand Down Expand Up @@ -1812,6 +1824,9 @@ void LVColorDrawBuf::DrawLine(int x0, int y0, int x1, int y1, lUInt32 color0, in
}
}
}

#if 0

/// fills rectangle with specified color
void LVColorDrawBuf::FillRectPattern( int x0, int y0, int x1, int y1, lUInt32 color0, lUInt32 color1, const lUInt8 * __restrict pattern )
{
Expand Down Expand Up @@ -1852,6 +1867,8 @@ void LVColorDrawBuf::FillRectPattern( int x0, int y0, int x1, int y1, lUInt32 co
}
}

#endif

/// sets new size
void LVColorDrawBuf::Resize( int dx, int dy )
{
Expand Down Expand Up @@ -2070,6 +2087,8 @@ void LVColorDrawBuf::Draw( int x, int y, const lUInt8 * bitmap, int width, int h
}
}

#if 0

#if !defined(__SYMBIAN32__) && defined(_WIN32) && !defined(QT_GL)
/// draws buffer content to DC doing color conversion if necessary
void LVGrayDrawBuf::DrawTo( HDC dc, int x, int y, int options, const lUInt32 * __restrict palette )
Expand Down Expand Up @@ -3067,6 +3086,8 @@ void LVColorDrawBuf::DrawRescaled(const LVDrawBuf * __restrict src, int x, int y
_drawnImagesSurface += dx*dy;
}

#endif

/// returns scanline pointer
lUInt8 * LVColorDrawBuf::GetScanLine( int y ) const
{
Expand Down Expand Up @@ -3136,10 +3157,13 @@ LVColorDrawBuf::~LVColorDrawBuf()
#endif
}

#if 0

/// convert to 1-bit bitmap
void LVColorDrawBuf::ConvertToBitmap(bool flgDither)
{
// not implemented
CR_UNUSED(flgDither);
}

#endif

0 comments on commit 3ab68d4

Please sign in to comment.